summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove orphan event and contacts dataJoas Schilling2019-01-114-1/+98
* Merge pull request #13503 from nextcloud/fix/13499Joas Schilling2019-01-111-0/+8
|\
| * Check for no longer existing calendarsRoeland Jago Douma2019-01-111-0/+8
* | Merge pull request #13500 from nextcloud/enh/updatenotifications/include-scssRoeland Jago Douma2019-01-118-426/+1424
|\ \
| * | Bump packages while at itRoeland Jago Douma2019-01-114-373/+130
| * | Include the scss in the vue componentRoeland Jago Douma2019-01-118-65/+1306
* | | Merge pull request #13501 from nextcloud/enh/accessibility/to-nextcloud-axiosRoeland Jago Douma2019-01-115-609/+120
|\ \ \ | |/ / |/| |
| * | Bump dependenciesRoeland Jago Douma2019-01-104-608/+134
| * | Move to nextcloud-axiosRoeland Jago Douma2019-01-103-45/+30
* | | Merge pull request #13495 from nextcloud/dependabot/npm_and_yarn/underscore-1...Roeland Jago Douma2019-01-114-30/+26
|\ \ \ | |_|/ |/| |
| * | Bump underscore from 1.8.3 to 1.9.1dependabot[bot]2019-01-114-30/+26
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-01-1148-50/+228
* | Merge pull request #13497 from nextcloud/dependabot/npm_and_yarn/webpack-merg...Roeland Jago Douma2019-01-102-9/+14
|\ \ | |/ |/|
| * Bump webpack-merge from 4.1.5 to 4.2.1dependabot[bot]2019-01-102-9/+14
|/
* Merge pull request #13498 from nextcloud/dependabot/npm_and_yarn/webpack-4.28.4Roeland Jago Douma2019-01-104-85/+91
|\
| * Rebuild assetsRoeland Jago Douma2019-01-102-22/+22
| * Bump webpack from 4.27.1 to 4.28.4dependabot[bot]2019-01-102-63/+69
|/
* Merge pull request #13461 from nextcloud/dependabot/npm_and_yarn/moment-2.23.0Roeland Jago Douma2019-01-104-48/+52
|\
| * [Security] Bump moment from 2.18.1 to 2.23.0dependabot[bot]2019-01-104-48/+52
* | Merge pull request #13485 from nextcloud/enh/js/bundle-dompurify-settingsRoeland Jago Douma2019-01-1012-21/+47
|\ \ | |/ |/|
| * Bundle dompurify in settings as wellRoeland Jago Douma2019-01-1012-21/+47
* | Merge pull request #13464 from nextcloud/dependabot/npm_and_yarn/bootstrap-3.4.0Roeland Jago Douma2019-01-104-6/+6
|\ \ | |/ |/|
| * [Security] Bump bootstrap from 3.3.7 to 3.4.0dependabot[bot]2019-01-104-6/+6
* | Merge pull request #13483 from nextcloud/fix/settings-ship-markedRoeland Jago Douma2019-01-1017-6178/+38
|\ \
| * | Bundle the 'marked' libraryChristoph Wurst2019-01-1017-6178/+38
| |/
* | Merge pull request #13473 from nextcloud/bugfix/noid/dont-log-parameters-on-u...Roeland Jago Douma2019-01-102-1/+4
|\ \ | |/ |/|
| * Fix doc blockJoas Schilling2019-01-101-1/+1
| * Don't log parameters on user creation in case of error/exceptionJoas Schilling2019-01-101-0/+3
* | Merge pull request #13457 from nextcloud/dependabot/npm_and_yarn/@babel/polyf...Roeland Jago Douma2019-01-102-11/+11
|\ \ | |/ |/|
| * Bump @babel/polyfill from 7.0.0 to 7.2.5dependabot[bot]2019-01-102-11/+11
|/
* Merge pull request #13459 from nextcloud/dependabot/npm_and_yarn/@babel/core-...Roeland Jago Douma2019-01-104-46/+90
|\
| * Bump @babel/core from 7.2.0 to 7.2.2dependabot[bot]2019-01-094-46/+90
* | Merge pull request #13467 from nextcloud/fix/noid/show-repair-steps-and-info-...Roeland Jago Douma2019-01-101-0/+2
|\ \
| * | Show the repair steps and repair info output in the web for better feedbackMorris Jobke2019-01-091-0/+2
* | | [tx-robot] updated from transifexNextcloud bot2019-01-1042-482/+6
| |/ |/|
* | Merge pull request #13156 from nextcloud/enhancement/npmizeRoeland Jago Douma2019-01-09102-32391/+6493
|\ \
| * | Bump select2 from 3.4.5 to 3.4.8Christoph Wurst2019-01-095-46/+54
| * | Fix select2 style preferenceJulius Härtl2019-01-091-3/+3
| * | Use upstream strengthify libChristoph Wurst2019-01-092-3/+3
| * | Override select2 lib stylingJohn Molakvoæ (skjnldsv)2019-01-091-5/+6
| * | Update select2, include cssChristoph Wurst2019-01-096-31/+36
| * | Mergejs is goneRoeland Jago Douma2019-01-091-2/+0
| * | Use `jquery-ui-dist` instead of `jquery-ui` to resolve an issue with effectsChristoph Wurst2019-01-095-195/+104
| * | Adjust release file listChristoph Wurst2019-01-091-2/+4
| * | Don't load old vendor files during jsunit testsChristoph Wurst2019-01-095-65531/+1
| * | Move dev deps to devDependenciesChristoph Wurst2019-01-092-207/+772
| * | Remove core.jsChristoph Wurst2019-01-095-97/+0
| * | Move vendored css ponyfill to npmChristoph Wurst2019-01-098-70/+201
| * | Remove BowerChristoph Wurst2019-01-095-93/+7
| * | Npmize (vendor) scriptsChristoph Wurst2019-01-0994-32174/+71370
| |/