Commit Graph

234 Commits

Author SHA1 Message Date
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Thomas Mueller 42678096bb remove php closing tag 2013-01-14 23:51:58 +01:00
Michael Gapczynski 6801f82d09 Merge branch 'filesystem' into filesystem-etags
Conflicts:
	lib/files/cache/cache.php
2013-01-07 10:28:37 -05:00
Robin Appelman ad3badeabf Cache: split permission cache scanning and cache scanning 2013-01-07 02:09:20 +01:00
Robin Appelman 439578288f Cache: split permission cache scanning and cache scanning 2013-01-07 01:03:11 +01:00
Robin Appelman b41189de44 Cache: allow storage backends to overwrite Watcher 2013-01-01 18:04:29 +01:00
Michael Gapczynski d0a50fae83 Fix eTagUpdate and add tests 2012-12-31 18:16:44 -05:00
Robin Appelman cf3665057c make sure folders that are not fully scanned are at least shallow scanned when we open them
the fact that they are in the cache does not mean they are scanned
2012-12-15 03:21:39 +01:00
Robin Appelman 4be039e6cb Filecache Watcher: use scan or scanFile based on the current item, not the cached item 2012-12-15 03:10:56 +01:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Thomas Müller b11912f9bc Merge pull request #623 from owncloud/contacts_api_2
Contacts API has been implemented and unit tests are provided
2012-12-11 05:10:54 -08:00
Robin Appelman cc0a0df88b one additional test case for the cache updater 2012-12-11 01:25:21 +01:00
Robin Appelman 8635699db9 fix cache behaviour for non existing files 2012-12-11 01:06:21 +01:00
Robin Appelman 98f42d314c merge master into filesystem 2012-12-06 17:47:28 +01:00
Thomas Müller 39e37fa9c6 Enabling unit testing for apptemplate_advanced 2012-12-04 19:28:46 +01:00
Robin Appelman d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Thomas Mueller f99497a05a test for search and unregister added 2012-11-28 23:10:30 +01:00
Thomas Mueller 2d597c2238 first unit tests implemented 2012-11-28 23:10:00 +01:00
Bernhard Posselt 37e524dc6d added more unittests for the group file 2012-11-28 18:30:47 +01:00
Jörn Friedrich Dreyer eaa625c9bc Merge pull request #401 from owncloud/share_hooks
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Robin Appelman 0cfef83ed9 sort output of getFolderContent by name 2012-11-25 16:08:35 +01:00
Robin Appelman 709aacfa0f change behaviour of Filesystem::getMountPoint when a mountpoint is passed as path without trailing slash 2012-11-24 23:41:39 +01:00
Robin Appelman ad706229f5 explicitly sort files when using getFolderContents 2012-11-23 00:17:18 +01:00
Robin Appelman 8ce5e0d30d don't throw fatal error in updater cache if setup failed for some reason 2012-11-22 13:14:39 +01:00
Robin Appelman 8687e0d346 add Scanner->backgroundScan 2012-11-22 12:45:29 +01:00
Robin Appelman 186c9e77e8 add Cache->getIncomplete for use in background scanning 2012-11-22 12:45:29 +01:00
Bart Visscher 8bed38c78d Rename install hook functions to register hook 2012-11-15 18:13:54 +01:00
Robin Appelman cbcd9ba84a allow storage backends to implement custom permission management 2012-11-15 00:57:30 +01:00
Robin Appelman bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Bart Visscher 530f3f8be9 Create functions to install standard hooks
Also use these in tests that needs them
Fix #151
2012-11-13 23:45:17 +01:00
Thomas Tanghus c127c78df4 Don't use indexes in test data as postgres complains over duplicate keys. 2012-11-12 23:35:42 +01:00
Thomas Tanghus 82e010c51c Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 00:37:40 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Thomas Tanghus fd709fc021 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-11 20:20:09 +01:00
Bart Visscher 04aa029cd3 Disable loading apps before starting tests
The tests it self should load the app if needed
2012-11-10 21:15:05 +01:00
Robin Appelman fedff3eafe add cache updater 2012-11-08 21:12:40 +01:00
Robin Appelman 15b8a3f987 move correctFolderSize from Scanner to Cache 2012-11-08 18:10:54 +01:00
Robin Appelman 961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Thomas Tanghus 73d59bd397 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-06 00:10:45 +01:00
Thomas Mueller f9226f170e fixes #266 2012-11-05 21:26:59 +01:00
Thomas Tanghus 831c2cac1e Remove unused variable. 2012-11-05 16:29:44 +01:00
Thomas Tanghus 1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-05 12:06:59 +01:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Robin Appelman 4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Thomas Tanghus 88b91a7304 Swap expected and actual. 2012-11-04 12:33:32 +01:00
Thomas Tanghus e6a7bba095 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-04 12:31:06 +01:00
Thomas Tanghus 7c67d2fdd6 VCategories: Swap expected and actual in unit tests. 2012-11-04 12:09:54 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Robin Appelman 4c0c78d15d check for filename blacklist in OC_Filesystem::isValidPath 2012-11-03 00:26:36 +01:00