summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16666 from nextcloud/feature/calendar/delegationRoeland Jago Douma2019-08-151-2/+3
|\ | | | | Feature/calendar/delegation
| * Use the proxymapper to obtain valid proxy dataRoeland Jago Douma2019-08-151-2/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-08-152-0/+22
| |
* | Merge pull request #16663 from JakubOnderka/patch-2Roeland Jago Douma2019-08-141-1/+1
|\ \ | |/ |/| files_trashbin: File can be without extension
| * files_trashbin: File can be without extensionJakub Onderka2019-08-071-1/+1
| | | | | | | | Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
* | Bump style-loader from 0.23.1 to 1.0.0dependabot-preview[bot]2019-08-112-2/+2
|/ | | | | | | | | | Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 0.23.1 to 1.0.0. - [Release notes](https://github.com/webpack-contrib/style-loader/releases) - [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/style-loader/compare/v0.23.1...v1.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* Bump webpack from 4.38.0 to 4.39.1dependabot-preview[bot]2019-08-041-1/+1
| | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.38.0 to 4.39.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.38.0...v4.39.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* [tx-robot] updated from transifexNextcloud bot2019-08-012-0/+2
|
* Bump webpack from 4.35.0 to 4.35.2dependabot-preview[bot]2019-07-082-2/+2
| | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.35.0 to 4.35.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.35.0...v4.35.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* Bump css-loader from 2.1.1 to 3.0.0dependabot-preview[bot]2019-06-252-2/+2
| | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Add event dispatcher to OCPChristoph Wurst2019-06-252-7/+6
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Unify webpack configJohn Molakvoæ (skjnldsv)2019-05-291-29/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2019-05-282-0/+16
|
* [tx-robot] updated from transifexNextcloud bot2019-05-272-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2019-05-022-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2019-04-302-6/+20
|
* [tx-robot] updated from transifexNextcloud bot2019-04-184-18/+34
|
* Bump versions of server and the requirements of appsJoas Schilling2019-04-111-2/+2
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2019-03-292-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2019-03-19138-182/+182
|
* Merge pull request #14721 from nextcloud/fix/14639/trash_delete_permRoeland Jago Douma2019-03-183-4/+4
|\ | | | | Trashbin: Delete => Delete permanently
| * Trashbin: Delete => Delete permanentlyRoeland Jago Douma2019-03-163-4/+4
| | | | | | | | | | | | For #14639 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Use higher preview resolution in trashbinRoeland Jago Douma2019-03-161-2/+2
|/ | | | | | For #14639 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #14693 from nextcloud/trashbin-restore-readonly-targetRoeland Jago Douma2019-03-141-0/+4
|\ | | | | dont try to restore a trashbin item to a readonly target
| * dont try to restore a trashbin item to a readonly targetRobin Appelman2019-03-141-0/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-03-144-0/+6
|/
* Merge pull request #14640 from nextcloud/techdebt/noid/disable-failing-testsMorris Jobke2019-03-131-2/+4
|\ | | | | Disable fragile tests
| * Do not run fragile TrashbinTestMorris Jobke2019-03-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fails with: There was 1 failure: 1) TrashbinTest::testExpireOldFiles Failed asserting that null is identical to 'file2.txt'. /drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186 OR 1) TrashbinTest::testExpireOldFiles Failed asserting that null is identical to 'file2.txt'. /drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:193 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | prevent recursion when moving a file to the trashbinRobin Appelman2019-03-131-1/+4
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldavMorris Jobke2019-03-131-1/+2
|\ | | | | Change CALDAV to allow calendars be shared with circles.
| * Use proper dependency injection for app managerMorris Jobke2019-03-051-1/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Only fetch size of this storage without mount points - ref #14412Morris Jobke2019-03-011-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Revert "Fix for issue 10862: calculation of free space ignores external ↵Morris Jobke2019-03-011-4/+5
|/ | | | | | | | storage (doesn't count towards quota)" This reverts commit e806aa658c16fadad465504fab4aeef314832bdb. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #14412 from nextcloud/fileinfo-raw-sizeMorris Jobke2019-02-281-3/+3
|\ | | | | add option to get raw size (without submounts) from fileinfo
| * add option to get raw size (without submounts) from fileinfoRobin Appelman2019-02-271-3/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #13844 from ↵Morris Jobke2019-02-271-5/+4
|\ \ | | | | | | | | | | | | felixn/bugfix/10862-trash-bin-ignores-trashbin_retention_obligation Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
| * | Fix for issue 10862: calculation of free space ignores external storage ↵Felix Nieuwenhuizen2019-01-261-5/+4
| | | | | | | | | | | | | | | | | | (doesn't count towards quota) Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-02-272-14/+14
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2019-02-212-2/+2
| |
* | Merge pull request #14197 from nextcloud/fix/trashbin_restore_translationRoeland Jago Douma2019-02-143-3/+3
|\ \ | | | | | | Fix trashbin restore translation
| * | Compile assetsRoeland Jago Douma2019-02-142-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | 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>
* | | [tx-robot] updated from transifexNextcloud bot2019-02-14138-204/+204
|/ /
* | Move files_trashbin to webpackRoeland Jago Douma2019-02-139-3/+49
| | | | | | | | | | | | | | Combine the 2 js files and the scss. This saves compiling the scss on the go. And going via Nextcloud storage to obtain it. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-02-062-4/+4
| |
* | 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>
* | add fallback for trashbin original locationRobin Appelman2019-01-291-1/+5
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2019-01-202-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2019-01-192-0/+12
|
* [tx-robot] updated from transifexNextcloud bot2019-01-152-2/+2
|