Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 8.2 beta1v8.2beta1 | C Montero-Luque | 2015-09-18 | 1 | -2/+2 |
* | Merge pull request #19008 from owncloud/jquery_avatar_tests | Thomas Müller | 2015-09-18 | 2 | -1/+241 |
|\ | |||||
| * | Added js tests for jquery.avatar | Roeland Jago Douma | 2015-09-14 | 2 | -1/+241 |
* | | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7 | Thomas Müller | 2015-09-18 | 2 | -4/+1 |
|\ \ | |||||
| * \ | Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core in... | Thomas Müller | 2015-09-18 | 2 | -4/+1 |
| |\ \ | |||||
| | * | | adapted to changed subproject commit | Nicolai Ehemann | 2015-09-18 | 1 | -0/+0 |
| | * | | use zipstreamer via composer | Nicolai Ehemann | 2015-09-14 | 2 | -3/+0 |
| | * | | lib/private/files.php: adapted to minimally changed ZipStreamer API | Nicolai Ehemann | 2015-09-14 | 2 | -2/+2 |
* | | | | Merge pull request #19098 from owncloud/db-lock-no-transaction | Thomas Müller | 2015-09-18 | 3 | -17/+90 |
|\ \ \ \ | |||||
| * | | | | improve doc | Robin Appelman | 2015-09-17 | 1 | -1/+1 |
| * | | | | expire old lock rows | Robin Appelman | 2015-09-17 | 3 | -13/+101 |
| * | | | | Remove the need for the transaction in the database locking backend | Robin Appelman | 2015-09-17 | 1 | -16/+1 |
* | | | | | Merge pull request #19058 from owncloud/multiselect-bar-style | Thomas Müller | 2015-09-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | adjust multiselect bar to controls bar, fix #18989 | Jan-Christoph Borchardt | 2015-09-15 | 1 | -1/+1 |
* | | | | | | Merge pull request #18901 from owncloud/encryption-dav-tests | Thomas Müller | 2015-09-18 | 5 | -9/+143 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | reuse the same datadir | Robin Appelman | 2015-09-18 | 1 | -1/+2 |
| * | | | | | Add tests for doing dav requests with encryption enabled | Robin Appelman | 2015-09-18 | 1 | -0/+25 |
| * | | | | | Add trait to enable encryption for a unit test | Robin Appelman | 2015-09-18 | 1 | -0/+104 |
| * | | | | | create new mounts every time the mount provider is called | Robin Appelman | 2015-09-18 | 1 | -2/+4 |
| * | | | | | clear up tests a bit | Robin Appelman | 2015-09-18 | 1 | -6/+8 |
* | | | | | | Merge pull request #17689 from owncloud/repair-ocs-ids | Thomas Müller | 2015-09-18 | 4 | -2/+198 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Prefer OCS Id from database | Lukas Reschke | 2015-09-18 | 1 | -0/+6 |
| * | | | | | | Add repair step for outdated OCS IDs | Lukas Reschke | 2015-09-18 | 3 | -2/+192 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #18911 from owncloud/preview-show-cached-directly | Thomas Müller | 2015-09-18 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show cached previews directly | Robin Appelman | 2015-09-08 | 1 | -0/+6 |
* | | | | | | | Merge pull request #18840 from owncloud/fix-app-disable-route | Thomas Müller | 2015-09-18 | 3 | -50/+16 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into fix-app-disable-route | Robin McCorkell | 2015-09-14 | 644 | -4844/+10008 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Get sorted navigation list | Robin McCorkell | 2015-09-06 | 1 | -1/+1 |
| * | | | | | | | | Rebuild app navigation in JS | Robin McCorkell | 2015-09-05 | 3 | -50/+16 |
* | | | | | | | | | Merge pull request #18943 from owncloud/trashbin-expiration-cronjob-no-db | Thomas Müller | 2015-09-18 | 8 | -1/+245 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Log deleted files | Victor Dubiniuk | 2015-09-16 | 1 | -0/+4 |
| * | | | | | | | | | Add PHPDoc | Lukas Reschke | 2015-09-16 | 2 | -2/+16 |
| * | | | | | | | | | Updates according to review | Victor Dubiniuk | 2015-09-16 | 2 | -11/+23 |
| * | | | | | | | | | Fix tests | Victor Dubiniuk | 2015-09-16 | 1 | -3/+6 |
| * | | | | | | | | | Add expiration cronjob | Victor Dubiniuk | 2015-09-16 | 8 | -1/+212 |
* | | | | | | | | | | Merge pull request #18983 from owncloud/fix_18926 | Thomas Müller | 2015-09-18 | 3 | -5/+71 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | check for the right user if we can change his password | Bjoern Schiessle | 2015-09-14 | 3 | -5/+71 |
* | | | | | | | | | | | Merge pull request #18679 from owncloud/add-reshare-activities | Thomas Müller | 2015-09-18 | 1 | -4/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add reshare activities for the parent sharee and the original file owner | Joas Schilling | 2015-09-15 | 1 | -4/+38 |
* | | | | | | | | | | | | Merge pull request #18986 from owncloud/federated_capabilities | Thomas Müller | 2015-09-18 | 2 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Expose federated sharing capabilities to authenticated users | Roeland Jago Douma | 2015-09-15 | 2 | -0/+42 |
* | | | | | | | | | | | | | Merge pull request #19087 from owncloud/disable-remote-share-notifications-fo... | Thomas Müller | 2015-09-18 | 3 | -7/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Disable the remote sharing notifications until they work properly | Joas Schilling | 2015-09-17 | 3 | -2/+8 |
| * | | | | | | | | | | | | | Change the order of the buttons | Joas Schilling | 2015-09-17 | 1 | -5/+5 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #19092 from owncloud/allow-checking-for-notifiers | Thomas Müller | 2015-09-18 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Allow checking whether there are notifiers registered | Joas Schilling | 2015-09-17 | 2 | -0/+14 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #19017 from owncloud/dav-download-tests | Thomas Müller | 2015-09-18 | 2 | -1/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | fix tests with empty response body | Robin Appelman | 2015-09-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | Add tests for downloading files over dav | Robin Appelman | 2015-09-16 | 2 | -1/+61 |
* | | | | | | | | | | | | | Merge pull request #18724 from owncloud/expiration-cronjob | Thomas Müller | 2015-09-18 | 6 | -1/+171 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |