summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump webpack from 4.29.0 to 4.29.1dependabot[bot]2019-02-052-50/+64
| | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.29.0 to 4.29.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.29.0...v4.29.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* Merge pull request #14042 from ↵Roeland Jago Douma2019-02-052-25/+11
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-cli-3.2.3 Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/updatenotification
| * Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/updatenotificationdependabot[bot]2019-02-052-25/+11
| | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #14048 from ↵Roeland Jago Douma2019-02-052-25/+11
|\ \ | |/ |/| | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-cli-3.2.3 Bump webpack-cli from 3.2.1 to 3.2.3 in /settings
| * Bump webpack-cli from 3.2.1 to 3.2.3 in /settingsdependabot[bot]2019-02-052-25/+11
| | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #14045 from ↵Roeland Jago Douma2019-02-052-30/+16
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-cli-3.2.3 Bump webpack-cli from 3.2.1 to 3.2.3
| * | Bump webpack-cli from 3.2.1 to 3.2.3dependabot[bot]2019-02-052-30/+16
| |/ | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #14039 from ↵Roeland Jago Douma2019-02-052-25/+11
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-cli-3.2.3 Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/oauth2
| * | Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/oauth2dependabot[bot]2019-02-052-25/+11
| |/ | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #14038 from ↵Roeland Jago Douma2019-02-052-25/+11
|\ \ | |/ |/| | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-cli-3.2.3 Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/accessibility
| * Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/accessibilitydependabot[bot]2019-02-052-25/+11
|/ | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* Merge pull request #14030 from nextcloud/fix/oc_addstyleMorris Jobke2019-02-051-2/+0
|\ | | | | Fix OC.addStyle and OC.addScript
| * Fix OC.addStyle and OC.addScriptRoeland Jago Douma2019-02-051-2/+0
|/ | | | | | | With the move to the bundles a comment tag was not removed. So the loaded array was undefined. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #13954 from ↵Roeland Jago Douma2019-02-051-2/+5
|\ | | | | | | | | nextcloud/bugfix/noid/show-original-location-in-trashbin Show original path in trashbin
| * Show original path in trashbin via extraDataMorris Jobke2019-02-051-2/+5
| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14024 from nextcloud/fix/installationRoeland Jago Douma2019-02-053-4/+4
|\ \ | | | | | | It is getURLParameter not getUrlParameter
| * | It is getURLParameter not getUrlParameterRoeland Jago Douma2019-02-053-4/+4
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14015 from nextcloud/fix/no_need_to_load_bundle_depsMorris Jobke2019-02-054-4/+0
|\ \ | |/ |/| No need to explicitly load bundle dependencies
| * No need to explicitly load bundle dependenciesRoeland Jago Douma2019-02-044-4/+0
|/ | | | | | oc-webdav-backbone is loaded by default Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #14006 from nextcloud/enh/contactsmenu_templates_to_bundleRoeland Jago Douma2019-02-0416-167/+100
|\ | | | | Move contactmenu handlebars templates to bundle
| * Remove from build fileRoeland Jago Douma2019-02-041-3/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Move the contactsmenu handlebars templates to the bundleRoeland Jago Douma2019-02-0415-164/+100
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #13877 from IGLOU-EU/masterRoeland Jago Douma2019-02-041-0/+6
|\ | | | | SCSS: add background on app section:hover
| * inadvertent error prevention on .rowIglou.eu2019-02-011-0/+3
| | | | | | Add a 5px border on .row settings section
| * add background on app hover sectionIglou.eu2019-01-281-0/+3
| | | | | | Avoid click on bad app, focus attention
* | Merge pull request #13989 from ↵Roeland Jago Douma2019-02-044-8/+8
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-1.16.4 Bump css-vars-ponyfill from 1.16.3 to 1.16.4
| * | Bump css-vars-ponyfill from 1.16.3 to 1.16.4dependabot[bot]2019-02-034-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-vars-ponyfill](https://github.com/jhildenbiddle/css-vars-ponyfill) from 1.16.3 to 1.16.4. - [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.3...v1.16.4) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #13988 from ↵Roeland Jago Douma2019-02-044-19/+19
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/nextcloud-vue-0.6.1 Bump nextcloud-vue from 0.6.0 to 0.6.1 in /apps/updatenotification
| * | Bump nextcloud-vue from 0.6.0 to 0.6.1 in /apps/updatenotificationdependabot[bot]2019-02-034-19/+19
|/ / | | | | | | | | | | | | | | | | Bumps [nextcloud-vue](https://github.com/nextcloud/nextcloud-vue) from 0.6.0 to 0.6.1. - [Release notes](https://github.com/nextcloud/nextcloud-vue/releases) - [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v0.6.0...v0.6.1) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11304 from andyg5000/masterMorris Jobke2019-02-011-3/+7
|\ \ | | | | | | Make the data year in the template dynamic by using date().
| * | Update dynamic year in example themesplitt3r2019-02-011-3/+7
| | |
| * | Make the data year in the template dynamic by using date().andyg50002019-02-011-1/+1
| | |
* | | Merge pull request #13846 from nextcloud/feature/check-if-app-exist-for-groupMorris Jobke2019-02-012-9/+38
|\ \ \ | |/ / |/| | Check app path for enableAppForGroups
| * | Check app path for enableAppForGroupsDaniel Kesselberg2019-01-262-9/+38
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #13548 from nextcloud/feature/10964/app_tokens_activityRoeland Jago Douma2019-02-013-80/+210
|\ \ \ | | | | | | | | Publish event for app token create/update/delete
| * | | Make strictJoas Schilling2019-02-011-29/+19
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use rich object subjectsJoas Schilling2019-02-011-6/+13
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Don't cast tokenId to stringDaniel Kesselberg2019-01-301-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Add test for destroy with invalid userDaniel Kesselberg2019-01-301-33/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some code cleanup - willReturn instead of will(returnValue) - Annotation for mocked objects Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Add token name for delete activityDaniel Kesselberg2019-01-302-10/+31
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Publish event for app token create/update/deleteDaniel Kesselberg2019-01-303-16/+73
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #13796 from nextcloud/design/settings-caldavRoeland Jago Douma2019-02-012-1/+37
|\ \ \ \ | | | | | | | | | | Move calendar settings into basic settings
| * | | | make text in Groupware Settings translateableGeorg Ehrke2019-02-011-3/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | fix link to Calendar app in Groupware pageGeorg Ehrke2019-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | Turn "email server" in groupware settings to link to mail settingsGeorg Ehrke2019-02-011-1/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | Keep Calendar server settings in groupware but link mail server settingsJan-Christoph Borchardt2019-02-013-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Calendar server: Link Calendar app and calendar sync docsJan-Christoph Borchardt2019-02-011-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Improve design of description below label of checkbox or radio buttonJan-Christoph Borchardt2019-02-011-0/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Move calendar settings into basic settingsJan-Christoph Borchardt2019-02-012-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #13970 from nextcloud/fix/do_not_try_to_load_removed_filesMorris Jobke2019-02-011-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Do not try to load js moved to bundle
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 20:46:25 +0000