summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move personal auth token settings to VueChristoph Wurst2019-02-2839-4570/+7116
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Always crate OC.Settings, even if not used Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #14400 from nextcloud/fix/sidebar/animationJulius Härtl2019-02-284-20/+16
|\ | | | | Remove unneeded sidebar animation
| * Remove unneeded sidebar animationJohn Molakvoæ (skjnldsv)2019-02-284-20/+16
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #14440 from ↵Morris Jobke2019-02-284-0/+4
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/fix-no-such-process-acceptance-tests Run tests that fail with "no such process" over to apache server
| * | Run tests that fail with "no such process" over to apache serverMorris Jobke2019-02-284-0/+4
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #14442 from nextcloud/tech-debt/noid/remove-app-classpathRoeland Jago Douma2019-02-281-17/+0
|\ \ | |/ |/| Remove not used appinfo/classpath.php check
| * Remove not used appinfo/classpath.php checkMorris Jobke2019-02-281-17/+0
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #14412 from nextcloud/fileinfo-raw-sizeMorris Jobke2019-02-289-16/+32
|\ | | | | add option to get raw size (without submounts) from fileinfo
| * add option to get raw size (without submounts) from fileinfoRobin Appelman2019-02-279-16/+32
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #14408 from ↵Morris Jobke2019-02-284-45/+34
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-1.17.0 Bump css-vars-ponyfill from 1.16.4 to 1.17.0
| * | Bump css-vars-ponyfill from 1.16.4 to 1.17.0dependabot[bot]2019-02-274-45/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-vars-ponyfill](https://github.com/jhildenbiddle/css-vars-ponyfill) from 1.16.4 to 1.17.0. - [Release notes](https://github.com/jhildenbiddle/css-vars-ponyfill/releases) - [Changelog](https://github.com/jhildenbiddle/css-vars-ponyfill/blob/master/CHANGELOG.md) - [Commits](https://github.com/jhildenbiddle/css-vars-ponyfill/compare/v1.16.4...v1.17.0) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #14431 from nextcloud/dependabot/npm_and_yarn/webpack-4.29.6Morris Jobke2019-02-282-107/+107
|\ \ \ | | | | | | | | Bump webpack from 4.29.5 to 4.29.6
| * | | Bump webpack from 4.29.5 to 4.29.6dependabot[bot]2019-02-282-107/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.29.5 to 4.29.6. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.29.5...v4.29.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #13489 from nextcloud/enh/settings/2fa-security-storeRoeland Jago Douma2019-02-2815-60/+175
|\ \ \ \ | | | | | | | | | | Do not load 2fa admin settings async
| * | | | Do not load 2fa admin settings asyncRoeland Jago Douma2019-02-2815-60/+175
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #14433 from nextcloud/fix/noid/fix-acceptance-testsRoeland Jago Douma2019-02-281-3/+3
|\ \ \ \ | | | | | | | | | | Fix acceptance tests for tag management
| * | | | Fix acceptance tests for tag managementMorris Jobke2019-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #14432 from ↵Roeland Jago Douma2019-02-282-15/+15
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/dependachristoph/npm_and_yarn/jcrop-v0.9.12-npm3 Bump jcrop from v0.9.12-npm to v0.9.12-npm3
| * | | | Bump jcrop from v0.9.12-npm to v0.9.12-npm3Christoph Wurst2019-02-282-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/nextcloud/server/pull/14354#issuecomment-468200789 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #14354 from ↵Roeland Jago Douma2019-02-2816-31/+31
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-and-vue-template-compiler-2.6.7 Bump vue and vue-template-compiler
| * | | | Update assetsRoeland Jago Douma2019-02-2814-23/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump vue and vue-template-compilerdependabot[bot]2019-02-282-8/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue](https://github.com/vuejs/vue) and [vue-template-compiler](https://github.com/vuejs/vue). These dependencies needed to be updated together. Updates `vue` from 2.6.6 to 2.6.7 - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.6.6...v2.6.7) Updates `vue-template-compiler` from 2.6.6 to 2.6.7 - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/compare/v2.6.6...v2.6.7) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #14410 from ↵Roeland Jago Douma2019-02-288-141/+334
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud-vue-0.8.0 Bump nextcloud-vue from 0.6.3 to 0.8.0
| * | | | Bump nextcloud-vue from 0.6.3 to 0.8.0dependabot[bot]2019-02-278-153/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [nextcloud-vue](https://github.com/nextcloud/nextcloud-vue) from 0.6.3 to 0.8.0. - [Release notes](https://github.com/nextcloud/nextcloud-vue/releases) - [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v0.6.3...v0.8.0) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-02-2826-106/+162
| |_|/ / |/| | |
* | | | Merge pull request #14390 from ↵Roeland Jago Douma2019-02-273-2/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/14307/expire-date-change-eventhandler Bugfix/14307/expire date change eventhandler
| * | | | Bump bundlesJulius Härtl2019-02-272-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add handler for change event of the expire date fieldJulius Härtl2019-02-271-0/+11
| |/ / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #14409 from ↵Roeland Jago Douma2019-02-272-14/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-loader-15.6.4 Bump vue-loader from 15.6.2 to 15.6.4
| * | | | Bump vue-loader from 15.6.2 to 15.6.4dependabot[bot]2019-02-272-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.2 to 15.6.4. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/commits/v15.6.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #14407 from ↵Roeland Jago Douma2019-02-272-312/+97
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/@babel/preset-env-7.3.4 Bump @babel/preset-env from 7.3.1 to 7.3.4
| * | | | | Bump @babel/preset-env from 7.3.1 to 7.3.4dependabot[bot]2019-02-272-324/+109
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.3.1 to 7.3.4. - [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.3.1...v7.3.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #14406 from ↵Roeland Jago Douma2019-02-272-40/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/@babel/core-7.3.4 Bump @babel/core from 7.3.3 to 7.3.4
| * | | | | Bump @babel/core from 7.3.3 to 7.3.4dependabot[bot]2019-02-272-40/+40
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.3.3 to 7.3.4. - [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.3.3...v7.3.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #14419 from nextcloud/bugfix/noid/closing-tagsRoeland Jago Douma2019-02-271-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix closing tags in header
| * | | | Fix closing tags in headerJulius Härtl2019-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #14418 from nextcloud/bugfix/noid/missing-css-varsMorris Jobke2019-02-275-5/+4
|\ \ \ \ \ | |/ / / / |/| | | | Remove/replace missing css var usages
| * | | | Remove/replace missing css varsJulius Härtl2019-02-275-5/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #14343 from nextcloud/bugfix/14052-multiple-navigation-itemsMorris Jobke2019-02-278-18/+370
|\ \ \ \ | | | | | | | | | | Parse multiple navigation items
| * | | | two item => two itemsDaniel Kesselberg2019-02-253-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Generate id for navigation itemDaniel Kesselberg2019-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Parse multiple navigation itemsDaniel Kesselberg2019-02-228-17/+369
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #13844 from ↵Morris Jobke2019-02-271-5/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | felixn/bugfix/10862-trash-bin-ignores-trashbin_retention_obligation Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
| * | | | Fix for issue 10862: calculation of free space ignores external storage ↵Felix Nieuwenhuizen2019-01-261-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (doesn't count towards quota) Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
* | | | | Merge pull request #14399 from ↵blizzz2019-02-273-3/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | nextcloud/feature/noid/fix-top-margin-special-updater-url Fix top margin for info text when non-default updater server URL is used
| * | | | Fix top margin for info text when non-default updater server URL is usedMorris Jobke2019-02-273-3/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #14402 from nextcloud/bugfix/noid/log-spamMorris Jobke2019-02-271-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Do not register unexisting section
| * | | | | Do not register unexisting sectionJoas Schilling2019-02-271-1/+0
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #14389 from nextcloud/dav-photo-propJohn Molakvoæ2019-02-274-0/+104
|\ \ \ \ \ | | | | | | | | | | | | Add HasPhoto DAV plugin
| * | | | | Add HasPhoto DAV pluginJohn Molakvoæ (skjnldsv)2019-02-274-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>