Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash | Vincent Petry | 2015-05-18 | 2 | -1/+29 |
|\ | | | | | also encrypt files in trash bin | ||||
| * | also encrypt files in trash bin | Bjoern Schiessle | 2015-05-18 | 2 | -1/+29 |
| | | |||||
* | | Merge pull request #16398 from owncloud/fix-php-docv8.1.0beta2 | Joas Schilling | 2015-05-18 | 1 | -1/+1 |
|\ \ | | | | | | | Fix PHPDoc of public interface ILockingProvider | ||||
| * | | Fix PHPDoc of public interface ILockingProvider | Morris Jobke | 2015-05-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #16243 from owncloud/error_if_download_failed | Vincent Petry | 2015-05-18 | 14 | -56/+208 |
|\ \ \ | |/ / |/| | | redirect to error page if download failed | ||||
| * | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 14 | -56/+208 |
| |/ | |||||
* | | Merge pull request #16364 from owncloud/add-warning-webdav | Morris Jobke | 2015-05-18 | 2 | -3/+80 |
|\ \ | | | | | | | Add notice that WebDAV interface is not intended for browsers | ||||
| * | | Add unit tests for \OC\Connector\Sabre\DummyGetResponsePlugin | Lukas Reschke | 2015-05-15 | 1 | -0/+65 |
| | | | |||||
| * | | Add notice that WebDAV interface is not intended for browsers | Lukas Reschke | 2015-05-15 | 1 | -3/+15 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16359 | ||||
* | | | Merge pull request #15738 from rullzer/fix_15611 | Vincent Petry | 2015-05-18 | 2 | -10/+53 |
|\ \ \ | | | | | | | | | Fix to make sure expiration date is properly set | ||||
| * | | | Fix to make sure expiration date is properly set | Roeland Jago Douma | 2015-05-18 | 2 | -10/+53 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | This did not happen correctly when the password was enforced since a different code path was taken. * moved generation of the default date string to separate function * added unit test | ||||
* | | | Merge pull request #15870 from rullzer/fix_15812 | Morris Jobke | 2015-05-18 | 2 | -0/+111 |
|\ \ \ | |/ / |/| | | Reset share dialog values - more | ||||
| * | | Reset share dialog values so we start out clean | Roeland Jago Douma | 2015-05-18 | 2 | -0/+111 |
|/ / | | | | | | | * Unit test | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-18 | 6 | -6/+48 |
| | | |||||
* | | 8.1 beta 2 | Frank Karlitschek | 2015-05-17 | 1 | -2/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-17 | 6 | -0/+6 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-16 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips | Thomas Müller | 2015-05-15 | 3 | -18/+14 |
|\ \ | | | | | | | [enc2]fixing recovery tooltip | ||||
| * | | fixing test | Clark Tomlinson | 2015-05-11 | 1 | -9/+9 |
| | | | |||||
| * | | adding username as param for isrecoveryenabled | Clark Tomlinson | 2015-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | fixing recovery tooltip | Clark Tomlinson | 2015-05-04 | 2 | -8/+4 |
| | | | |||||
* | | | Merge pull request #16242 from owncloud/use-oc-webroot | Thomas Müller | 2015-05-15 | 1 | -4/+1 |
|\ \ \ | | | | | | | | | Use OC.webroot instead of calculating the URL | ||||
| * | | | Use OC.webroot instead of calculating the URL | Lukas Reschke | 2015-05-11 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota | Vincent Petry | 2015-05-15 | 4 | -17/+46 |
|\ \ \ \ | | | | | | | | | | | Validate the quota value to be a correct value | ||||
| * | | | | Pure numbers are returned as bytes right away | Thomas Müller | 2015-05-08 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Validate the quota value to be a correct value | Thomas Müller | 2015-05-07 | 4 | -17/+43 |
| | | | | | |||||
* | | | | | Merge pull request #16265 from owncloud/update-bundle | Lukas Reschke | 2015-05-15 | 1 | -68/+196 |
|\ \ \ \ \ | | | | | | | | | | | | | Update CA bundle | ||||
| * | | | | | Update CA bundle | Lukas Reschke | 2015-05-12 | 1 | -68/+196 |
| | | | | | | |||||
* | | | | | | Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection | Thomas Müller | 2015-05-15 | 3 | -0/+199 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | throw exception when LDAP Connection was lost | ||||
| * | | | | | | do not execute integration tests when executing autotest.sh | Thomas Müller | 2015-05-15 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | add integration test to ensure correct behaviour on lost connections | Arthur Schiwon | 2015-04-24 | 1 | -0/+192 |
| | | | | | | | |||||
| * | | | | | | throw exception when LDAP Connection was lost | Arthur Schiwon | 2015-04-22 | 1 | -0/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16367 from owncloud/fix-facade-autotest | Thomas Müller | 2015-05-15 | 1 | -14/+21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix facade autotest | ||||
| * | | | | | | | Store in array to allow paths with whitespace | Lukas Reschke | 2015-05-15 | 1 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | Add support for facade binary scripts | Lukas Reschke | 2015-05-15 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16296 | ||||
| * | | | | | | | Lint bash script using ShellCheck | Lukas Reschke | 2015-05-15 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref http://www.shellcheck.net/about.html | ||||
* | | | | | | | | Merge pull request #16292 from owncloud/webdav-storage-fireprehooks | Joas Schilling | 2015-05-15 | 3 | -44/+334 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fire prehooks when uploading directly to storage | ||||
| * | | | | | | | | Fire prehooks when uploading directly to storage | Vincent Petry | 2015-05-13 | 3 | -44/+334 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #16337 from owncloud/versions-expireforowner | Joas Schilling | 2015-05-15 | 3 | -12/+99 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use owner when expiring versions, not the logged in user | ||||
| * | | | | | | | | | Properly log out test users in unit tests | Vincent Petry | 2015-05-15 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added unit tests for versions storing | Vincent Petry | 2015-05-15 | 1 | -4/+86 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Use owner when expiring versions, not the logged in user | Vincent Petry | 2015-05-13 | 1 | -8/+11 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #16273 from owncloud/trash-fixrestoreuniquename | Joas Schilling | 2015-05-15 | 2 | -6/+338 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | Fix restoring files from trash with unique name | ||||
| * | | | | | | | | | Fix restoring files from trash with unique name | Vincent Petry | 2015-05-15 | 2 | -6/+338 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring a file, a unique name needs to be generated if a file with the same name already exists. Also fixed the restore() method to return false if the file to restore does not exist. Added unit tests to cover restore cases. | ||||
* | | | | | | | | | Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash | Joas Schilling | 2015-05-15 | 2 | -15/+199 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added rmdir to trashbin storage wrapper | ||||
| * | | | | | | | | | Added rmdir to trashbin storage wrapper | Vincent Petry | 2015-05-12 | 2 | -15/+199 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | | | Merge pull request #16323 from owncloud/enc_webdav_fixes | Thomas Müller | 2015-05-15 | 4 | -18/+28 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | some encryption fixes | ||||
| * | | | | | | | | | delete all file keys doesn't need the encryption module as parameter; ↵ | Bjoern Schiessle | 2015-05-13 | 4 | -18/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories | ||||
* | | | | | | | | | | Merge pull request #16342 from owncloud/fix_16338 | Lukas Reschke | 2015-05-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fix preview hooks, enable_previews default is true | ||||
| * | | | | | | | | | | fix preview hooks, enable_previews default is true | Georg Ehrke | 2015-05-13 | 1 | -1/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | |