summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13982 from ↵Morris Jobke2019-02-085-36/+36
|\ | | | | | | | | nextcloud/stable15-12917-clean-code-and-fix-drop-zone-shadow [stable15] Clean code and fix drop zone shadow
| * 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-02-011-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-02-011-12/+11
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Replace double quotes with single quotesDaniel Calviño Sánchez2019-02-012-8/+8
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Add missing trailing ";"Daniel Calviño Sánchez2019-02-012-4/+4
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Remove unneeded triggering of eventDaniel Calviño Sánchez2019-02-011-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-02-011-1/+0
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Remove leftover from a WIPDaniel Calviño Sánchez2019-02-011-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-02-011-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 #14101 from nextcloud/backport/14083/stable15Joas Schilling2019-02-081-11/+10
|\ \ | | | | | | [stable15] Make sure the relative path is always a string
| * | Fix wrong method callJoas Schilling2019-02-071-1/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make sure the relative path is always a stringJoas Schilling2019-02-071-10/+10
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-02-0828-58/+204
|/ /
* | Merge pull request #14094 from ↵Roeland Jago Douma2019-02-072-19/+16
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/stable15/lodash-4.17.11 [Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/accessibility
| * | [Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/accessibilitydependabot[bot]2019-02-072-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.11. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Changelog](https://github.com/lodash/lodash/blob/master/CHANGELOG) - [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.11) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #14093 from ↵Roeland Jago Douma2019-02-072-12/+4
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/stable15/lodash-4.17.11 [Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/updatenotification
| * | | [Security] Bump lodash in /apps/updatenotificationdependabot[bot]2019-02-072-12/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.11. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Changelog](https://github.com/lodash/lodash/blob/master/CHANGELOG) - [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.11) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #14095 from ↵Roeland Jago Douma2019-02-071-13/+5
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/stable15/lodash-4.17.11 [Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/oauth2
| * | [Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/oauth2dependabot[bot]2019-02-071-13/+5
|/ / | | | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.11. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Changelog](https://github.com/lodash/lodash/blob/master/CHANGELOG) - [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.11) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #14029 from nextcloud/backport/13954/stable15Morris Jobke2019-02-071-2/+5
|\ \ | | | | | | [stable15] 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 #13978 from nextcloud/backport/13972/stable15Morris Jobke2019-02-072-2/+2
|\ \ \ | | | | | | | | [stable15] 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 #13961 from nextcloud/backport/13945/stable15Roeland Jago Douma2019-02-071-3/+0
|\ \ \ | | | | | | | | [stable15] 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 #14068 from nextcloud/smb-3.0.1-15Morris Jobke2019-02-079-51/+33
|\ \ \ \ | | | | | | | | | | [15] update icewind/smb to 3.0.1
| * | | | update icewind/smb to 3.0.1Robin Appelman2019-02-069-51/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #14077 from nextcloud/version/noid/15.0.4v15.0.4Morris Jobke2019-02-071-2/+2
|\ \ \ \ \ | | | | | | | | | | | | 15.0.4
| * | | | | 15.0.4Morris Jobke2019-02-071-2/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #14076 from ↵Morris Jobke2019-02-071-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/14022/stable15-not-working-external-storages [stable15] Make external storages browsable again in the web UI
| * | | | | Reintroduce status check for external storagesMorris Jobke2019-02-071-0/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14022 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #14061 from nextcloud/version/noid/15.0.3v15.0.3Morris Jobke2019-02-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | 15.0.3
| * | | | | 15.0.3Morris Jobke2019-02-061-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / / [tx-robot] updated from transifexNextcloud bot2019-02-0640-12/+180
|/ / / /
* | | / [tx-robot] updated from transifexNextcloud bot2019-02-06446-2150/+2814
| |_|/ |/| |
* | | Merge pull request #14028 from nextcloud/revert-14026-backport/13954/stable15Roeland Jago Douma2019-02-051-5/+2
|\ \ \ | | | | | | | | Revert "[stable15] Show original path in trashbin"
| * | | Revert "[stable15] Show original path in trashbin"Roeland Jago Douma2019-02-051-5/+2
|/ / /
* | | Merge pull request #14026 from nextcloud/backport/13954/stable15John Molakvoæ2019-02-051-2/+5
|\ \ \ | |_|/ |/| | [stable15] 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 #13976 from ↵Morris Jobke2019-02-012-2/+2
|\ \ | | | | | | | | | | | | nextcloud/revert-13947-TrimFilenameWinCompatibility Revert "trim filename in webfrontend for windows compatibility"
| * | Revert "trim filename in webfrontend for windows compatibility"Morris Jobke2019-02-012-2/+2
|/ /
* | Merge pull request #13947 from HuemerGroup/TrimFilenameWinCompatibilityRoeland Jago Douma2019-02-012-2/+2
|\ \ | |/ |/| trim filename in webfrontend for windows compatibility
| * HBOX-297 trim in webfrontend for new files to stay compatible with windowsChristian Aigner2019-01-312-2/+2
|/
* Merge pull request #13912 from nextcloud/version/noid/15.0.3RC1v15.0.3RC1Morris Jobke2019-01-311-2/+2
|\ | | | | 15.0.3 RC 1
| * 15.0.3 RC 1Morris Jobke2019-01-311-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13930 from nextcloud/backport/12636/stable15Christoph Wurst2019-01-311-6/+17
|\ | | | | [stable15] handle mail send error gracefully
| * Fix typos and unused return valuesChristoph Wurst2019-01-301-9/+9
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 07:16:44 +0000