summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13607 from nextcloud/fix/backgroundjob-int-idRoeland Jago Douma2019-01-151-1/+1
|\
| * Fix integer background job id type errorChristoph Wurst2019-01-151-1/+1
|/
* Merge pull request #13456 from nextcloud/dependabot/npm_and_yarn/clipboard-2.0.4Morris Jobke2019-01-155-13/+25
|\
| * Bump clipboard from 1.7.1 to 2.0.4dependabot[bot]2019-01-155-13/+25
|/
* Merge pull request #13592 from nextcloud/3rdparty/pear/archive_tar-1.4.5Morris Jobke2019-01-151-0/+0
|\
| * [3rdparty] Bump pear/archive_tar to 1.4.5Roeland Jago Douma2019-01-151-0/+0
* | Merge pull request #12173 from nextcloud/filename-centerMorris Jobke2019-01-151-18/+20
|\ \
| * | Properly center text inside of the grid containerJulius Härtl2019-01-141-19/+20
| * | Ensure filename is possibly centered below file icons in grid viewJan-Christoph Borchardt2019-01-141-0/+1
| |/
* | [tx-robot] updated from transifexNextcloud bot2019-01-1598-700/+606
* | Merge pull request #13586 from nextcloud/enh/2fa_backup_codes_improvementsRoeland Jago Douma2019-01-144-14/+11
|\ \ | |/ |/|
| * Switch to OCP background jobsRoeland Jago Douma2019-01-143-6/+8
| * Switch to QBMapperRoeland Jago Douma2019-01-141-8/+3
* | Merge pull request #13524 from nextcloud/dependabot/npm_and_yarn/build/karma-...Roeland Jago Douma2019-01-142-11/+25
|\ \
| * | Bump karma-viewport from 1.0.3 to 1.0.4 in /builddependabot[bot]2019-01-122-11/+25
* | | Merge pull request #13572 from nextcloud/3rdparty/symfony/process-4.2.2Morris Jobke2019-01-141-0/+0
|\ \ \
| * | | [3rdparty] Bump symfony/process to 4.2.2Roeland Jago Douma2019-01-141-0/+0
* | | | Merge pull request #13468 from rummatee/issue13276Morris Jobke2019-01-141-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | don't close input stream when writing in encrypted fileFlorian Schunk2019-01-101-1/+0
* | | | Merge pull request #13581 from nextcloud/bugfix/13576/correctly-escape-htmlMorris Jobke2019-01-141-2/+2
|\ \ \ \
| * | | | Correctly handle displaynames returned from the sharee APIJoas Schilling2019-01-141-2/+2
* | | | | Merge pull request #13492 from nextcloud/refactor/es6-shim-babel-polyfillJohn Molakvoæ2019-01-145-36/+17
|\ \ \ \ \
| * | | | | Use @babel/polyfill instead of es6-shimChristoph Wurst2019-01-145-36/+17
* | | | | | Merge pull request #13573 from nextcloud/bugfix/noid/one-last-timeMorris 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 #13566 from nextcloud/fix/13519/click-app-namesMorris Jobke2019-01-142-5/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix click app namesMichael Weimann2019-01-142-5/+6
* | | | | | Merge pull request #13539 from nextcloud/dependabot/npm_and_yarn/css-vars-pon...Roeland Jago Douma2019-01-144-38/+55
|\ \ \ \ \ \
| * | | | | | Bump css-vars-ponyfill from 1.7.2 to 1.16.2dependabot[bot]2019-01-144-38/+55
* | | | | | | Merge pull request #13032 from nextcloud/objectstore-write-existsMorris Jobke2019-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
* | | | | | | Merge pull request #13537 from nextcloud/dependabot/npm_and_yarn/css-loader-2...Roeland Jago Douma2019-01-144-16/+79
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Bump css-loader from 2.0.1 to 2.1.0dependabot[bot]2019-01-144-16/+79
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #13571 from nextcloud/fix/select2-package-json-duplicationRoeland Jago Douma2019-01-141-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix duplicate select2 dep in package.jsonChristoph Wurst2019-01-141-1/+0
* | | | | | Merge pull request #13518 from nextcloud/enhancement/handlebars-runtimeRoeland Jago Douma2019-01-143-38/+11
|\ \ \ \ \ \
| * | | | | | Bundle only the Handlebars runtimeChristoph Wurst2019-01-143-38/+11
| |/ / / / /
* | | | | | Merge pull request #13512 from nextcloud/3rdpart/symfony/routing-4.2.2Morris Jobke2019-01-141-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [3rdparty] Bump symfony/routing to 4.2.2Roeland Jago Douma2019-01-111-0/+0
* | | | | | Merge pull request #13536 from nextcloud/dependabot/npm_and_yarn/backbone-1.3.3Roeland Jago Douma2019-01-144-27/+27
|\ \ \ \ \ \
| * | | | | | Bump backbone from 1.2.3 to 1.3.3dependabot[bot]2019-01-144-27/+27
|/ / / / / /
* | | / / / [tx-robot] updated from transifexNextcloud bot2019-01-1474-778/+1012
| |_|/ / / |/| | | |
* | | | | Merge pull request #12490 from nextcloud/improve-mail-subjectRoeland Jago Douma2019-01-131-1/+1
|\ \ \ \ \
| * | | | | improve mail subject for mails to the owner with the passwordBjoern Schiessle2019-01-131-1/+1
* | | | | | Merge pull request #13140 from nextcloud/swift-cache-v2Roeland Jago Douma2019-01-135-17/+96
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump autoloaderRoeland Jago Douma2019-01-132-0/+2
| * | | | | Cache tokens when using swift's v2 authenticationRobin Appelman2019-01-133-17/+94
|/ / / / /
* | | | | Merge pull request #13532 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-01-135-53/+35
|\ \ \ \ \
| * | | | | Bump other deps as well and rebuild assetsRoeland Jago Douma2019-01-135-37/+34