summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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>
| * | | | code stylingJonas Sulzer2019-01-311-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
| * | | | restructure codeJonas Sulzer2019-01-311-26/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
| * | | | only show "Add to your Nextcloud" on share link if federation is activatedJonas Sulzer2019-01-311-2/+14
| | |/ / | |/| | | | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | | | Merge pull request #13932 from filisko/masterRoeland Jago Douma2019-02-011-1/+1
|\ \ \ \ | |_|/ / |/| | | Comment fix.
| * | | Comment fix.Filis Futsarov2019-01-301-1/+1
| | | |
* | | | Merge pull request #13956 from ↵Roeland Jago Douma2019-02-017-395/+467
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/refactor/oc-plugins-msg-notifications-II Move OC.Plugins, OC.msg and OC.Notification to the server bundle
| * | | | Move OC.Plugin to the server bundleChristoph Wurst2019-02-015-92/+93
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | Move OC.msg to the server bundleChristoph Wurst2019-02-015-96/+122
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | Move OC.Notification to the server bundleChristoph Wurst2019-02-015-212/+257
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #13958 from nextcloud/refactor/custom-polyfills-bundleMorris Jobke2019-01-317-28/+133
|\ \ \ \ | | | | | | | | | | Move custom polyfills to the server bundle
| * | | | Move custom polyfills to the server bundleChristoph Wurst2019-01-317-28/+133
| | |/ / | |/| | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #13945 from ↵Roeland Jago Douma2019-01-311-3/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/show-autocompletion-as-soon-as-at-is-typed Show autocompletion as soon as "@" is typed
| * | | Show autocompletion as soon as "@" is typedDaniel Calviño Sánchez2019-01-311-3/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | In order to show the autocompletion it was needed to type at least another character after "@", so only the mentions that matched that character were shown. Now the autocompletion is shown as soon as "@" is typed, which shows all the possible mentions. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #13633 from nextcloud/3rdparty/doctrine/dbal-2.6.3Roeland Jago Douma2019-01-311-0/+0
|\ \ \ | | | | | | | | [3rdparty] Bump to doctrine/dbal-2.7.2
| * | | [3rdparty] Bump to doctrine/dbal-2.6.3Roeland Jago Douma2019-01-311-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #13935 from nextcloud/fix/backbone-webpack-noconflictRoeland Jago Douma2019-01-315-21/+45
|\ \ \ \ | | | | | | | | | | Fix the patched Backbone instance and use that exclusively
| * | | | Use Backbone.noConflict in the bundle as wellChristoph Wurst2019-01-315-21/+45
| | |/ / | |/| | | | | | | | | | | | | | | | | | Move the patched Backbone to its own module again Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #13899 from ↵Roeland Jago Douma2019-01-316-0/+172
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/enh/13662/events_to_load_additional_scripts Emit event to load additionalscripts
| * | | Emit to load additionalscriptsRoeland Jago Douma2019-01-316-0/+172
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13662 This will fire of an event after a Template Response has been returned. There is an event for the generic loading and one when logged in. So apps can chose to load only on loged in pages. This is a more generic approach than the files app event. As some things we might want to load on other pages as well besides the files app. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #10068 from ↵Morris Jobke2019-01-318-1/+738
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/1434/provisioning_profiles_for_dav Add Apple Provisioning profile
| * | | Fix theming defaults injection if theming app is disabledMorris Jobke2019-01-311-5/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>