Commit Graph

24901 Commits

Author SHA1 Message Date
Björn Schießle fbe4b77c49 Merge pull request #16228 from owncloud/enc_fix_restore
use hooks to update encryption keys
2015-05-12 13:10:16 +02:00
Lukas Reschke 0a3bf3f963 Use active instead of non existing pressed
Fixes https://github.com/owncloud/core/issues/16083
2015-05-12 12:20:28 +02:00
Lukas Reschke 4613456a8a Check if cURL supports the desired features
Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour.

Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
2015-05-12 12:00:56 +02:00
Vincent Petry beb6a38d85 Added rmdir to trashbin storage wrapper
This makes sure that folders are moved to trash when deleted with
rmdir() instead of unlink().

This happens for example when deleting a folder over WebDAV.
The web UI uses unlink() so it wasn't affected.
2015-05-12 11:09:02 +02:00
Lukas Reschke 8082433474 Update CA bundle 2015-05-12 10:07:10 +02:00
Morris Jobke b11c0c533e Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded
fix check if a file is excluded from encryption
2015-05-12 09:12:38 +02:00
Jenkins for ownCloud deeeca69fe [tx-robot] updated from transifex 2015-05-12 01:55:10 -04:00
Vincent Petry 20d2d8d3dd Merge pull request #15881 from owncloud/share-moveversionsproperly
Fix version rename with files and folders
2015-05-11 18:24:34 +02:00
Lukas Reschke baa9503442 Use OC.webroot instead of calculating the URL
Calculating the URL is error-prone as it doesn't work when for example `public.php` is requested and might even be harmful as it could leak sensitive information.

Since `oc.js` is even available when maintenance mode is available it is better to use the global `OC.webroot` that is not controlled by any user.
2015-05-11 17:01:57 +02:00
Morris Jobke afcec88c6f Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-insert
Issue 16206 fix app config parallel insert
2015-05-11 16:05:30 +02:00
Clark Tomlinson 9727386d8b fixing test 2015-05-11 09:38:23 -04:00
Morris Jobke 90d8e4bc00 Merge pull request #15815 from owncloud/unshare-etag-propagate
Update etag of direct parent on unshare
2015-05-11 13:42:20 +02:00
Bjoern Schiessle 9dd517071e fix check if file is excluded from encryption 2015-05-11 12:38:59 +02:00
Joas Schilling dfed287dc0 Use insertIfNotExists to avoid problems with parallel calls 2015-05-11 12:38:33 +02:00
Joas Schilling 39497b9c3a Add a test for parallel insert 2015-05-11 12:29:28 +02:00
Joas Schilling 2916b0ba76 Always test the object and the legacy class 2015-05-11 12:22:23 +02:00
Bjoern Schiessle 0d5c7a11e2 use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we
are in the storage wrapper the file cache isn't up-to-date
2015-05-11 12:06:57 +02:00
Thomas Müller 7db994971e Merge pull request #16208 from owncloud/fix-language-selection-sr-latin
Some locales need to be converted to be compliant with CLDR
2015-05-11 11:21:28 +02:00
Morris Jobke f057efc42e Merge pull request #16213 from cmeh/patch-5
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
Jenkins for ownCloud a331f6b83e [tx-robot] updated from transifex 2015-05-11 01:54:43 -04:00
Jenkins for ownCloud 52fc45e6e3 [tx-robot] updated from transifex 2015-05-10 01:56:13 -04:00
Christian Hoffmann 6441721626 Grammar, removal of line break
* Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17.
* Removed line break from line 17 to line 18.
2015-05-09 11:31:21 +02:00
Jenkins for ownCloud 6f5854a8de [tx-robot] updated from transifex 2015-05-09 01:55:35 -04:00
Thomas Müller 57f3557486 Merge pull request #16203 from owncloud/add-warning-for-people-that-cant-read
Add warning to OCC as well in case another PHP version is used there
2015-05-08 23:48:31 +02:00
Thomas Müller 9c57ae89d9 Some locales need to be converted to be compliant with CLDR 2015-05-08 23:45:07 +02:00
Lukas Reschke 4c0a8d327d Add warning to OCC as well in case another PHP version is used there
In regard to a recent rant on social media where users complained about us to have broken the command line tool. Guess reading the documentation is hard…
2015-05-08 16:08:21 +02:00
Lukas Reschke c9921ec127 Merge pull request #16124 from owncloud/issue-16109-fix-share-email-with-shared-folder
Fix the share mail notification when the item is in a folder
2015-05-08 13:03:28 +02:00
Björn Schießle bcbf9a9bb5 Merge pull request #16155 from owncloud/enc_admin_settings
improved admin settings
2015-05-08 12:16:16 +02:00
Lukas Reschke 16a0de6314 Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exists-on-enable-app
Avoid the log entry with the ModuleAlreadyExists exception when enabl…
2015-05-08 11:55:02 +02:00
Bjoern Schiessle 4a450c9d0d improved admin settings 2015-05-08 11:41:38 +02:00
Lukas Reschke ebf3953908 Merge pull request #16168 from owncloud/cron-errors
fix cron errors to only appear in one line instead of introducing another list
2015-05-08 11:23:19 +02:00
Thomas Müller e4c05acf94 Merge pull request #16170 from owncloud/fix-15621
drop global file cache support, fixes #15621
2015-05-08 11:06:00 +02:00
Thomas Müller 4659927d7a Pure numbers are returned as bytes right away 2015-05-08 10:54:54 +02:00
Thomas Müller dfd451777c Merge pull request #16183 from owncloud/fix-16147
check optional parameter before using it, fixes #16147
2015-05-08 10:47:33 +02:00
Morris Jobke 8e565dd3e8 Merge pull request #16159 from owncloud/webdav-cross-storage-miove
use cross storage move when renaming the part file during webdav put
2015-05-08 09:53:12 +02:00
Morris Jobke 1fbf9c3d71 Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pathinfo
Do not run method when the path is empty
2015-05-08 09:49:51 +02:00
Joas Schilling 0577691631 Merge pull request #16175 from owncloud/fix-enc-typo
Fix typo in encryption module message
2015-05-08 09:41:27 +02:00
Jenkins for ownCloud ff0faacf0b [tx-robot] updated from transifex 2015-05-08 01:54:52 -04:00
Frank Karlitschek e9de60f971 8.1.0 beta 1 2015-05-07 18:55:00 -04:00
Arthur Schiwon f2d23d7f02 check optional parameter before using it, fixes #16147 2015-05-07 22:18:29 +02:00
Morris Jobke 5b7e4b3341 Fix typo in encryption module message
* finishes #16021
2015-05-07 18:04:32 +02:00
Thomas Müller 15d134124b Validate the quota value to be a correct value 2015-05-07 17:56:13 +02:00
Jan-Christoph Borchardt 3abaf34709 fix cron errors to only appear in one line instead of introducing another list 2015-05-07 16:19:14 +02:00
Joas Schilling 2b092f2e93 Add a test for getting the versions of an empty path 2015-05-07 16:02:35 +02:00
Joas Schilling 9f2f282191 Merge pull request #16153 from owncloud/CopyEtagHeaderPlugin-noarg
[HHVM] \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take any arguments
2015-05-07 15:38:42 +02:00
Arthur Schiwon 57e8b76f48 drop global file cache support, fixes #15621 2015-05-07 14:52:44 +02:00
Joas Schilling 05fe2006ee Do not run method when the path is empty 2015-05-07 14:31:21 +02:00
Robin Appelman 06a65fab13 use cross storage move when renaming the part file during webdav put 2015-05-07 14:28:31 +02:00
Andreas Fischer 4f6ecd3da6 \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take arguments. 2015-05-07 12:24:06 +02:00
Thomas Müller 2344298954 Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-warning-no-module
Display a message when there is a problem with the default module
2015-05-07 12:03:30 +02:00