summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexv12.0.1RC1Nextcloud bot2017-07-1854-122/+122
* Merge pull request #5728 from nextcloud/bump-stable12-versionLukas Reschke2017-07-171-2/+2
|\
| * 12.0.1RC1Lukas Reschke2017-07-161-2/+2
* | [tx-robot] updated from transifexNextcloud bot2017-07-1716-134/+1196
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-15158-4126/+4134
* Merge pull request #5730 from nextcloud/stable12-fix-droneMorris Jobke2017-07-144-19/+25
|\
| * Temporarily disable acceptance and object storage testsMorris Jobke2017-07-141-10/+10
| * Fix droneMorris Jobke2017-07-144-9/+15
|/
* Merge pull request #5711 from nextcloud/null-user-exist-12blizzz2017-07-141-0/+3
|\
| * null users dont existRobin Appelman2017-07-131-0/+3
* | [tx-robot] updated from transifexNextcloud bot2017-07-1430-258/+406
* | Merge pull request #5710 from nextcloud/nested-permissions-mask-12Morris Jobke2017-07-132-1/+16
|\ \
| * | Fix scan permissions with nested permissions masksRobin Appelman2017-07-132-1/+16
| |/
* | Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12Morris Jobke2017-07-138-4/+393
|\ \
| * | chunk getting invalid paths and reuse queriesRobin Appelman2017-07-132-27/+99
| * | use a generator instead of fetching all rows at onceRobin Appelman2017-07-131-2/+9
| * | adjust to moved repair stepRobin Appelman2017-07-133-4/+14
| * | Run repair step only onceMorris Jobke2017-07-135-5/+11
| * | Add repair step for invalid pathsRobin Appelman2017-07-133-2/+236
| * | fix moving folders out of a cache jailRobin Appelman2017-07-132-1/+61
| |/
* | Merge pull request #5697 from nextcloud/stable12-4984Morris Jobke2017-07-133-7/+45
|\ \ | |/ |/|
| * Write cert bundle to tmp file firstRoeland Jago Douma2017-07-123-7/+45
* | Merge pull request #5692 from nextcloud/upload-hidden-filelist-12Morris Jobke2017-07-134-9/+15
|\ \
| * | Fix autoloaderMorris Jobke2017-07-132-0/+2
| * | fix testRobin Appelman2017-07-121-9/+11
| * | properly block file upload to non-active filelistRobin Appelman2017-07-121-0/+2
* | | [tx-robot] updated from transifexNextcloud bot2017-07-1356-270/+376
|/ /
* | Merge pull request #5687 from nextcloud/jail-propagator-12Roeland Jago Douma2017-07-123-26/+27
|\ \
| * | Fix propagating changes within jail wrapperRobin Appelman2017-07-113-26/+27
* | | Merge pull request #5463 from nextcloud/shared-cache-during-init-12Roeland Jago Douma2017-07-121-1/+8
|\ \ \
| * | | dont die if we try to access the shared cache while setting up the shared sto...Robin Appelman2017-06-191-1/+8
* | | | Merge pull request #5686 from nextcloud/backport-5520Morris Jobke2017-07-121-2/+3
|\ \ \ \
| * | | | hint should not be clickableMaxence Lange2017-07-111-2/+3
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-12154-1636/+1896
* | | | Merge pull request #5484 from nextcloud/fix-if-circles-is-deletedMorris Jobke2017-07-113-7/+13
|\ \ \ \ | |/ / / |/| | |
| * | | wrong callMaxence Lange2017-07-112-2/+2
| * | | verify that circles is installedMaxence Lange2017-07-113-7/+13
|/ / /
* | | Merge pull request #5435 from nextcloud/backport-5124-allow-dirlisting-with-u...Lukas Reschke2017-07-112-4/+11
|\ \ \
| * | | Fix unit testJoas Schilling2017-06-161-4/+5
| * | | Allow dir-listing also when one child is blocked by access controlJoas Schilling2017-06-161-0/+6
* | | | Merge pull request #5679 from nextcloud/stable12-5656-fix-unselecting-items-o...Morris Jobke2017-07-1110-41/+410
|\ \ \ \
| * | | | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-113-0/+3
| * | | | Add select2-toggleselect to the JavaScript files to loadDaniel Calviño Sánchez2017-07-111-0/+1
| * | | | Add acceptance tests for unselecting items in dropdown for tagsDaniel Calviño Sánchez2017-07-115-0/+334
| * | | | Extract app navigation elements to its own contextDaniel Calviño Sánchez2017-07-113-39/+70
| * | | | Fix typoDaniel Calviño Sánchez2017-07-111-2/+2
* | | | | Merge pull request #5670 from nextcloud/backport-5669-fix-remote-share-activi...Morris Jobke2017-07-112-8/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix owner cloud id in unshare activityJoas Schilling2017-07-101-1/+1
| * | | | Fix activity emails for accept/decline of remote sharesJoas Schilling2017-07-102-7/+13
* | | | | Merge pull request #5667 from nextcloud/5649-stable12Morris Jobke2017-07-112-9/+11
|\ \ \ \ \