summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #13708 from nextcloud/stb14-vcard-avatar-fixesMorris Jobke2019-01-284-17/+36
|\
| * Update apps/dav/lib/CardDAV/PhotoCache.php Morris Jobke2019-01-211-1/+1
| * Log failure on parsingJohn Molakvoæ (skjnldsv)2019-01-215-15/+28
| * Allow URI as data for vcard PHOTOJohn Molakvoæ (skjnldsv)2019-01-212-4/+10
* | Merge pull request #13822 from nextcloud/dependabot/npm_and_yarn/build/stable...Roeland Jago Douma2019-01-282-39/+99
|\ \
| * | [Security] Bump bower from 1.8.4 to 1.8.8 in /builddependabot[bot]2019-01-252-39/+99
* | | [tx-robot] updated from transifexNextcloud bot2019-01-2620-32/+42
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-01-256-6/+10
* | Merge pull request #13767 from nextcloud/backport/13747/stable14Roeland Jago Douma2019-01-243-3/+34
|\ \
| * | Honor remember_login_cookie_lifetimeRoeland Jago Douma2019-01-233-3/+34
* | | Merge pull request #13788 from nextcloud/stable14-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-242-0/+126
| * | | Add acceptance tests for moving and copying files to another folderDaniel Calviño Sánchez2019-01-244-0/+178
|/ / /
* | | Merge pull request #13782 from nextcloud/backport/13772/stable14Morris Jobke2019-01-241-1/+1
|\ \ \
| * | | Show proper default localeMorris Jobke2019-01-241-1/+1
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2019-01-24146-138/+162
|/ /
* | Merge pull request #13741 from nextcloud/backport/13140/stable14Morris 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 #13763 from nextcloud/backport/13730/stable14Morris Jobke2019-01-231-5/+2
|\ \ \
| * | | Respect user locale in natural sort comparatorChristoph Wurst2019-01-231-5/+2
|/ / /
* | | Merge pull request #13745 from nextcloud/backport/13739/stable14Morris 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
|/ /
* | Merge pull request #13671 from nextcloud/backport/13660/stable14Roeland Jago Douma2019-01-222-4/+4
|\ \
| * | Fix template paramterRoeland Jago Douma2019-01-222-4/+4
* | | [tx-robot] updated from transifexNextcloud bot2019-01-2216-32/+34
| |/ |/|
* | [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 #13666 from nextcloud/backport/13664/stable14Morris Jobke2019-01-181-0/+2
|\
| * Use warning background color & primary text color for setting warningsMorris Jobke2019-01-181-0/+2
|/
* Merge pull request #13654 from nextcloud/backport/13650/stable14Joas Schilling2019-01-181-1/+1
|\
| * [stable15] Fix colorizeSvg with transformations that contain a comma (,)John Molakvoæ2019-01-171-1/+1
* | [tx-robot] updated from transifexNextcloud bot2019-01-1830-8/+30
|/
* Merge pull request #13637 from nextcloud/backport/13634/stable14Morris 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 #13599 from nextcloud/3rdpart/stable14/pear/archive_tar-1.4.5Morris Jobke2019-01-161-0/+0
|\
| * [3rdparty] Update pear/acrchive_tar to 1.4.5Roeland Jago Douma2019-01-151-0/+0
* | [tx-robot] updated from transifexNextcloud bot2019-01-16158-174/+350
|/
* [tx-robot] updated from transifexNextcloud bot2019-01-1598-700/+606
* Merge pull request #13583 from nextcloud/backport/13573/stable14Morris 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 #13385 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 #13035 from nextcloud/objectstore-write-exists-14Roeland Jago Douma2019-01-1410-4/+169
|\ \
| * | upload new files in objectstore to a .part path firstRobin Appelman2018-12-124-4/+122
| * | Add objectExists to objectstore interfaceRobin Appelman2018-12-126-0/+47
* | | [tx-robot] updated from transifexNextcloud bot2019-01-1474-778/+1012