Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Typo: Missing "n" | cmeh | 2015-02-24 | 1 | -1/+1 |
| | | | A missing "n" was added in line 63. | ||||
* | [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 |
| | | | |||||
* | | | Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step | Thomas Müller | 2015-01-29 | 3 | -21/+115 |
|\ \ \ | | | | | | | | | adding console command to migrate encryption keys - refs #13450 | ||||
| * | | | user fs must be setup up, so that the real user folder is mounted on the ↵ | Arthur Schiwon | 2015-01-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | username based path | ||||
| * | | | adding console command to migrate encryption keys - refs #13450 | Thomas Müller | 2015-01-22 | 3 | -21/+114 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-29 | 24 | -0/+48 |
| |/ / |/| | | |||||
* | | | Merge pull request #13401 from is-apps/amazon_s3_checkboxes | Thomas Müller | 2015-01-28 | 1 | -1/+7 |
|\ \ \ | | | | | | | | | Tidy formatting of Amazon S3 checkboxes | ||||
| * | | | Align checkbox configuration in external files | Ross Nicoll | 2015-01-19 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | Modified CSS for files_external application to render labels around checkboxes at the same width as other input elements, aligning them with other elements on the same page. | ||||
* | | | | Fix trash error when deleting files with the same name at the same time ↵ | Robin Appelman | 2015-01-28 | 1 | -0/+3 |
| |_|/ |/| | | | | | | | | (happens in unit tests) | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-28 | 14 | -10/+46 |
| | | | |||||
* | | | Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage | Morris Jobke | 2015-01-28 | 4 | -25/+144 |
|\ \ \ | | | | | | | | | Catch storage exception in scanner for remote shares | ||||
| * | | | Add back exit() | Vincent Petry | 2015-01-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Catch storage exception in scanner for remote shares | Vincent Petry | 2015-01-26 | 4 | -25/+144 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an exception occurs during scan of a remote share, the share is checked for availability. If the storage is gone, it will be removed automatically. Also, getDirectoryContent() will now skip unavailable storages. | ||||
* | | | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix | Vincent Petry | 2015-01-27 | 7 | -4/+226 |
|\ \ \ \ | | | | | | | | | | | Call final unlink in trash wrapper's storage | ||||
| * | | | | Fix bogus deletion on copy + unlink through rename | Vincent Petry | 2015-01-26 | 3 | -0/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Cross-storage rename would cause copy + unlink. That unlink operation must not trigger the trashbin. | ||||
| * | | | | Add trashbin storage wrapper unit test for versions | Vincent Petry | 2015-01-23 | 1 | -6/+76 |
| | | | | | |||||
| * | | | | Simplify trash storage unit tests | Vincent Petry | 2015-01-23 | 1 | -46/+16 |
| | | | | | | | | | | | | | | | | | | | | Needed to make it properly init the mount points | ||||
| * | | | | Unregister trashbin storage wrapper at the end of tests | Vincent Petry | 2015-01-23 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Some more tests that uses the storage wrapper now remove it afterwards | ||||
| * | | | | Preserve mtime when doing cross storage move | Robin Appelman | 2015-01-23 | 1 | -41/+2 |
| | | | | | |||||
| * | | | | Remove storage wrapper for oc_trashbin in unit test | Vincent Petry | 2015-01-23 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Only move files from the current user to the trashbin | Robin Appelman | 2015-01-23 | 1 | -4/+5 |
| | | | | |