summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-02-15414-1196/+1488
|
* Merge pull request #14213 from nextcloud/backport/14197/stable15Morris Jobke2019-02-141-1/+1
|\ | | | | [stable15] Fix trashbin restore translation
| * Fix trashbin restore translationRoeland Jago Douma2019-02-141-1/+1
|/ | | | | | The files app doesn't have this entry. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #14195 from nextcloud/backport/14185/stable15Roeland Jago Douma2019-02-141-3/+32
|\ | | | | [stable15] Fix recent files
| * Filter out versions and trashbinRoeland Jago Douma2019-02-141-0/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Loop for the recent searchRoeland Jago Douma2019-02-141-3/+26
| | | | | | | | | | | | Else it might happen that less entries than requested are returned Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * We need to initialize the storage else the jailed path is always nullRoeland Jago Douma2019-02-141-0/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14085 from nextcloud/backport/14023/stable15Roeland Jago Douma2019-02-141-1/+1
|\ \ | | | | | | [stable15] Fix: Check if `$this->params['user']` is an array
| * | Fix: Check if `$this->params['user']` is an arrayWilliam Pain2019-02-071-1/+1
| | | | | | | | | | | | Signed-off-by: William Pain <pain.william@gmail.com>
* | | Merge pull request #14201 from nextcloud/backport/14160/stable15Roeland Jago Douma2019-02-142-54/+57
|\ \ \ | | | | | | | | [stable15] Update CRL to contain revoked files_external_dropbox, passman & payback
| * | | Update CRL to contain revoked files_external_dropbox, passman & paybackMorris Jobke2019-02-142-54/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * see https://github.com/nextcloud/app-certificate-requests/pull/221 * see https://github.com/nextcloud/app-certificate-requests/pull/219#issuecomment-463577509 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #14207 from nextcloud/backport/14177/stable15Roeland Jago Douma2019-02-145-6/+7
|\ \ \ \ | | | | | | | | | | [stable15] Fix small glitches in update notification page
| * | | | Fix border in update notification sectionMorris Jobke2019-02-141-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Fix style of warning for EoL versionMorris Jobke2019-02-144-6/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #14203 from nextcloud/backport/14200/stable15blizzz2019-02-142-15/+19
|\ \ \ \ | |/ / / |/| | | [stable15] ensure attribute names are lower cased
| * | | ensure attribute names are lower casedArthur Schiwon2019-02-142-15/+19
|/ / / | | | | | | | | | | | | | | | | | | otherwise they will be skipped when the results is being formatted and the lower-cased result keys do not match. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #14187 from ↵Roeland Jago Douma2019-02-142-8/+8
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/build/stable15/handlebars-4.1.0 [Security] Bump handlebars from 4.0.12 to 4.1.0 in /build
| * | [Security] Bump handlebars from 4.0.12 to 4.1.0 in /builddependabot[bot]2019-02-142-8/+8
|/ / | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.12 to 4.1.0. **This update includes security fixes.** - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/v4.1.0/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | [tx-robot] updated from transifexNextcloud bot2019-02-14224-382/+494
| |
* | [tx-robot] updated from transifexNextcloud bot2019-02-1354-80/+678
| |
* | Merge pull request #14151 from nextcloud/backport/14149/stable15Roeland Jago Douma2019-02-122-2/+33
|\ \ | | | | | | [stable15] Fix the thorrtler whitelist bitmask
| * | Fix the thorrtler whitelist bitmaskRoeland Jago Douma2019-02-122-2/+33
|/ / | | | | | | | | | | Before we actually didn't check each bit of the bitmask. Now we do. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-02-12214-2054/+1202
| |
* | [tx-robot] updated from transifexNextcloud bot2019-02-1134-8/+122
| |
* | [tx-robot] updated from transifexNextcloud bot2019-02-1050-6/+138
| |
* | [tx-robot] updated from transifexNextcloud bot2019-02-0928-130/+230
| |
* | 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>