summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | create new mounts every time the mount provider is calledRobin Appelman2015-09-181-2/+4
| * | | | | | | clear up tests a bitRobin Appelman2015-09-181-6/+8
* | | | | | | | Merge pull request #17689 from owncloud/repair-ocs-idsThomas Müller2015-09-184-2/+198
|\ \ \ \ \ \ \ \
| * | | | | | | | Prefer OCS Id from databaseLukas Reschke2015-09-181-0/+6
| * | | | | | | | Add repair step for outdated OCS IDsLukas Reschke2015-09-183-2/+192
|/ / / / / / / /
* | | | | | | | Merge pull request #18911 from owncloud/preview-show-cached-directlyThomas Müller2015-09-181-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Show cached previews directlyRobin Appelman2015-09-081-0/+6
* | | | | | | | | Merge pull request #18840 from owncloud/fix-app-disable-routeThomas Müller2015-09-183-50/+16
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fix-app-disable-routeRobin McCorkell2015-09-14644-4844/+10008
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Get sorted navigation listRobin McCorkell2015-09-061-1/+1
| * | | | | | | | | | Rebuild app navigation in JSRobin McCorkell2015-09-053-50/+16
* | | | | | | | | | | Merge pull request #18943 from owncloud/trashbin-expiration-cronjob-no-dbThomas Müller2015-09-188-1/+245
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Log deleted filesVictor Dubiniuk2015-09-161-0/+4
| * | | | | | | | | | | Add PHPDocLukas Reschke2015-09-162-2/+16
| * | | | | | | | | | | Updates according to reviewVictor Dubiniuk2015-09-162-11/+23
| * | | | | | | | | | | Fix testsVictor Dubiniuk2015-09-161-3/+6
| * | | | | | | | | | | Add expiration cronjobVictor Dubiniuk2015-09-168-1/+212
* | | | | | | | | | | | Merge pull request #18983 from owncloud/fix_18926Thomas Müller2015-09-183-5/+71
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | check for the right user if we can change his passwordBjoern Schiessle2015-09-143-5/+71
* | | | | | | | | | | | | Merge pull request #18679 from owncloud/add-reshare-activitiesThomas Müller2015-09-181-4/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add reshare activities for the parent sharee and the original file ownerJoas Schilling2015-09-151-4/+38
* | | | | | | | | | | | | | Merge pull request #18986 from owncloud/federated_capabilitiesThomas Müller2015-09-182-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Expose federated sharing capabilities to authenticated usersRoeland Jago Douma2015-09-152-0/+42
* | | | | | | | | | | | | | | Merge pull request #19087 from owncloud/disable-remote-share-notifications-fo...Thomas Müller2015-09-183-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Disable the remote sharing notifications until they work properlyJoas Schilling2015-09-173-2/+8
| * | | | | | | | | | | | | | | Change the order of the buttonsJoas Schilling2015-09-171-5/+5
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #19092 from owncloud/allow-checking-for-notifiersThomas Müller2015-09-182-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Allow checking whether there are notifiers registeredJoas Schilling2015-09-172-0/+14
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #19017 from owncloud/dav-download-testsThomas Müller2015-09-182-1/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix tests with empty response bodyRobin Appelman2015-09-161-1/+1
| * | | | | | | | | | | | | | Add tests for downloading files over davRobin Appelman2015-09-162-1/+61
* | | | | | | | | | | | | | | Merge pull request #18724 from owncloud/expiration-cronjobThomas Müller2015-09-186-1/+171
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Correct method title. Add docblockVictor Dubiniuk2015-09-162-2/+6
| * | | | | | | | | | | | | | | Postrebase cleanupVictor Dubiniuk2015-09-152-16/+3
| * | | | | | | | | | | | | | | Add expiration for versions older than maxVictor Dubiniuk2015-09-156-1/+180
* | | | | | | | | | | | | | | | Merge pull request #19069 from owncloud/ext-s3-cephThomas Müller2015-09-184-4/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make AmazonS3 path style actually workRobin McCorkell2015-09-161-1/+4
| * | | | | | | | | | | | | | | AmazonS3 Ceph testsRobin McCorkell2015-09-163-3/+120
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #19088 from owncloud/fix-availability-intThomas Müller2015-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Explicitly cast number to integerRobin McCorkell2015-09-161-1/+1
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenanceThomas Müller2015-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Make sure Maintenance is checked before auth and othersJoas Schilling2015-09-171-1/+1
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #19126 from owncloud/fix-19117Thomas Müller2015-09-181-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fix missing checkboxes in share dialogHendrik Leppelsack2015-09-171-6/+12
* | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-1822-20/+52
* | | | | | | | | | | | | | | | Merge pull request #19090 from owncloud/ext-priority-logicThomas Müller2015-09-173-3/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Unit tests for UserGlobalStoragesService::getUniqueStorages()Robin McCorkell2015-09-161-2/+78
| * | | | | | | | | | | | | | | | Fix external storage priority logicRobin McCorkell2015-09-162-1/+58
* | | | | | | | | | | | | | | | | Merge pull request #19121 from owncloud/sidebar-design-detailsThomas Müller2015-09-174-36/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fix sidebar Sharing layout a bitJan-Christoph Borchardt2015-09-172-24/+16