summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12985 from nextcloud/js/mergejs-jquery-uiRoeland Jago Douma2018-12-101-17/+26
|\ | | | | Rebuild core.js after jquery-ui merge
| * Rebuild core.js after jquery-ui mergeRoeland Jago Douma2018-12-101-17/+26
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12919 from nextcloud/oauth2/vue_scoped_cssRoeland Jago Douma2018-12-107-31/+35
|\ \ | | | | | | OAuth2: move to scoped css in vue app
| * | OAuth2: move to scoped css in vue appRoeland Jago Douma2018-12-107-31/+35
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #12940 from ↵Roeland Jago Douma2018-12-1010-24/+24
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/vue-2.5.18 Bump vue from 2.5.17 to 2.5.18 in /settings
| * | | Compile assetsRoeland Jago Douma2018-12-109-19/+131
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Update vue-template-compiler tooJohn Molakvoæ (skjnldsv)2018-12-104-134/+22
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Bump vue from 2.5.17 to 2.5.18 in /settingsdependabot[bot]2018-12-102-4/+4
| |/ / | | | | | | | | | | | | | | | | | | Bumps [vue](https://github.com/vuejs/vue) from 2.5.17 to 2.5.18. - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.5.17...v2.5.18) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #12982 from nextcloud/fix/use_strengthify_minRoeland Jago Douma2018-12-101-1/+1
|\ \ \ | |_|/ |/| | Use strengthify.min on personal settings page
| * | Use strengthify.min on personal settings pageRoeland Jago Douma2018-12-101-1/+1
|/ / | | | | | | | | | | Else the CSP fails to load properly Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12920 from nextcloud/oauth2/migrationsRoeland Jago Douma2018-12-104-100/+100
|\ \ | |/ |/| OAuth2: Move to migrations
| * Bump autoloaderRoeland Jago Douma2018-12-102-0/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * OAuth2: Move to migrationsRoeland Jago Douma2018-12-102-100/+98
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12896 from nextcloud/bugfix/12894-use-version-doclinkRoeland Jago Douma2018-12-101-4/+3
|\ \ | | | | | | Use version from config to generate doclink
| * | Use OC_Util::getVersion instead of getSystemValueDaniel Kesselberg2018-12-071-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Use version to generate docversionDaniel Kesselberg2018-12-071-4/+3
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #12936 from ↵Roeland Jago Douma2018-12-104-27/+22
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-2.5.18 Bump vue from 2.5.17 to 2.5.18 in /apps/oauth2
| * | | Compile assetsJohn Molakvoæ (skjnldsv)2018-12-103-12/+26
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Vue bump tooJohn Molakvoæ (skjnldsv)2018-12-102-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Update vue-template-compiler tooJohn Molakvoæ (skjnldsv)2018-12-102-39/+20
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Bump vue from 2.5.17 to 2.5.18 in /apps/oauth2dependabot[bot]2018-12-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue](https://github.com/vuejs/vue) from 2.5.17 to 2.5.18. - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.5.17...v2.5.18) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12929 from ↵Roeland Jago Douma2018-12-104-24/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/vue-2.5.18 Bump vue from 2.5.17 to 2.5.18 in /apps/accessibility
| * | | | Compile assetsJohn Molakvoæ (skjnldsv)2018-12-103-12/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Update vue-template-compiler tooJohn Molakvoæ (skjnldsv)2018-12-102-38/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Update vue-template-compiler tooJohn Molakvoæ (skjnldsv)2018-12-092-15/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Bump vue from 2.5.17 to 2.5.18 in /apps/accessibilitydependabot[bot]2018-12-092-8/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue](https://github.com/vuejs/vue) from 2.5.17 to 2.5.18. - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.5.17...v2.5.18) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12932 from ↵Roeland Jago Douma2018-12-104-24/+24
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-2.5.18 Bump vue from 2.5.17 to 2.5.18 in /apps/updatenotification
| * | | Compile assetsJohn Molakvoæ (skjnldsv)2018-12-103-20/+34
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Vue bump tooJohn Molakvoæ (skjnldsv)2018-12-102-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Update vue-template-compiler tooJohn Molakvoæ (skjnldsv)2018-12-102-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Bump vue from 2.5.17 to 2.5.18 in /apps/updatenotificationdependabot[bot]2018-12-092-32/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | Bumps [vue](https://github.com/vuejs/vue) from 2.5.17 to 2.5.18. - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.5.17...v2.5.18) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #12928 from ↵John Molakvoæ2018-12-102-95/+125
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-2.0.0 Bump css-loader from 1.0.1 to 2.0.0 in /apps/updatenotification
| * | | Bump css-loader from 1.0.1 to 2.0.0 in /apps/updatenotificationdependabot[bot]2018-12-102-95/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.1 to 2.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.1...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12935 from ↵John Molakvoæ2018-12-102-8/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/node-sass-4.11.0 Bump node-sass from 4.10.0 to 4.11.0 in /build
| * | | Bump node-sass from 4.10.0 to 4.11.0 in /builddependabot[bot]2018-12-092-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [node-sass](https://github.com/sass/node-sass) from 4.10.0 to 4.11.0. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.10.0...v4.11.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12934 from ↵John Molakvoæ2018-12-102-69/+175
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-2.0.0 Bump css-loader from 1.0.1 to 2.0.0 in /apps/accessibility
| * | | | Bump css-loader from 1.0.1 to 2.0.0 in /apps/accessibilitydependabot[bot]2018-12-092-73/+184
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.1 to 2.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.1...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12933 from ↵John Molakvoæ2018-12-102-81/+175
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-2.0.0 Bump css-loader from 1.0.1 to 2.0.0 in /apps/oauth2
| * | | | Bump css-loader from 1.0.1 to 2.0.0 in /apps/oauth2dependabot[bot]2018-12-092-81/+175
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.1 to 2.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.1...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12949 from ↵John Molakvoæ2018-12-102-11/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-merge-4.1.5 Bump webpack-merge from 4.1.4 to 4.1.5 in /apps/updatenotification
| * | | | Bump webpack-merge from 4.1.4 to 4.1.5 in /apps/updatenotificationdependabot[bot]2018-12-102-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #12953 from ↵John Molakvoæ2018-12-102-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-merge-4.1.5 Bump webpack-merge from 4.1.4 to 4.1.5 in /apps/oauth2
| * | | | | Bump webpack-merge from 4.1.4 to 4.1.5 in /apps/oauth2dependabot[bot]2018-12-102-7/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #12954 from ↵John Molakvoæ2018-12-102-8/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-merge-4.1.5 Bump webpack-merge from 4.1.4 to 4.1.5 in /apps/accessibility
| * | | | | Bump webpack-merge from 4.1.4 to 4.1.5 in /apps/accessibilitydependabot[bot]2018-12-102-8/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #12956 from ↵John Molakvoæ2018-12-102-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.1.5 Bump webpack-merge from 4.1.4 to 4.1.5 in /settings
| * | | | Bump webpack-merge from 4.1.4 to 4.1.5 in /settingsdependabot[bot]2018-12-102-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* / / / [tx-robot] updated from transifexNextcloud bot2018-12-1016-18/+70
|/ / /
* | | Merge pull request #12941 from ↵Roeland Jago Douma2018-12-092-44/+331
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/css-loader-2.0.0 Bump css-loader from 1.0.1 to 2.0.0 in /settings
| * | | Bump css-loader from 1.0.1 to 2.0.0 in /settingsdependabot[bot]2018-12-092-58/+356
| |/ / | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.1 to 2.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.1...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>