Commit Graph

9721 Commits

Author SHA1 Message Date
Jenkins for ownCloud 124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Morris Jobke 1bb6de7c1b Merge pull request #13425 from owncloud/phpdoc_cleanup
Cleanup of PHPDoc return types
2015-02-10 01:14:00 +01:00
Morris Jobke 4a99849c6c Merge pull request #13663 from owncloud/issue/13624-notification-when-favorting-fails
Only update favorite icon if the operation was successful
2015-02-10 00:05:39 +01:00
blizzz dc475ab3e0 Merge pull request #13925 from owncloud/fix-13898
no fruitless count attempts, and notification should disappear
2015-02-09 16:55:50 +01:00
Vincent Petry 2bb65dd9b1 Merge pull request #13364 from is-apps/files_external_cleanup
Clean up files_external
2015-02-09 13:20:42 +01:00
Jenkins for ownCloud e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Jenkins for ownCloud 60e771685e [tx-robot] updated from transifex 2015-02-08 01:54:53 -05:00
Morris Jobke 108f3327e6 Merge pull request #13502 from owncloud/streamline-authentication-in-newfile
Streamline CSRF and login check
2015-02-07 13:27:46 +01:00
Morris Jobke 77c0314503 Merge pull request #13655 from Sugaroverdose/fix_#13632
Do not change color of 'new' button on hover and make new file menu more consistent with button
2015-02-07 13:25:43 +01:00
Morris Jobke 57c1b499a1 Merge pull request #13848 from owncloud/ldap-warn
Reduce log level of bind failed to WARN - fixes  #11624
2015-02-07 13:24:11 +01:00
Morris Jobke b2f6b8d62e Merge pull request #13889 from owncloud/catch-exception
Catch exception properly
2015-02-07 13:23:34 +01:00
Jenkins for ownCloud 4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
Lukas Reschke a67627140c Revert "Add OCS sharing info to capabilities" 2015-02-07 00:12:26 +01:00
Frank Karlitschek 0b421e821b Merge pull request #13692 from rullzer/capabilities
Add OCS sharing info to capabilities
2015-02-06 16:46:47 -05:00
Thomas Müller b4b45a1a52 Merge pull request #13954 from owncloud/fix-enc-mig-user-retrieval
Fix enc mig user retrieval
2015-02-06 21:26:32 +01:00
Jenkins for ownCloud 988027fdca [tx-robot] updated from transifex 2015-02-06 15:26:04 -05:00
Arthur Schiwon 15b2d33599 always specify limit, except you do like questionable surprises
always specify limit, except you do like questionable surprises, part 2
2015-02-06 17:51:40 +01:00
Bjoern Schiessle b2e13229fa don't check if we have a valid user 2015-02-06 17:31:15 +01:00
Roeland Jago Douma fe2aca5aa8 Updated unit tests 2015-02-06 12:13:53 +01:00
Roeland Jago Douma 3be3e20c0f Bit better formatting when using json output 2015-02-06 10:55:33 +01:00
Roeland Jago Douma d4e361db44 Updated sharing capabilities
Moved to files_sharing
Added more capabilities.
Tried to order to capabilities more OO style
2015-02-06 10:33:08 +01:00
Jenkins for ownCloud bd60abbefc [tx-robot] updated from transifex 2015-02-06 01:57:07 -05:00
Arthur Schiwon 2bcb786214 no fruitless count attempts, and notification should disappear 2015-02-05 16:25:22 +01:00
Jenkins for ownCloud 9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05:00
Lukas Reschke cc80ce70b4 Catch exception properly
`\OCA\Files\Helper::buildFileStorageStatistics` might throw an exception from `OC_Helper::getStorageInfo`, previously this lead to a uncatched exception being thrown when invoking this methods.

This was user triggable by for example calling `/index.php/apps/files/ajax/delete.php` with a not existing dir (for example `dir=asdf/../&allfiles=true`)
2015-02-04 15:58:16 +01:00
Roeland Jago Douma bcae79a85a Split up unit tests 2015-02-04 15:49:20 +01:00
Roeland Jago Douma 083ebca812 Added unit test to test getCapabilities for files_sharing 2015-02-04 14:56:31 +01:00
Roeland Jago Douma 0452fde212 Converted getCapabilities to non static function 2015-02-04 14:56:31 +01:00
Roeland Jago Douma 4801d9c02a Use single quotes 2015-02-04 14:56:31 +01:00
Roeland Jago Douma ea1f726b7d Only return capabilities if they are set 2015-02-04 14:56:31 +01:00
Roeland Jago Douma b3ea849a87 Added capabilities whether a server allows public links
This fixes #13673.
It now lists link sharing, passwords enforced, and if public uploads are
allowed.
2015-02-04 14:56:31 +01:00
blizzz 09216ef49b Merge pull request #13849 from owncloud/ldap-oc8-update
no update routine needed from OC 7 to 8
2015-02-04 14:19:58 +01:00
Jenkins for ownCloud 77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Morris Jobke 166c4e266f Reduce log level of bind failed to WARN - fixes #11624 2015-02-03 11:44:28 +01:00
Arthur Schiwon 02a1cc01b6 no update routine needed from OC 7 to 8 2015-02-03 11:43:47 +01:00
Thomas Müller a24d73aa0c Merge pull request #13837 from owncloud/endless-redirect
Add callCheck to testremote.php
2015-02-03 11:28:15 +01:00
Jenkins for ownCloud 6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Lukas Reschke 4270188252 Add callCheck to testremote.php
Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
2015-02-02 19:39:41 +01:00
Morris Jobke 1bb8d5978c Merge pull request #13817 from owncloud/core-apps-dependencies
encryption requires openssl and user_ldap requires ldap 🙊
2015-02-02 12:49:45 +01:00
Joas Schilling 12f835b198 toggle back when the action was not performed 2015-02-02 11:17:55 +01:00
Morris Jobke 8e2b99c3a9 fix response for tags and show error message 2015-02-02 11:17:54 +01:00
Joas Schilling df75a6e5f3 Only update favorite icon if the operation was successful
Also shows a notification in case an error occured on updating the tags
2015-02-02 11:17:54 +01:00
Thomas Müller c9543c9e8e encryption requires openssl and user_ldap requires ldap 🙊 2015-02-02 09:20:05 +01:00
Jenkins for ownCloud 800829d93d [tx-robot] updated from transifex 2015-02-02 01:54:32 -05:00
Jenkins for ownCloud a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Lukas Reschke 012d06e8a2 Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares
make sure that we get the correct user from the path
2015-01-31 08:52:07 +01:00
Jenkins for ownCloud c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Bjoern Schiessle 9ef96e4dd5 no need to initialize the same view twice 2015-01-30 14:39:31 +01:00
Bjoern Schiessle ed29c6ce86 get correct user for paths to the trash bin, needed for remote shares if the size of of trash gets calculated 2015-01-30 14:39:09 +01:00
Morris Jobke e7900ba255 Merge pull request #13508 from owncloud/failed-delete-cache
Dont remove a file from cache if the delete operation failed
2015-01-30 14:08:44 +01:00