Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13848 from owncloud/ldap-warn | Morris Jobke | 2015-02-07 | 1 | -1/+1 |
|\ | | | | | Reduce log level of bind failed to WARN - fixes #11624 | ||||
| * | Reduce log level of bind failed to WARN - fixes #11624 | Morris Jobke | 2015-02-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #13889 from owncloud/catch-exception | Morris Jobke | 2015-02-07 | 2 | -8/+18 |
|\ \ | | | | | | | Catch exception properly | ||||
| * | | Catch exception properly | Lukas Reschke | 2015-02-04 | 2 | -8/+18 |
| | | | | | | | | | | | | | | | | | | `\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`) | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-07 | 10 | -4/+50 |
| | | | |||||
* | | | Revert "Add OCS sharing info to capabilities" | Lukas Reschke | 2015-02-07 | 3 | -280/+0 |
| | | | |||||
* | | | Merge pull request #13692 from rullzer/capabilities | Frank Karlitschek | 2015-02-06 | 3 | -0/+280 |
|\ \ \ | | | | | | | | | Add OCS sharing info to capabilities | ||||
| * | | | Updated unit tests | Roeland Jago Douma | 2015-02-06 | 1 | -43/+123 |
| | | | | |||||
| * | | | Bit better formatting when using json output | Roeland Jago Douma | 2015-02-06 | 1 | -2/+4 |
| | | | | |||||
| * | | | Updated sharing capabilities | Roeland Jago Douma | 2015-02-06 | 1 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | Moved to files_sharing Added more capabilities. Tried to order to capabilities more OO style | ||||
| * | | | Split up unit tests | Roeland Jago Douma | 2015-02-04 | 1 | -16/+24 |
| | | | | |||||
| * | | | Added unit test to test getCapabilities for files_sharing | Roeland Jago Douma | 2015-02-04 | 1 | -0/+113 |
| | | | | |||||
| * | | | Converted getCapabilities to non static function | Roeland Jago Douma | 2015-02-04 | 1 | -7/+24 |
| | | | | |||||
| * | | | Use single quotes | Roeland Jago Douma | 2015-02-04 | 1 | -7/+7 |
| | | | | |||||
| * | | | Only return capabilities if they are set | Roeland Jago Douma | 2015-02-04 | 1 | -14/+8 |
| | | | | |||||
| * | | | Added capabilities whether a server allows public links | Roeland Jago Douma | 2015-02-04 | 2 | -0/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes #13673. It now lists link sharing, passwords enforced, and if public uploads are allowed. | ||||
* | | | | Merge pull request #13954 from owncloud/fix-enc-mig-user-retrieval | Thomas Müller | 2015-02-06 | 2 | -7/+18 |
|\ \ \ \ | | | | | | | | | | | Fix enc mig user retrieval | ||||
| * | | | | always specify limit, except you do like questionable surprises | Arthur Schiwon | 2015-02-06 | 2 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | always specify limit, except you do like questionable surprises, part 2 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-06 | 16 | -86/+94 |
| | | | | | |||||
* | | | | | don't check if we have a valid user | Bjoern Schiessle | 2015-02-06 | 1 | -5/+1 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-06 | 16 | -12/+114 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-05 | 4 | -2/+4 |
| |/ / |/| | | |||||
* | | | Merge pull request #13849 from owncloud/ldap-oc8-update | blizzz | 2015-02-04 | 2 | -49/+1 |
|\ \ \ | |/ / |/| | | no update routine needed from OC 7 to 8 | ||||
| * | | no update routine needed from OC 7 to 8 | Arthur Schiwon | 2015-02-03 | 2 | -49/+1 |
| |/ | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-04 | 18 | -16/+88 |
|/ | |||||
* | Merge pull request #13837 from owncloud/endless-redirect | Thomas Müller | 2015-02-03 | 1 | -0/+1 |
|\ | | | | | Add callCheck to testremote.php | ||||
| * | Add callCheck to testremote.php | Lukas Reschke | 2015-02-02 | 1 | -0/+1 |
| | | | | | | | | 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. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-03 | 22 | -42/+100 |
|/ | |||||
* | Merge pull request #13817 from owncloud/core-apps-dependencies | Morris Jobke | 2015-02-02 | 2 | -0/+6 |
|\ | | | | | encryption requires openssl and user_ldap requires ldap :speak_no_evil: | ||||
| * | encryption requires openssl and user_ldap requires ldap :speak_no_evil: | Thomas Müller | 2015-02-02 | 2 | -0/+6 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-02 | 8 | -12/+22 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-01 | 6 | -2/+6 |
| | | |||||
* | | Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares | Lukas Reschke | 2015-01-31 | 3 | -3/+3 |
|\ \ | | | | | | | make sure that we get the correct user from the path | ||||
| * | | no need to initialize the same view twice | Bjoern Schiessle | 2015-01-30 | 1 | -1/+0 |
| | | | |||||
| * | | get correct user for paths to the trash bin, needed for remote shares if the ↵ | Bjoern Schiessle | 2015-01-30 | 2 | -2/+3 |
| | | | | | | | | | | | | size of of trash gets calculated | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-31 | 44 | -86/+120 |
| |/ |/| | |||||
* | | Merge pull request #13508 from owncloud/failed-delete-cache | Morris Jobke | 2015-01-30 | 3 | -4/+46 |
|\ \ | |/ |/| | Dont remove a file from cache if the delete operation failed | ||||
| * | Dont do a cache rename if we cant delete the source file | Robin Appelman | 2015-01-29 | 1 | -1/+3 |
| | | |||||
| * | Make sure we delete the file when doing a cross storage trashbin move | Robin Appelman | 2015-01-29 | 1 | -0/+2 |
| | | |||||
| * | Detect failed deletes in the trashbin | Robin Appelman | 2015-01-29 | 2 | -3/+41 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-30 | 64 | -66/+42 |
| | | |||||
* | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 2 | -57/+118 |
|\ \ | | | | | | | make sure that we always create a public share key for remote shares | ||||
| * | | Fix intendation | Joas Schilling | 2015-01-29 | 1 | -3/+3 |
| | | | |||||
| * | | Fix more assertions | Joas Schilling | 2015-01-29 | 1 | -26/+26 |
| | | | |||||
| * | | Fix 2 assertions | Joas Schilling | 2015-01-29 | 1 | -3/+3 |
| | | | |||||
| * | | make sure that we always create a public share key for remote shares | Bjoern Schiessle | 2015-01-29 | 2 | -32/+93 |
| | | | |||||
* | | | Merge pull request #13728 from owncloud/federated_cloud | Thomas Müller | 2015-01-29 | 2 | -5/+5 |
|\ \ \ | |_|/ |/| | | rename 'server-to-server sharing' to 'federated cloud' | ||||
| * | | rename 'server-to-server sharing' to 'federated cloud' | Bjoern Schiessle | 2015-01-29 | 2 | -5/+5 |
| |/ | |||||
* | | Merge pull request #13746 from owncloud/no-groups-provisioning-api | Thomas Müller | 2015-01-29 | 2 | -1/+5 |
|\ \ | | | | | | | disallow provisioning api to be enabled for groups only | ||||
| * | | disallow provisioning api to be enabled for groups only | Thomas Müller | 2015-01-29 | 2 | -1/+5 |
| | | |