aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-01-1148-50/+228
|
* Merge pull request #13497 from ↵Roeland Jago Douma2019-01-102-9/+14
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-merge-4.2.1 Bump webpack-merge from 4.1.5 to 4.2.1
| * Bump webpack-merge from 4.1.5 to 4.2.1dependabot[bot]2019-01-102-9/+14
|/ | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.5 to 4.2.1. - [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/compare/v4.1.5...v4.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* Merge pull request #13498 from nextcloud/dependabot/npm_and_yarn/webpack-4.28.4Roeland Jago Douma2019-01-104-85/+91
|\ | | | | Bump webpack from 4.27.1 to 4.28.4
| * Rebuild assetsRoeland Jago Douma2019-01-102-22/+22
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Bump webpack from 4.27.1 to 4.28.4dependabot[bot]2019-01-102-63/+69
|/ | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.27.1 to 4.28.4. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.27.1...v4.28.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
* 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.0
| * [Security] Bump moment from 2.18.1 to 2.23.0dependabot[bot]2019-01-104-48/+52
| | | | | | | | | | | | | | | | | | | | Bumps [moment](https://github.com/moment/moment) from 2.18.1 to 2.23.0. **This update includes security fixes.** - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.18.1...2.23.0) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13485 from nextcloud/enh/js/bundle-dompurify-settingsRoeland Jago Douma2019-01-1012-21/+47
|\ \ | |/ |/| Bundle dompurify in settings as well
| * Bundle dompurify in settings as wellRoeland Jago Douma2019-01-1012-21/+47
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | 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.0
| * [Security] Bump bootstrap from 3.3.7 to 3.4.0dependabot[bot]2019-01-104-6/+6
| | | | | | | | | | | | | | | | | | Bumps [bootstrap](https://github.com/twbs/bootstrap) from 3.3.7 to 3.4.0. **This update includes security fixes.** - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v3.3.7...v3.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13483 from nextcloud/fix/settings-ship-markedRoeland Jago Douma2019-01-1017-6178/+38
|\ \ | | | | | | Bundle the 'marked' library
| * | Bundle the 'marked' libraryChristoph Wurst2019-01-1017-6178/+38
| |/ | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13473 from ↵Roeland Jago Douma2019-01-102-1/+4
|\ \ | |/ |/| | | | | nextcloud/bugfix/noid/dont-log-parameters-on-user-creation-in-case-of-error Don't log parameters on user creation in case of error/exception
| * Fix doc blockJoas Schilling2019-01-101-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Don't log parameters on user creation in case of error/exceptionJoas Schilling2019-01-101-0/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #13457 from ↵Roeland Jago Douma2019-01-102-11/+11
|\ \ | |/ |/| | | | | nextcloud/dependabot/npm_and_yarn/@babel/polyfill-7.2.5 Bump @babel/polyfill from 7.0.0 to 7.2.5
| * Bump @babel/polyfill from 7.0.0 to 7.2.5dependabot[bot]2019-01-102-11/+11
|/ | | | | | | | | | Bumps [@babel/polyfill](https://github.com/babel/babel) from 7.0.0 to 7.2.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.0.0...v7.2.5) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #13459 from ↵Roeland Jago Douma2019-01-104-46/+90
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/@babel/core-7.2.2 Bump @babel/core from 7.2.0 to 7.2.2
| * Bump @babel/core from 7.2.0 to 7.2.2dependabot[bot]2019-01-094-46/+90
| | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.2.0 to 7.2.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13467 from ↵Roeland Jago Douma2019-01-101-0/+2
|\ \ | | | | | | | | | | | | nextcloud/fix/noid/show-repair-steps-and-info-in-web Show the repair steps and repair info output in the web for better feedback
| * | Show the repair steps and repair info output in the web for better feedbackMorris Jobke2019-01-091-0/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2019-01-1042-482/+6
| |/ |/|
* | Merge pull request #13156 from nextcloud/enhancement/npmizeRoeland Jago Douma2019-01-09102-32391/+6493
|\ \ | | | | | | Use npm for js depdencies, bundle with webpack
| * | Bump select2 from 3.4.5 to 3.4.8Christoph Wurst2019-01-095-46/+54
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Fix select2 style preferenceJulius Härtl2019-01-091-3/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Use upstream strengthify libChristoph Wurst2019-01-092-3/+3
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Override select2 lib stylingJohn Molakvoæ (skjnldsv)2019-01-091-5/+6
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Update select2, include cssChristoph Wurst2019-01-096-31/+36
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Mergejs is goneRoeland Jago Douma2019-01-091-2/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Use `jquery-ui-dist` instead of `jquery-ui` to resolve an issue with effectsChristoph Wurst2019-01-095-195/+104
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Adjust release file listChristoph Wurst2019-01-091-2/+4
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Don't load old vendor files during jsunit testsChristoph Wurst2019-01-095-65531/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Move dev deps to devDependenciesChristoph Wurst2019-01-092-207/+772
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Remove core.jsChristoph Wurst2019-01-095-97/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Move vendored css ponyfill to npmChristoph Wurst2019-01-098-70/+201
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Remove BowerChristoph Wurst2019-01-095-93/+7
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Npmize (vendor) scriptsChristoph Wurst2019-01-0994-32174/+71370
| |/ | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13446 from nextcloud/bugfix/13430/prevent-php-info-logMorris Jobke2019-01-091-1/+1
|\ \ | | | | | | Prevent php info about missing index for old events
| * | Prevent php info about missing index for old eventsJoas Schilling2019-01-091-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #13177 from rummatee/issue7629Jan-Christoph Borchardt2019-01-094-3/+151
|\ \ \ | |_|/ |/| | Create Folders when moving files
| * | use triple equal signs according to style guideFlorian Schunk2019-01-091-1/+1
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | move to new folderFlorian Schunk2019-01-091-1/+1
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | use triple equal signs according to style guideFlorian Schunk2019-01-092-2/+2
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | fix button position for chromeFlorian Schunk2019-01-091-2/+2
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | change menu's orientation to make sure it is completly visibleFlorian Schunk2019-01-093-2/+3
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | open name prompt on pressing enterFlorian Schunk2019-01-091-0/+11
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | reset name of new folder and prevent the form from being submitted twiceFlorian Schunk2019-01-091-1/+6
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
| * | adjust design to match file appFlorian Schunk2019-01-091-6/+7
| | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>