aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix sharing trashbin integration testsRobin Appelman2018-09-202-3/+23
* fix trashbin infoparsers interfering with other dav clientsRobin Appelman2018-09-201-0/+1
* more trashbin integration testsRobin Appelman2018-09-202-26/+101
* fix trashbin integration tests and add a few moreRobin Appelman2018-09-203-66/+85
* quote paths in behat.ymlRobin Appelman2018-09-201-10/+10
* use dav trashbin api for restoreRobin Appelman2018-09-202-48/+33
* use dav trash api for removing from trashbinRobin Appelman2018-09-202-73/+67
* remove old trashbin apiRobin Appelman2018-09-204-232/+0
* remove old trashbin endpointRobin Appelman2018-09-203-55/+9
* Use trashbin dav endpoint to list trash in webuiRobin Appelman2018-09-201-43/+39
* pass existing data to info parsersRobin Appelman2018-09-201-1/+1
* expose additional props from trashbin sabre endpointRobin Appelman2018-09-209-130/+116
* Merge pull request #11228 from nextcloud/fix/11144/empty-favorite-namesJoas Schilling2018-09-202-5/+70
|\
| * Fixes empty favorite names for trailing slashesMichael Weimann2018-09-192-5/+70
* | [tx-robot] updated from transifexNextcloud bot2018-09-2018-0/+22
* | Merge pull request #11292 from nextcloud/revert/9442/do-not-apcu-cache-the-au...blizzz2018-09-191-2/+0
|\ \
| * | Revert "Use APCu caching of composer"Joas Schilling2018-09-191-2/+0
* | | Merge pull request #11134 from nextcloud/locale-template-fixJoas Schilling2018-09-193-2/+34
|\ \ \
| * | | Fix since tagJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| * | | Fallback to $lang if no $locale matchJohn Molakvoæ (skjnldsv)2018-09-131-1/+1
| * | | TypehintJohn Molakvoæ (skjnldsv)2018-09-102-3/+2
| * | | Since requirementJohn Molakvoæ (skjnldsv)2018-09-101-0/+1
| * | | Fix public l10nJohn Molakvoæ (skjnldsv)2018-09-101-1/+2
| * | | Use user locale as default in the templateJohn Molakvoæ (skjnldsv)2018-09-103-2/+33
* | | | Merge pull request #10847 from nextcloud/fix-icons-cacherJoas Schilling2018-09-191-1/+1
|\ \ \ \
| * | | | Fix icons cacher regex for compressed outputJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
* | | | | [tx-robot] updated from transifexNextcloud bot2018-09-194-0/+4
* | | | | Merge pull request #11171 from nextcloud/bugfix/noid/shared-by-info-for-room-...Joas Schilling2018-09-191-10/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Better shared-by info for conversations without namesJoas Schilling2018-09-111-10/+22
* | | | | Merge pull request #11268 from nextcloud/include-empty-directories-in-the-def...blizzz2018-09-191-0/+2
|\ \ \ \ \
| * | | | | Include empty directories in the default state of acceptance testsDaniel Calviño Sánchez2018-09-181-0/+2
* | | | | | Merge pull request #11041 from nextcloud/fix/noid/get_permission_of_storage_f...Joas Schilling2018-09-193-11/+18
|\ \ \ \ \ \
| * | | | | | Update test now that we check permissions properlyRoeland Jago Douma2018-09-061-7/+7
| * | | | | | Properly check share permissionsRoeland Jago Douma2018-09-061-2/+8
| * | | | | | Fix shared cacheRoeland Jago Douma2018-09-061-1/+1
| * | | | | | Check the permission of the underlying storageRoeland Jago Douma2018-09-061-1/+2
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-1914-0/+44
* | | | | | | Merge pull request #11262 from nextcloud/drone-postgres-db-nameblizzz2018-09-181-1/+3
|\ \ \ \ \ \ \
| * | | | | | | use a dummy database name for the default postgres database nameRobin Appelman2018-09-171-1/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #11258 from nextcloud/fix-contacts-menu-on-mentionsblizzz2018-09-182-8/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix position of contacts menu shown on mentionsDaniel Calviño Sánchez2018-09-151-0/+5
| * | | | | | | Fix contacts menu not triggered on certain areas of a mentionDaniel Calviño Sánchez2018-09-151-8/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #11257 from nextcloud/prevent-comment-being-composed-from-...blizzz2018-09-181-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Prevent comment being composed from overlapping the submit buttonDaniel Calviño Sánchez2018-09-061-0/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #11245 from nextcloud/bugfix/8288/userldap-getusername-on-...blizzz2018-09-181-5/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Check if user is null before getUsernameDaniel Kesselberg2018-09-161-5/+7
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-184-2/+4
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #11251 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Joas Schilling2018-09-172-5/+5
|\ \ \ \ \ \
| * | | | | | Bump vue-loader from 15.4.1 to 15.4.2 in /apps/updatenotificationdependabot[bot]2018-09-172-5/+5
* | | | | | | Merge pull request #11252 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Joas Schilling2018-09-172-186/+153
|\ \ \ \ \ \ \