Commit Graph

10205 Commits

Author SHA1 Message Date
Michael Gapczynski 9a2ca0ae64 Check resharing setting 2013-02-26 13:31:15 -05:00
Jan-Christoph Borchardt 07e9f8d0d3 remove general CSS from IE specific rules, displays Shared state permanently again 2013-02-26 18:49:20 +01:00
Bernhard Posselt 26d5992161 add cgi pathinfo when fcgi is enabled #1189 2013-02-26 18:00:07 +01:00
Bernhard Posselt 023f19e929 added defaultcharset to utf-8 in htaccess 2013-02-26 17:38:59 +01:00
Lukas Reschke 81c664697b Merge pull request #1920 from owncloud/catch_vcategories_exceptions
Catch exceptions on malformed categories.
2013-02-26 07:34:46 -08:00
Thomas Müller a148e6de40 Merge pull request #1922 from owncloud/missing_
Add missing echo
2013-02-26 07:33:15 -08:00
Lukas Reschke c94974cb97 Add missing echo 2013-02-26 16:10:52 +01:00
Frank Karlitschek 1591b2f8d0 Merge pull request #1915 from owncloud/fix_webdav_mount
cleanPath needs to be public
2013-02-26 06:20:58 -08:00
Frank Karlitschek 5e07c30f4b Merge pull request #1919 from owncloud/logo-pixelperfect
Logo pixel perfect
2013-02-26 06:16:42 -08:00
Thomas Tanghus ea841e5e15 Catch exceptions on malformed categories. 2013-02-26 15:01:42 +01:00
Jan-Christoph Borchardt 6f09f57008 remove more unused logo files, now in promo 2013-02-26 14:28:17 +01:00
Jan-Christoph Borchardt 7a47786afd align logo type pixel perfectly 2013-02-26 14:27:29 +01:00
Björn Schießle 8c9d0d1f5b cleanPath needs to be public 2013-02-26 12:24:52 +01:00
Frank Karlitschek 69eb69be0e Merge pull request #1902 from owncloud/angularcsp
add CSP turned on for angularjs
2013-02-26 00:58:12 -08:00
Bernhard Posselt b987c76d16 Merge pull request #1906 from owncloud/storage-stat-fail
Common storage: don't throw warning when a stat fails
2013-02-26 00:44:42 -08:00
Bernhard Posselt 5b250afafc Merge pull request #1903 from owncloud/fix_version_check
return true once one owncloud version number is bigger at any position
2013-02-26 00:37:11 -08:00
Frank Karlitschek 072daf8850 Merge pull request #1885 from houqp/issue_1776
when user changes displayName, also update it on expand button
2013-02-26 00:19:42 -08:00
Robin Appelman 52dccd4aa1 Storage: don't throw warnings when a stat fails 2013-02-26 02:53:02 +01:00
Michael Gapczynski 5b732ac1ea Move space 2013-02-25 20:52:01 -05:00
Robin Appelman 6b33a23a51 Code style 2013-02-26 02:51:57 +01:00
Michael Gapczynski aa2ea9e3de Fix adding share icons to share action 2013-02-25 20:20:29 -05:00
Michael Gapczynski 5b50bc8c0a Fix Dropbox and Google ui 2013-02-25 19:45:01 -05:00
Jenkins for ownCloud 63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Michael Gapczynski 4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Qingping Hou 02da5d5d52 remove Gwr 2013-02-25 17:22:04 -05:00
Qingping Hou 7e3a8c1dde use text method instead of html method 2013-02-25 17:18:20 -05:00
Qingping Hou 195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
	core/templates/layout.user.php
2013-02-25 17:16:03 -05:00
Bernhard Posselt f415f3e03e return true once one owncloud version number is bigger at any position 2013-02-25 23:06:26 +01:00
Lukas Reschke d713948d3f Merge pull request #1898 from owncloud/session_start_fix
set http 500 when session could not be started to prevent serving of emp...
2013-02-25 14:00:12 -08:00
Bernhard Posselt b537cecdf3 add CSP turned on for angularjs 2013-02-25 22:54:05 +01:00
Lukas Reschke 6735701c1e Merge pull request #1837 from owncloud/fix-user-template
Remove unneeded code for user layout template
2013-02-25 13:41:32 -08:00
Lukas Reschke a2a1e8c2cb Merge pull request #1839 from owncloud/no_recursive_object_walking
Don't walk objects with array_walk_recursive()
2013-02-25 12:53:23 -08:00
Thomas Müller 6dd1d479da Merge pull request #1706 from owncloud/master-sqlserver
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
Qingping Hou c111a3aa24 add span tag to displayname on expand button 2013-02-25 15:40:57 -05:00
Frank Karlitschek a533bb6dcd 5 beta 2 2013-02-25 20:00:40 +01:00
Bernhard Posselt 7f7b8bc07a use error template 2013-02-25 19:17:29 +01:00
Frank Karlitschek 571f1e2d2b Merge pull request #1894 from owncloud/texfix
fixed bug that prevented a newly created file to be opened with register...
2013-02-25 09:48:25 -08:00
Bernhard Posselt aba60dba28 added simple error message for the browser 2013-02-25 18:47:34 +01:00
Bernhard Posselt bc2fefed59 write an error log when session could not be initialized 2013-02-25 18:42:09 +01:00
Bernhard Posselt 55c72617c6 set http 500 when session could not be started to prevent serving of empty files see #1049 2013-02-25 18:37:05 +01:00
Bernhard Posselt 1d83d76b45 fixed bug that prevented a newly created file to be opened with registered files actions 2013-02-25 17:50:17 +01:00
Bernhard Posselt 946a064fc6 Merge pull request #1891 from owncloud/set_timeout
use a 5 sec timeout for the webdav check
2013-02-25 08:27:20 -08:00
Frank Karlitschek f50be25704 Merge pull request #1864 from owncloud/fix_display_default
LDAP: simplify default for user home settings, fixes wrong display of de...
2013-02-25 08:23:32 -08:00
Björn Schießle ede0e7d6bc Merge pull request #1890 from owncloud/trashbin_fix
fix quota calculation for trash bin and versions
2013-02-25 07:59:09 -08:00
Björn Schießle 3ef8c0bda3 Merge pull request #1892 from owncloud/files_remove_row_on_delete
delete table row if file was deleted instead of just hide it
2013-02-25 07:44:35 -08:00
Thomas Müller 638de02be4 Merge pull request #1889 from owncloud/use_distance_option
use distance option to delay dragging in sane browsers
2013-02-25 07:33:11 -08:00
Björn Schießle dbf2bfc8cd delete table row if file was deleted instead of just hide it 2013-02-25 16:32:54 +01:00
Frank Karlitschek 3009b43e3d use a 5 sec timeout for the webdav check 2013-02-25 16:30:11 +01:00
Björn Schießle b917646516 fix quota calculation 2013-02-25 16:12:44 +01:00
Björn Schießle 2954c7e97a Merge pull request #1865 from owncloud/fix-displaying-db-errors
Don't use routes when displaying error page
2013-02-25 07:09:48 -08:00