Commit Graph

11250 Commits

Author SHA1 Message Date
Sam Tuke 3003dd46d1 Implemented initial recoveryAdmin functionality in crypto file proxy 2013-05-09 18:09:20 +02:00
Sam Tuke 101e037529 Fixed bugs with pre_share hook usage
Made sure new user being shared to is added to array of sharing users
2013-05-09 14:43:06 +02:00
Björn Schießle 2e81efc37e don't call correctFolder() in touchHook, it will be called later in the writeUpdate() 2013-05-08 23:00:24 +02:00
Björn Schießle bda8187f3b rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file 2013-05-08 23:00:13 +02:00
Björn Schießle 0e30e68b22 update etag for for the touched file 2013-05-08 23:00:03 +02:00
Björn Schießle b9134dcd6a touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 22:59:49 +02:00
Robin Appelman d9c19fa8d7 Move legacy filesystem classes 2013-05-08 16:48:47 +02:00
Sam Tuke 28866de44b Added pre_share hook
Switched it for post_share hook in encryption hooks
Stop a file from being shared if the encryption procedure fails for any users
2013-05-08 16:22:08 +02:00
FlorinPeter e8a80c6c2f Merge pull request #3271 from owncloud/fix_for_util_tearDownFS
fix for tearDownFS, after filesystem::tearDown() in Util
2013-05-08 05:43:54 -07:00
Björn Schießle 135991474b fix inconsistent post parameters in change password operation 2013-05-08 12:38:09 +02:00
Bart Visscher d3ba20fee7 Merge pull request #3272 from owncloud/legacy-autoloader
Move autoloader to it's own class
2013-05-08 00:08:31 -07:00
Robin Appelman 71fc4a2cf4 Autoloader: fix loading app clases located in lib/ 2013-05-08 00:50:33 +02:00
Robin Appelman e21a3a1a23 Autoloader: test cases 2013-05-07 23:08:36 +02:00
Robin Appelman 2a01d39940 Autoloader: load the 3rdparty libraries using prefixes 2013-05-07 23:07:47 +02:00
Florin Peter fdc49e7acb added test for share folder 2013-05-07 22:56:59 +02:00
Robin Appelman 0d25c0001c check for setlocale after setting up the paths to prevent autoloader confusion 2013-05-07 22:53:07 +02:00
Robin Appelman 6d903cf7ae Autoloader: add support for custom namespace paths 2013-05-07 22:39:35 +02:00
Robin Appelman 72ed74f28a Autoloader: split getting the class paths and loading the class 2013-05-07 22:26:55 +02:00
Florin Peter 03d8907df8 fix for tearDownFS, after filesystem::tearDown() the root is not mounted 2013-05-07 22:26:16 +02:00
Robin Appelman cac86bb4db Allow disabling the global classpath in an autoloader 2013-05-07 22:24:47 +02:00
Florin Peter 33fc830dd3 added test for re-share 2013-05-07 22:22:05 +02:00
Robin Appelman d1fcb7eb52 Allow the autoloader to try mutliple possible paths for each path 2013-05-07 22:21:59 +02:00
Florin Peter f82fb0e160 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-05-07 22:19:58 +02:00
Florin Peter cdf4bec6a1 fix for tearDownFS, after filesystem::tearDown() the root is not mounted 2013-05-07 22:19:48 +02:00
Robin Appelman 19cfe74bf5 Add per-autoloader classPath 2013-05-07 22:19:00 +02:00
Robin Appelman 0b5f6b9c13 Move autoloader to it's own class 2013-05-07 22:16:17 +02:00
Bart Visscher 175633d380 Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app
Use === and !== in user_ldap app
2013-05-07 12:45:43 -07:00
icewind1991 5b61c5d478 Merge pull request #3044 from owncloud/backgroundwatcher
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
Sam Tuke 763c8f78ed Made code formatting of new methods more consistent 2013-05-07 17:16:16 +02:00
Michael Gapczynski 349a533f66 Merge pull request #3025 from owncloud/move-file
Cache: only look for child entires when doing a move operation when moving a folder
2013-05-07 07:52:57 -07:00
Sam Tuke 4b53f72d0d Added facility to manually encrypt all files from personal settings
Added success/fail feedback to personal settings functions
Improved look/layout of personal settings page
Fixed misplaced plain text in ajax scripts
2013-05-07 16:17:38 +02:00
Bart Visscher 398fbb61f8 Merge pull request #2813 from owncloud/improve-lib-check
added correct check for gd and check for php-intl
2013-05-07 06:12:40 -07:00
Morris Jobke 2b9da8a6c9 remove hard php-intl requirement 2013-05-07 13:51:30 +02:00
Florin Peter b535964006 test for share is now able to run with autotest.sh 2013-05-07 13:43:34 +02:00
Florin Peter 8b54553872 fix for wrong file infos 2013-05-07 13:42:49 +02:00
Florin Peter a9649713d3 fix empty path 2013-05-07 13:42:08 +02:00
Morris Jobke deb0885e46 Merge pull request #3246 from owncloud/newfile-mimetype
Files: set the proper mimetype when creating a new text file
2013-05-07 01:53:43 -07:00
Björn Schießle 9b258929c6 allow to set quota to zero, issue #2696 2013-05-07 10:40:25 +02:00
Florin Peter 8fcef41143 added test for share 2013-05-07 09:49:14 +02:00
Florin Peter fe6d12ddec fix file info put on stream 2013-05-06 21:15:25 +02:00
Florin Peter d3df80a078 merge my fix from master b464970142 2013-05-06 21:14:59 +02:00
Lukas Reschke 2208313e02 Merge pull request #3245 from owncloud/use-$view
Use the internal ownCloud view
2013-05-06 09:20:18 -07:00
Robin Appelman 3de40f7cfb Files: set the proper mimetype when creating a new text file 2013-05-06 17:55:22 +02:00
Lukas Reschke db1e6b5f3b Use $dir instead of $fullpath 2013-05-06 14:28:01 +03:00
Lukas Reschke b13b19c58b Use the internal ownCloud view 2013-05-06 13:43:23 +03:00
Arthur Schiwon d659d8e193 LDAP: do not reset UUID attribute setting when guid is detected 2013-05-06 10:17:52 +02:00
Bart Visscher 51a1f829b8 Merge pull request #3120 from owncloud/ocs_properties
Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'
2013-05-05 23:20:25 -07:00
Florin Peter 5610429a02 handling for re-share and re-unshare should work now 2013-05-05 23:41:42 +02:00
Florin Peter ee083c20e6 improved pre_unshare and post_unshare hook 2013-05-05 23:41:04 +02:00
Thomas Tanghus 83db2c83ad Merge pull request #3177 from owncloud/outerHTML_compatibility
Add compatibility function for outerHTML
2013-05-04 12:27:24 -07:00