| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #15592 from owncloud/fix-15590-master | Thomas Müller | 2015-04-15 | 1 | -0/+22 |
|\ |
|
| * | Remove unneeded comments | Morris Jobke | 2015-04-14 | 1 | -13/+0 |
| * | Avoid php message "Invalid argument supplied for foreach()" - refs #15590 | Thomas Müller | 2015-04-14 | 1 | -0/+35 |
* | | Merge pull request #15598 from owncloud/fix-enc-file-size-master | Björn Schießle | 2015-04-14 | 2 | -14/+2 |
|\ \ |
|
| * | | remove calculateUnencryptedSize() - not needed | Thomas Müller | 2015-04-14 | 2 | -14/+2 |
* | | | Merge pull request #13360 from owncloud/cross-storage-move | Morris Jobke | 2015-04-14 | 1 | -7/+81 |
|\ \ \
| |/ /
|/| | |
|
| * | | Properly handle copy/move failures in cross storage copy/move | Robin Appelman | 2015-04-13 | 1 | -5/+14 |
| * | | Improve cross storage copy between local storages | Robin Appelman | 2015-04-13 | 1 | -2/+67 |
* | | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace | Morris Jobke | 2015-04-13 | 1 | -13/+61 |
|\ \ \ |
|
| * | | | Fix namespace duplication and other issues in repairlegacystorages | Joas Schilling | 2015-04-13 | 1 | -13/+61 |
| |/ / |
|
* | | | upda tests | Robin Appelman | 2015-04-13 | 1 | -6/+1 |
* | | | preserve cache data when doing a cross storage move | Robin Appelman | 2015-04-13 | 1 | -0/+74 |
|/ / |
|
* | | Properly add trailing slash to mount point | Vincent Petry | 2015-04-13 | 1 | -0/+4 |
* | | Prevent php message: "Trying to get property of non-object at /xxx/lib/privat... | Thomas Müller | 2015-04-13 | 1 | -0/+45 |
|/ |
|
* | Merge pull request #15541 from owncloud/add-reply-to-support | Lukas Reschke | 2015-04-12 | 2 | -0/+254 |
|\ |
|
| * | Add "Reply-To" support to sharing mails and refactor code | Lukas Reschke | 2015-04-10 | 2 | -0/+254 |
* | | fix cherrypicking | Jörn Friedrich Dreyer | 2015-04-10 | 2 | -28/+37 |
* | | fix filesystem and encryption tests | Jörn Friedrich Dreyer | 2015-04-10 | 1 | -7/+4 |
|/ |
|
* | Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares | Thomas Müller | 2015-04-09 | 1 | -0/+7 |
|\ |
|
| * | only create a db entry for the user in case of a name conflict on group share | Bjoern Schiessle | 2015-04-09 | 1 | -0/+7 |
* | | Merge pull request #15511 from owncloud/fix-typos | Lukas Reschke | 2015-04-09 | 2 | -0/+4 |
|\ \ |
|
| * | | Fix mock object to return proper type | Thomas Müller | 2015-04-09 | 1 | -0/+2 |
| * | | Fix mock object to return proper type | Thomas Müller | 2015-04-09 | 1 | -0/+2 |
| |/ |
|
* | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting | Thomas Müller | 2015-04-09 | 1 | -0/+16 |
|\ \
| |/
|/| |
|
| * | Check if the key exists, before trying to delete it | Joas Schilling | 2015-04-09 | 1 | -0/+16 |
* | | Merge pull request #15314 from owncloud/app-categories-15274 | Lukas Reschke | 2015-04-09 | 2 | -0/+1165 |
|\ \
| |/
|/| |
|
| * | Make user names clickable | Lukas Reschke | 2015-04-03 | 1 | -0/+3 |
| * | Add experimental applications switch | Lukas Reschke | 2015-04-03 | 2 | -0/+1162 |
* | | Merge pull request #15196 from owncloud/limit-file-activities-to-favorites | Morris Jobke | 2015-04-09 | 1 | -1/+102 |
|\ \ |
|
| * | | Make scrutinizer happy | Joas Schilling | 2015-04-01 | 1 | -17/+10 |
| * | | Add tests from getCurrentUserId() method and fix the constructor | Joas Schilling | 2015-03-30 | 1 | -1/+109 |
* | | | Merge pull request #14987 from rullzer/ocs_password_fix2 | Morris Jobke | 2015-04-08 | 1 | -0/+234 |
|\ \ \ |
|
| * | | | Fix unit test | Roeland Jago Douma | 2015-03-30 | 1 | -0/+4 |
| * | | | OCS Fixes to allow setting of password without removing additional settings | Roeland Jago Douma | 2015-03-30 | 1 | -0/+230 |
* | | | | Replace originalStorage in tests with a proper teardown | Vincent Petry | 2015-04-08 | 11 | -72/+25 |
* | | | | Merge pull request #14879 from oparoz/fix-preview-caching | Morris Jobke | 2015-04-07 | 1 | -19/+71 |
|\ \ \ \ |
|
| * | | | | Introducing the maximum size preview | Olivier Paroz | 2015-04-07 | 1 | -19/+71 |
* | | | | | Merge pull request #14472 from owncloud/feature/wipencryptionapp | Thomas Müller | 2015-04-07 | 17 | -94/+453 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | fixing unit test - expected value change due to different size being stored i... | Thomas Müller | 2015-04-07 | 2 | -2/+2 |
| * | | | | fixing unit test execution related to trashbin | Thomas Müller | 2015-04-07 | 2 | -0/+27 |
| * | | | | fixing unit tests | Thomas Müller | 2015-04-07 | 1 | -1/+7 |
| * | | | | fixing unit test execution - test dummy module was behaving wrong | Thomas Müller | 2015-04-07 | 2 | -2/+2 |
| * | | | | fixing unit test execution | Thomas Müller | 2015-04-07 | 1 | -7/+12 |
| * | | | | add unit tests to the keystorage | Bjoern Schiessle | 2015-04-07 | 1 | -40/+45 |
| * | | | | implement webdav copy | Bjoern Schiessle | 2015-04-07 | 1 | -0/+76 |
| * | | | | Properly set size and unencrypted size in the stream unit tests | Thomas Müller | 2015-04-07 | 1 | -9/+8 |
| * | | | | Adding unit test for read and write of big file | Thomas Müller | 2015-04-07 | 1 | -0/+16 |
| * | | | | Fixing encryption storage wrapper tests | Thomas Müller | 2015-04-07 | 2 | -5/+66 |
| * | | | | fixing unit tests for encryption stream wrapper seek | Thomas Müller | 2015-04-07 | 1 | -0/+13 |
| * | | | | fixing unit tests for stream wrapper | Thomas Müller | 2015-04-07 | 1 | -10/+42 |