summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16532 from nextcloud/bugfix/14776/maxcontrast-fixMorris Jobke2019-07-251-3/+6
|\
| * Trigger fallback code to get max contrast value and use integer thereMorris Jobke2019-07-251-2/+5
| * Fix max contrast retrieval to limit minimum color for relative timeMorris Jobke2019-07-241-1/+1
* | Merge pull request #16503 from nextcloud/bugfix/5504/create_new_birthday_cale...Roeland Jago Douma2019-07-251-0/+5
|\ \
| * | allow to provide supported calendar component set internally as a stringGeorg Ehrke2019-07-221-0/+5
| |/
* | [tx-robot] updated from transifexNextcloud bot2019-07-2514-12/+50
* | Merge pull request #16528 from nextcloud/shipped-texteditorMorris Jobke2019-07-241-1/+0
|\ \
| * | Remove files_texteditor from shipped appsJulius Härtl2019-07-241-1/+0
|/ /
* | Merge pull request #15637 from nextcloud/bugfix/15567/ignore-hidden-shareblizzz2019-07-242-4/+51
|\ \
| * | Fix wrong indentationDaniel Kesselberg2019-07-221-1/+1
| * | Fix invalid recursionDaniel Kesselberg2019-07-212-3/+3
| * | Allow hidden smb sharesDaniel Kesselberg2019-07-162-1/+48
* | | Merge pull request #16523 from nextcloud/bugfix/noid/nested-recursion-breakin...blizzz2019-07-241-2/+2
|\ \ \
| * | | PHPStorm code cleanupJoas Schilling2019-07-241-2/+2
| * | | Get the topmost parent for the parent instead of doing endless recursionJoas Schilling2019-07-241-1/+1
|/ / /
* | | Merge pull request #16493 from nextcloud/enh/remove-curly-bracesRoeland Jago Douma2019-07-241-1/+1
|\ \ \
| * | | The array and string offset access syntax using curly braces is deprecated.Daniel Kesselberg2019-07-211-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2019-07-244-0/+6
* | | | Merge pull request #16505 from nextcloud/enh/nitpicks-14954Roeland Jago Douma2019-07-232-5/+4
|\ \ \ \
| * | | | Dont assign $options to $options and cleanup docDaniel Kesselberg2019-07-222-5/+4
| | |_|/ | |/| |
* | | | Merge pull request #16514 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2019-07-232-55/+180
|\ \ \ \
| * | | | Bump @babel/preset-env from 7.5.4 to 7.5.5dependabot-preview[bot]2019-07-212-55/+180
* | | | | Merge pull request #16492 from nextcloud/enh/exclude-rnd-filesMorris Jobke2019-07-232-4/+6
|\ \ \ \ \
| * | | | | Exclude .rnd files from integrity checkDaniel Kesselberg2019-07-212-4/+6
* | | | | | Merge pull request #16497 from nextcloud/dependabot/npm_and_yarn/babel/core-7...Roeland Jago Douma2019-07-234-19/+148
|\ \ \ \ \ \
| * | | | | | Bump @babel/core from 7.5.4 to 7.5.5dependabot-preview[bot]2019-07-224-19/+148
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-07-238-2/+22
| |_|/ / / |/| | | |
* | | | | Merge pull request #16450 from nextcloud/tech-debt/noid/cleanup-unused-OC_API...Morris Jobke2019-07-223-58/+10
|\ \ \ \ \
| * | | | | Adjust deprecation testsMorris Jobke2019-07-221-0/+10
| * | | | | Removes unused OC_API::registerMorris Jobke2019-07-182-58/+0
* | | | | | Merge pull request #16495 from nextcloud/fix/16378-cannot-get-key-from-parameterMorris Jobke2019-07-221-1/+4
|\ \ \ \ \ \
| * | | | | | Pass $configargs to openssl_pkey_exportDaniel Kesselberg2019-07-211-1/+4
| | |_|_|/ / | |/| | | |
* | | | | | Fix 1px jump when selecting multi table entries (#16475)John Molakvoæ2019-07-221-1/+0
|\ \ \ \ \ \
| * | | | | | Fix 1px jump when selecting multi table entriesMichael Weimann2019-07-201-1/+0
* | | | | | | Merge pull request #16483 from nextcloud/dependabot/npm_and_yarn/css-loader-3...Roeland Jago Douma2019-07-222-5/+15
|\ \ \ \ \ \ \
| * | | | | | | Bump css-loader from 3.0.0 to 3.1.0dependabot-preview[bot]2019-07-212-5/+15
* | | | | | | | Merge pull request #16482 from nextcloud/dependabot/npm_and_yarn/url-loader-2...Roeland Jago Douma2019-07-222-6/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump url-loader from 2.0.1 to 2.1.0dependabot-preview[bot]2019-07-212-6/+16
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #16489 from nextcloud/dependabot/npm_and_yarn/lodash-4.17.15Roeland Jago Douma2019-07-224-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump lodash from 4.17.14 to 4.17.15dependabot-preview[bot]2019-07-214-7/+7
* | | | | | | | | Merge pull request #16487 from nextcloud/dependabot/npm_and_yarn/blueimp-md5-...Roeland Jago Douma2019-07-223-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump blueimp-md5 from 2.10.0 to 2.11.0dependabot-preview[bot]2019-07-213-5/+5
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-07-2234-72/+104
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #16488 from nextcloud/dependabot/npm_and_yarn/file-loader-...Roeland Jago Douma2019-07-212-6/+18
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Bump file-loader from 4.0.0 to 4.1.0dependabot-preview[bot]2019-07-212-6/+18
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #16485 from nextcloud/dependabot/npm_and_yarn/webpack-4.36.1Roeland Jago Douma2019-07-212-13/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Bump webpack from 4.35.3 to 4.36.1dependabot-preview[bot]2019-07-212-13/+7
|/ / / / / / /
* | | | | | | Merge pull request #16486 from nextcloud/dependabot/npm_and_yarn/vue-loader-1...Roeland Jago Douma2019-07-212-11/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Bump vue-loader from 15.7.0 to 15.7.1dependabot-preview[bot]2019-07-212-11/+11
* | | | | | | Merge pull request #16480 from nextcloud/dependabot/npm_and_yarn/build/jsdoc-...Roeland Jago Douma2019-07-212-30/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |