summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-01-164-0/+66
* [tx-robot] updated from transifexNextcloud bot2019-01-154-80/+104
* [tx-robot] updated from transifexNextcloud bot2019-01-144-192/+192
* Recompile assetsRoeland Jago Douma2019-01-134-26/+26
* Bump nextcloud-vue from 0.4.6 to 0.5.0 in /settingsdependabot[bot]2019-01-132-41/+24
* [tx-robot] updated from transifexNextcloud bot2019-01-132-6/+6
* Bump js deps of settingsRoeland Jago Douma2019-01-126-483/+95
* [tx-robot] updated from transifexNextcloud bot2019-01-124-8/+8
* [tx-robot] updated from transifexNextcloud bot2019-01-116-40/+40
* Bundle dompurify in settings as wellRoeland Jago Douma2019-01-1012-21/+47
* Bundle the 'marked' libraryChristoph Wurst2019-01-1017-6178/+38
* Npmize (vendor) scriptsChristoph Wurst2019-01-092-5/+0
* [tx-robot] updated from transifexNextcloud bot2019-01-092-2/+2
* Merge pull request #12899 from nextcloud/feature/run-setupcheck-on-overwieMorris Jobke2019-01-081-57/+63
|\
| * Run setupchecks when #security-warnings is presentDaniel Kesselberg2019-01-051-57/+63
* | Merge pull request #13200 from nextcloud/ie11-compatibility-settingsChristoph Wurst2019-01-0714-42/+40
|\ \
| * \ Merge branch 'master' of https://github.com/nextcloud/server into ie11-compat...John Molakvoæ (skjnldsv)2019-01-0326-243/+1639
| |\ \
| * | | IE11 compatibility for users & apps managementJohn Molakvoæ (skjnldsv)2018-12-2114-42/+40
* | | | Use the real logger in the settingsRoeland Jago Douma2019-01-071-3/+2
* | | | [tx-robot] updated from transifexNextcloud bot2019-01-072-2/+2
* | | | Merge pull request #13390 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2019-01-062-4/+4
|\ \ \ \
| * | | | Bump webpack-merge from 4.1.5 to 4.2.1 in /settingsdependabot[bot]2019-01-062-4/+4
| | |_|/ | |/| |
* / | | Bump vue-loader from 15.4.2 to 15.5.0 in /settingsdependabot[bot]2019-01-062-43/+44
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2019-01-052-14/+14
* | | Merge pull request #13134 from nextcloud/bugfix/13088/404-instead-of-exceptionMorris Jobke2019-01-041-1/+1
|\ \ \
| * | | Make setup check also pass with a 501 statusJulius Härtl2018-12-191-1/+1
* | | | Merge pull request #13341 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2019-01-042-57/+372
|\ \ \ \
| * | | | Bump webpack-cli from 3.1.2 to 3.2.0 in /settingsdependabot[bot]2019-01-042-57/+372
* | | | | Merge pull request #13342 from nextcloud/dependabot/npm_and_yarn/settings/bab...Julius Härtl2019-01-042-39/+40
|\ \ \ \ \
| * | | | | Bump babel-loader from 8.0.4 to 8.0.5 in /settingsdependabot[bot]2019-01-042-39/+40
| |/ / / /
* | | | | Merge pull request #13172 from nextcloud/fix-can-change-password-checkRoeland Jago Douma2019-01-041-20/+48
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix can change password check in case of encryption is enabledBjoern Schiessle2018-12-201-20/+48
* | | | | Merge pull request #13313 from nextcloud/feature/remove-outdated-cachesRoeland Jago Douma2019-01-041-20/+0
|\ \ \ \ \
| * | | | | Remove check for outdated cachesDaniel Kesselberg2019-01-021-20/+0
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-01-044-104/+104
| |_|_|_|/ |/| | | |
* | | | | Compile assetsRoeland Jago Douma2019-01-0310-38/+38
* | | | | Bump webpack from 4.28.2 to 4.28.3 in /settingsdependabot[bot]2019-01-032-16/+16
* | | | | Merge pull request #13307 from nextcloud/dependabot/npm_and_yarn/settings/css...Roeland Jago Douma2019-01-032-9/+46
|\ \ \ \ \
| * | | | | Bump css-loader from 2.0.2 to 2.1.0 in /settingsdependabot[bot]2019-01-022-9/+46
| |/ / / /
* / / / / [tx-robot] updated from transifexNextcloud bot2019-01-032-42/+292
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2019-01-022-0/+678
* | | | [tx-robot] updated from transifexNextcloud bot2018-12-314-8/+12
* | | | [tx-robot] updated from transifexNextcloud bot2018-12-302-4/+10
* | | | [tx-robot] updated from transifexNextcloud bot2018-12-294-2/+4
* | | | [tx-robot] updated from transifexNextcloud bot2018-12-284-0/+10
* | | | [tx-robot] updated from transifexNextcloud bot2018-12-276-76/+86
* | | | [tx-robot] updated from transifexNextcloud bot2018-12-262-0/+20
* | | | [tx-robot] updated from transifexNextcloud bot2018-12-252-2/+2
* | | | Merge pull request #13244 from nextcloud/dependabot/npm_and_yarn/settings/css...Roeland Jago Douma2018-12-242-8/+8
|\ \ \ \
| * | | | Bump css-loader from 2.0.1 to 2.0.2 in /settingsdependabot[bot]2018-12-242-8/+8