summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump webpack from 4.29.0 to 4.29.1dependabot[bot]2019-02-052-50/+64
* Merge pull request #14042 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-02-052-25/+11
|\
| * Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/updatenotificationdependabot[bot]2019-02-052-25/+11
* | Merge pull request #14048 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2019-02-052-25/+11
|\ \ | |/ |/|
| * Bump webpack-cli from 3.2.1 to 3.2.3 in /settingsdependabot[bot]2019-02-052-25/+11
* | Merge pull request #14045 from nextcloud/dependabot/npm_and_yarn/webpack-cli-...Roeland Jago Douma2019-02-052-30/+16
|\ \
| * | Bump webpack-cli from 3.2.1 to 3.2.3dependabot[bot]2019-02-052-30/+16
| |/
* | Merge pull request #14039 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2019-02-052-25/+11
|\ \
| * | Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/oauth2dependabot[bot]2019-02-052-25/+11
| |/
* | Merge pull request #14038 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2019-02-052-25/+11
|\ \ | |/ |/|
| * Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/accessibilitydependabot[bot]2019-02-052-25/+11
|/
* Merge pull request #14030 from nextcloud/fix/oc_addstyleMorris Jobke2019-02-051-2/+0
|\
| * Fix OC.addStyle and OC.addScriptRoeland Jago Douma2019-02-051-2/+0
|/
* Merge pull request #13954 from nextcloud/bugfix/noid/show-original-location-i...Roeland Jago Douma2019-02-051-2/+5
|\
| * Show original path in trashbin via extraDataMorris Jobke2019-02-051-2/+5
* | Merge pull request #14024 from nextcloud/fix/installationRoeland Jago Douma2019-02-053-4/+4
|\ \
| * | It is getURLParameter not getUrlParameterRoeland Jago Douma2019-02-053-4/+4
|/ /
* | Merge pull request #14015 from nextcloud/fix/no_need_to_load_bundle_depsMorris Jobke2019-02-054-4/+0
|\ \ | |/ |/|
| * No need to explicitly load bundle dependenciesRoeland Jago Douma2019-02-044-4/+0
|/
* Merge pull request #14006 from nextcloud/enh/contactsmenu_templates_to_bundleRoeland Jago Douma2019-02-0416-167/+100
|\
| * Remove from build fileRoeland Jago Douma2019-02-041-3/+0
| * Move the contactsmenu handlebars templates to the bundleRoeland Jago Douma2019-02-0415-164/+100
|/
* Merge pull request #13877 from IGLOU-EU/masterRoeland Jago Douma2019-02-041-0/+6
|\
| * inadvertent error prevention on .rowIglou.eu2019-02-011-0/+3
| * add background on app hover sectionIglou.eu2019-01-281-0/+3
* | Merge pull request #13989 from nextcloud/dependabot/npm_and_yarn/css-vars-pon...Roeland Jago Douma2019-02-044-8/+8
|\ \
| * | Bump css-vars-ponyfill from 1.16.3 to 1.16.4dependabot[bot]2019-02-034-8/+8
* | | Merge pull request #13988 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-02-044-19/+19
|\ \ \ | |/ / |/| |
| * | Bump nextcloud-vue from 0.6.0 to 0.6.1 in /apps/updatenotificationdependabot[bot]2019-02-034-19/+19
|/ /
* | Merge pull request #11304 from andyg5000/masterMorris Jobke2019-02-011-3/+7
|\ \
| * | 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 enableAppForGroupsDaniel Kesselberg2019-01-262-9/+38
* | | Merge pull request #13548 from nextcloud/feature/10964/app_tokens_activityRoeland Jago Douma2019-02-013-80/+210
|\ \ \
| * | | Make strictJoas Schilling2019-02-011-29/+19
| * | | Use rich object subjectsJoas Schilling2019-02-011-6/+13
| * | | Don't cast tokenId to stringDaniel Kesselberg2019-01-301-1/+1
| * | | Add test for destroy with invalid userDaniel Kesselberg2019-01-301-33/+88
| * | | Add token name for delete activityDaniel Kesselberg2019-01-302-10/+31
| * | | Publish event for app token create/update/deleteDaniel Kesselberg2019-01-303-16/+73
* | | | Merge pull request #13796 from nextcloud/design/settings-caldavRoeland Jago Douma2019-02-012-1/+37
|\ \ \ \
| * | | | make text in Groupware Settings translateableGeorg Ehrke2019-02-011-3/+16
| * | | | fix link to Calendar app in Groupware pageGeorg Ehrke2019-02-011-1/+1
| * | | | Turn "email server" in groupware settings to link to mail settingsGeorg Ehrke2019-02-011-1/+13
| * | | | Keep Calendar server settings in groupware but link mail server settingsJan-Christoph Borchardt2019-02-013-3/+3
| * | | | Calendar server: Link Calendar app and calendar sync docsJan-Christoph Borchardt2019-02-011-0/+2
| * | | | Improve design of description below label of checkbox or radio buttonJan-Christoph Borchardt2019-02-011-0/+9
| * | | | Move calendar settings into basic settingsJan-Christoph Borchardt2019-02-012-2/+2
* | | | | Merge pull request #13970 from nextcloud/fix/do_not_try_to_load_removed_filesMorris Jobke2019-02-011-2/+0
|\ \ \ \ \