Commit Graph

9957 Commits

Author SHA1 Message Date
Bernhard Posselt b537cecdf3 add CSP turned on for angularjs 2013-02-25 22:54:05 +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
Björn Schießle 272f854ce6 fix getVersion call 2013-02-25 15:34:36 +01:00
Jörn Friedrich Dreyer 664e7a3fc2 use distance option to delay dragging in sane browsers 2013-02-25 15:08:14 +01:00
Björn Schießle 0f763f4508 Merge pull request #1823 from owncloud/update-expire-function
Update expire function
2013-02-25 05:30:21 -08:00
Björn Schießle e30b3f64e0 fix line endings 2013-02-25 14:29:31 +01:00
Björn Schießle 4c980a4851 Merge branch 'master' into update-expire-function
Conflicts:
	apps/files_trashbin/appinfo/version
	apps/files_trashbin/lib/trash.php
2013-02-25 14:26:59 +01:00
Björn Schießle a37577e007 Merge pull request #1810 from owncloud/trashbin_encryption
Trashbin file encryption support
2013-02-25 05:13:38 -08:00
Björn Schießle 7da97550df some final code clean-up 2013-02-25 14:12:56 +01:00
Björn Schießle 7ebbecd81f always use "===" 2013-02-25 14:09:20 +01:00
Bernhard Posselt 3f48bebe92 Merge pull request #1827 from owncloud/fix_getVersions
fix getVersions(), we need to get the correct user and filename
2013-02-25 04:59:47 -08:00
Thomas Müller 660670ec68 Merge pull request #1832 from owncloud/fix_1779
use :hover pseudo class to set opacity
2013-02-25 04:35:34 -08:00
Thomas Müller 7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465
Fix 1465
2013-02-25 04:34:13 -08:00
Bart Visscher 9ceae51091 Merge pull request #1887 from owncloud/fixing-1843-master
remove the check for session data folder - causes trouble on some enviro...
2013-02-25 04:16:38 -08:00
Björn Schießle da82f7f5f3 Merge pull request #1888 from Raydiation/master
Fixes apps require version checking
2013-02-25 03:57:29 -08:00
Bernhard Posselt 8068051ca4 more tests to fail the version check 2013-02-25 12:47:34 +01:00
Bernhard Posselt 5bf3d286f0 created unittests and factored out version test into seperate method 2013-02-25 12:38:00 +01:00
Björn Schießle 4dea6a6228 Merge branch 'master' into trashbin_encryption
Conflicts:
	apps/files_trashbin/index.php
	apps/files_trashbin/lib/trash.php
2013-02-25 12:14:51 +01:00
Bernhard Posselt ecd40f0abc spaces to tabs 2013-02-25 11:40:55 +01:00
Bernhard Posselt 736d5deaee version checks for apps now use all three version numbers and fixed bug that would not do the version check correctly for the second version 2013-02-25 11:39:55 +01:00
Björn Schießle 632ca9f06d Merge branch 'master' into update-expire-function
Conflicts:
	apps/files_trashbin/lib/trash.php
2013-02-25 11:14:06 +01:00
Frank Karlitschek 9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
don't use the number of written bytes as indicator if streamCopy() was successful
2013-02-25 02:04:12 -08:00
Thomas Mueller ebcb778a99 remove the check for session data folder - causes trouble on some environments
let's try to find another solution for =C6
2013-02-25 10:12:47 +01:00
Frank Karlitschek 8f65916904 Merge pull request #1882 from owncloud/required_version
Set required owncloud version to 4.93
2013-02-25 00:37:22 -08:00
Jenkins for ownCloud 21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Thomas Müller 906f8fa6f6 Merge pull request #1881 from owncloud/safemode_check
add a safe_mode check
2013-02-24 11:23:27 -08:00
Robin Appelman 4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00
Jenkins for ownCloud 7019972320 [tx-robot] updated from transifex 2013-02-24 00:06:53 +01:00
Michael Gapczynski 069adf86f2 Merge pull request #1879 from owncloud/fix-webdav-quota
Don't throw insufficient storage exception if free space is unknown
2013-02-23 14:38:29 -08:00
Michael Gapczynski d29c2b0169 Reuse $freeSpace variable 2013-02-23 16:00:50 -05:00
Michael Gapczynski a2d3333a09 Don't throw insufficient storage exception if free space is unknown 2013-02-23 15:37:44 -05:00
Thomas Müller a417028ccd Merge pull request #1862 from owncloud/whitespace-cleanup
Whitespace cleanup
2013-02-23 11:39:13 -08:00
Jenkins for ownCloud 6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Bart Visscher 15f5325078 Don't use routes when displaying error page 2013-02-22 21:39:44 +01:00
Arthur Schiwon e4e915fa3b LDAP: simplify default for user home settings, fixes wrong display of default value in settings 2013-02-22 21:26:07 +01:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Björn Schießle eabfd9b69b put value assignment into brackets 2013-02-22 16:45:57 +01:00
Bernhard Posselt 78fce83405 Merge pull request #1855 from owncloud/userlist_load_displaynames
Fetch displayname in userlist ajax requests. Refs #1681
2013-02-22 07:44:24 -08:00
Bernhard Posselt 608ebb59dd Merge pull request #1859 from owncloud/blacklist-fix
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 07:43:13 -08:00
Björn Schießle d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Robin Appelman 62c65bc1c8 Add OC\Files\Filesystem::isFileBlacklisted 2013-02-22 16:13:08 +01:00
Jörn Friedrich Dreyer e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
2013-02-22 07:02:51 -08:00