summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13771 from nextcloud/stable15-13217-add-acceptance-tests-...Morris Jobke2019-01-244-0/+304
|\
| * Add acceptance tests for moving and copying selections to another folderDaniel Calviño Sánchez2019-01-232-0/+126
| * Add acceptance tests for moving and copying files to another folderDaniel Calviño Sánchez2019-01-234-0/+178
|/
* Merge pull request #13758 from nextcloud/backport/13747/stable15Morris Jobke2019-01-233-3/+34
|\
| * Honor remember_login_cookie_lifetimeRoeland Jago Douma2019-01-233-3/+34
* | Merge pull request #13740 from nextcloud/backport/13140/stable15Morris Jobke2019-01-235-17/+96
|\ \
| * | Bump autoloaderRoeland Jago Douma2019-01-222-0/+2
| * | Cache tokens when using swift's v2 authenticationRobin Appelman2019-01-223-17/+94
* | | Merge pull request #13762 from nextcloud/backport/13730/stable15Morris Jobke2019-01-231-5/+2
|\ \ \ | |_|/ |/| |
| * | Respect user locale in natural sort comparatorChristoph Wurst2019-01-231-5/+2
|/ /
* | Merge pull request #13744 from nextcloud/backport/13739/stable15Morris Jobke2019-01-232-1/+38
|\ \
| * | cleanup shared lock if changing to exclusive lock failedRobin Appelman2019-01-222-1/+38
| |/
* / [tx-robot] updated from transifexNextcloud bot2019-01-238-4/+8
|/
* [tx-robot] updated from transifexNextcloud bot2019-01-2216-32/+34
* Merge pull request #13670 from nextcloud/backport/13660/stable15Morris Jobke2019-01-212-2/+2
|\
| * Fix template paramterRoeland Jago Douma2019-01-182-2/+2
* | [tx-robot] updated from transifexNextcloud bot2019-01-2114-6/+28
* | [tx-robot] updated from transifexNextcloud bot2019-01-208-6/+8
* | [tx-robot] updated from transifexNextcloud bot2019-01-1926-32/+110
|/
* Merge pull request #13665 from nextcloud/backport/13664/stable15Morris Jobke2019-01-181-0/+2
|\
| * Use warning background color & primary text color for setting warningsMorris Jobke2019-01-181-0/+2
|/
* Merge pull request #13653 from nextcloud/backport/13650/stable15Joas Schilling2019-01-181-1/+1
|\
| * Fix colorizeSvg with transformations that contain a comma (,)Joas Schilling2019-01-171-1/+1
* | [tx-robot] updated from transifexNextcloud bot2019-01-1830-8/+30
|/
* Merge pull request #13636 from nextcloud/backport/13634/stable15Morris Jobke2019-01-171-1/+1
|\
| * update URL for federationJos Poortvliet2019-01-161-1/+1
* | [tx-robot] updated from transifexNextcloud bot2019-01-17212-8616/+8712
|/
* Merge pull request #13625 from nextcloud/backport/13574/stable15Morris Jobke2019-01-161-1/+1
|\
| * the bug number #13263 fixed by the xavierando userAlaa Shmalih2019-01-161-1/+1
|/
* Merge pull request #13598 from nextcloud/3rdpart/stable15/pear/archive_tar-1.4.5Morris Jobke2019-01-161-0/+0
|\
| * [3rdparty] Bump pear/archive_tar to 1.4.5Roeland Jago Douma2019-01-151-0/+0
* | Merge pull request #13588 from nextcloud/backport/13468/stable15Roeland Jago Douma2019-01-161-1/+0
|\ \
| * | don't close input stream when writing in encrypted fileFlorian Schunk2019-01-141-1/+0
* | | [tx-robot] updated from transifexNextcloud bot2019-01-16158-174/+350
* | | Merge pull request #13609 from nextcloud/backport/13607/stable15Roeland Jago Douma2019-01-151-1/+1
|\ \ \
| * | | Fix integer background job id type errorChristoph Wurst2019-01-151-1/+1
| | |/ | |/|
* | | Merge pull request #13611 from nextcloud/stb15-settings-label-fixJohn Molakvoæ2019-01-159-24/+37
|\ \ \ | |/ / |/| |
| * | Fix user settings label translationJohn Molakvoæ (skjnldsv)2019-01-159-24/+37
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-01-1598-700/+606
* | Merge pull request #13585 from nextcloud/backport/13581/stable15Roeland Jago Douma2019-01-141-2/+2
|\ \ | |/ |/|
| * Correctly handle displaynames returned from the sharee APIJoas Schilling2019-01-141-2/+2
* | Merge pull request #13582 from nextcloud/backport/13573/stable15Morris Jobke2019-01-141-1/+1
|\ \
| * | Principals can be principal/user/<name> or principal/<name> from legacy installsJoas Schilling2019-01-141-1/+1
| |/
* | Merge pull request #13575 from nextcloud/backport/13566/stable15Morris Jobke2019-01-142-5/+6
|\ \ | |/ |/|
| * Fix click app namesMichael Weimann2019-01-142-5/+6
|/
* Merge pull request #13384 from nextcloud/3rdparty/broker-add-timezone-cancel-...Morris Jobke2019-01-141-0/+0
|\
| * [3rdparty] Broker: add timezone to CANCEL messagesDaniel Kesselberg2019-01-101-0/+0
* | Merge pull request #13036 from nextcloud/objectstore-write-exists-15Roeland Jago Douma2019-01-1410-6/+171
|\ \
| * | upload new files in objectstore to a .part path firstRobin Appelman2018-12-124-6/+124
| * | Add objectExists to objectstore interfaceRobin Appelman2018-12-126-0/+47