summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
|\ \ \ \ \
| * | | | | Do not try to load js moved to bundleRoeland Jago Douma2019-02-011-2/+0
* | | | | | Merge pull request #13972 from nextcloud/backport/13947/masterRoeland Jago Douma2019-02-012-2/+2
|\ \ \ \ \ \
| * | | | | | HBOX-297 trim in webfrontend for new files to stay compatible with windowsChristian Aigner2019-02-012-2/+2
| |/ / / / /
* | | | | | Merge pull request #13694 from b108/duplicate-functionality-in-request-classRoeland Jago Douma2019-02-011-5/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove duplicate functionalityb108@volgograd2019-01-201-5/+1
* | | | | | Merge pull request #13927 from nextcloud/remove-dead-codeMorris Jobke2019-02-012-54/+2
|\ \ \ \ \ \
| * | | | | | Remove deleteFromOpcodeCache & clearOpcodeCacheDaniel Kesselberg2019-01-302-35/+2
| * | | | | | Don't call apc_delete_file and apc_clear_cache anymoreDaniel Kesselberg2019-01-301-25/+6
* | | | | | | Merge pull request #12090 from nextcloud/aastha/11923Morris Jobke2019-02-013-2/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Generate assetsRoeland Jago Douma2019-01-312-2/+2
| * | | | | | Add title attribute for app navigation items.Aastha Gupta2019-01-311-0/+1
* | | | | | | Merge pull request #13960 from nextcloud/refactor/global-helpers-bundleMorris Jobke2019-02-017-45/+181
|\ \ \ \ \ \ \
| * | | | | | | Move global helper functions to the bundle and deprecate some of themChristoph Wurst2019-02-017-45/+181
* | | | | | | | Merge pull request #12917 from nextcloud/feature/noid/favorites-quickaccess-a...Morris Jobke2019-02-015-35/+83
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add drop zone for favorites quick access in navigationfnuesse2019-02-013-0/+48
| * | | | | | | Extract variable for yellow color in iconsfnuesse2019-02-013-3/+4
| * | | | | | | Fix drop zone shadowfnuesse2019-02-012-1/+9
| * | | | | | | Unify handling of dropping one file or several files on the trash binDaniel Calviño Sánchez2019-02-011-8/+7
| * | | | | | | Use full names instead of abbreviations in variable namesDaniel Calviño Sánchez2019-01-311-8/+8
| * | | | | | | Make code format more consistent with the rest of the fileDaniel Calviño Sánchez2019-01-311-12/+11
| * | | | | | | Replace double quotes with single quotesDaniel Calviño Sánchez2019-01-312-8/+8
| * | | | | | | Add missing trailing ";"Daniel Calviño Sánchez2019-01-312-4/+4
| * | | | | | | Remove unneeded triggering of eventDaniel Calviño Sánchez2019-01-311-2/+0
| * | | | | | | Remove duplicated variable declarationDaniel Calviño Sánchez2019-01-311-1/+0
| * | | | | | | Remove leftover from a WIPDaniel Calviño Sánchez2019-01-311-1/+0
| * | | | | | | Remove hack to prefetch the starred trash iconDaniel Calviño Sánchez2019-01-311-3/+0
| |/ / / / / /
* | | | | | | Merge pull request #13957 from nextcloud/refactor/oc-search-passwordconfirm-utilMorris Jobke2019-02-0110-533/+760
|\ \ \ \ \ \ \
| * | | | | | | Make chunkify an internal function to prevent context errorsChristoph Wurst2019-02-013-26/+67
| * | | | | | | Add OC.Util to the server bundleChristoph Wurst2019-02-018-427/+529
| * | | | | | | Move OC.PasswordConfirmation to the server bundleChristoph Wurst2019-02-015-97/+132
| * | | | | | | Move OC.search to the server bundleChristoph Wurst2019-02-015-17/+66
* | | | | | | | Merge pull request #13261 from nextcloud/fix/12395Morris Jobke2019-02-011-12/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | add myself as @authorJonas Sulzer2019-01-311-0/+1
| * | | | | | | | code stylingJonas Sulzer2019-01-311-2/+1
| * | | | | | | | restructure codeJonas Sulzer2019-01-311-26/+23
| * | | | | | | | only show "Add to your Nextcloud" on share link if federation is activatedJonas Sulzer2019-01-311-2/+14
| | |/ / / / / / | |/| | | | | |