summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make the data year in the template dynamic by using date().andyg50002019-02-011-1/+1
|
* 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
| * | | Do not try to load js moved to bundleRoeland Jago Douma2019-02-011-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #13972 from nextcloud/backport/13947/masterRoeland Jago Douma2019-02-012-2/+2
|\ \ \ \ | | | | | | | | | | [master] trim filename in webfrontend for windows compatibility
| * | | | 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 functionality
| * | | Remove duplicate functionalityb108@volgograd2019-01-201-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | This functionality implemented in the next line: $requestUri = preg_replace('%/{2,}%', '/', $requestUri);
* | | | Merge pull request #13927 from nextcloud/remove-dead-codeMorris Jobke2019-02-012-54/+2
|\ \ \ \ | | | | | | | | | | Don't call apc_delete_file and apc_clear_cache anymore
| * | | | Remove deleteFromOpcodeCache & clearOpcodeCacheDaniel Kesselberg2019-01-302-35/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Don't call apc_delete_file and apc_clear_cache anymoreDaniel Kesselberg2019-01-301-25/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no apc for PHP7+ so there is no need to check if exist. accelerator_reset looks even more ancient. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #12090 from nextcloud/aastha/11923Morris Jobke2019-02-013-2/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | Add title attribute for app navigation items.
| * | | | Generate assetsRoeland Jago Douma2019-01-312-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add title attribute for app navigation items.Aastha Gupta2019-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | Fix: #11923
* | | | | 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 them
| * | | | | Move global helper functions to the bundle and deprecate some of themChristoph Wurst2019-02-017-45/+181
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #12917 from ↵Morris Jobke2019-02-015-35/+83
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/feature/noid/favorites-quickaccess-add-droppable-v3 Added Drozone to favorites quickaccess
| * | | | | Add drop zone for favorites quick access in navigationfnuesse2019-02-013-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: fnuesse <felix.nuesse@t-online.de>
| * | | | | Extract variable for yellow color in iconsfnuesse2019-02-013-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: fnuesse <felix.nuesse@t-online.de>
| * | | | | Fix drop zone shadowfnuesse2019-02-012-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: fnuesse <felix.nuesse@t-online.de>
| * | | | | Unify handling of dropping one file or several files on the trash binDaniel Calviño Sánchez2019-02-011-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a single file was dropped on the trash bin the file information was gotten from the original element in the file list. When several files were dropped on the trash bin the file information was gotten from the helper elements being dragged around. The helper element also contain the needed file information when a single file is being dragged, so the handling was unified to always get the file information from the helper elements. As the handling of several files is the same as before there is still the issue of only deleting those files shown in the drag helper instead of all the selected files. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Use full names instead of abbreviations in variable namesDaniel Calviño Sánchez2019-01-311-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Make code format more consistent with the rest of the fileDaniel Calviño Sánchez2019-01-311-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Replace double quotes with single quotesDaniel Calviño Sánchez2019-01-312-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add missing trailing ";"Daniel Calviño Sánchez2019-01-312-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Remove unneeded triggering of eventDaniel Calviño Sánchez2019-01-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "droppedOnTrash" event was being triggered when the file list was initialized, but it should be triggered only when the user actually drops a file on the trash bin. Besides that, the event had no effect; only the file list handles it, but as it was not triggered on any element it ended being triggered on the document, and thus not handled. Moreover, even if it had been triggered on the file list it would have been done before the handler was set, so it would not have been handled anyway. And even if it had been handled no data was provided, so the handler would have failed. In conclusion, triggering the event there was not needed, and thus it was removed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Remove duplicated variable declarationDaniel Calviño Sánchez2019-01-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Remove leftover from a WIPDaniel Calviño Sánchez2019-01-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Remove hack to prefetch the starred trash iconDaniel Calviño Sánchez2019-01-311-3/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 6ad7f32938 SVG icons are directly embedded in "icons-vars.css", so the starred trash icon is now loaded along with the regular trash icon all at once. Therefore it is not needed to explicitly prefetch it using a hidden div. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #13957 from nextcloud/refactor/oc-search-passwordconfirm-utilMorris Jobke2019-02-0110-533/+760
|\ \ \ \ \ | | | | | | | | | | | | Move OC.Search, OC.PasswordConfirmation and OC.Util to the server bundle
| * | | | | Make chunkify an internal function to prevent context errorsChristoph Wurst2019-02-013-26/+67
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Add OC.Util to the server bundleChristoph Wurst2019-02-018-427/+529
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Move OC.PasswordConfirmation to the server bundleChristoph Wurst2019-02-015-97/+132
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Move OC.search to the server bundleChristoph Wurst2019-02-015-17/+66
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #13261 from nextcloud/fix/12395Morris Jobke2019-02-011-12/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | only show "Add to your Nextcloud" on share link if federation is acti…
| * | | | | | add myself as @authorJonas Sulzer2019-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 20:13:19 +0000