wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
50326 commits 157 branches 562 tags 714 MiB
Commit graph

1174 commits

Author SHA1 Message Date
Nextcloud bot
ddec3fc416
[tx-robot] updated from transifex 2019-08-20 02:14:48 +00:00
dependabot-preview[bot]
20a83bed16 Bump webpack from 4.39.1 to 4.39.2 
Bumps [webpack](https://github.com/webpack/webpack) from 4.39.1 to 4.39.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.39.1...v4.39.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-08-18 14:22:01 +00:00
Nextcloud bot
5b09460d4f
[tx-robot] updated from transifex 2019-08-17 02:15:00 +00:00
Roeland Jago Douma
f452e23a7d
Merge pull request #16666 from nextcloud/feature/calendar/delegation 
Feature/calendar/delegation
 2019-08-15 19:30:45 +02:00
Roeland Jago Douma
01a4644cad
Use the proxymapper to obtain valid proxy data 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-08-15 15:41:27 +02:00
Nextcloud bot
fdcc654ff6
[tx-robot] updated from transifex 2019-08-15 02:14:35 +00:00
Roeland Jago Douma
d013ff6cae
Merge pull request #16663 from JakubOnderka/patch-2 
files_trashbin: File can be without extension
 2019-08-14 10:29:53 +02:00
dependabot-preview[bot]
723815f081 Bump style-loader from 0.23.1 to 1.0.0 
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>
 2019-08-11 17:43:33 +00:00
Jakub Onderka
41f8be47eb files_trashbin: File can be without extension 
Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
 2019-08-07 16:04:09 +02:00
dependabot-preview[bot]
b84b78d203 Bump webpack from 4.38.0 to 4.39.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>
 2019-08-04 07:57:44 +00:00
Nextcloud bot
a1afdac31a
[tx-robot] updated from transifex 2019-08-01 02:15:27 +00:00
dependabot-preview[bot]
94a992d0d6 Bump webpack from 4.35.0 to 4.35.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>
 2019-07-08 11:57:16 +00:00
dependabot-preview[bot]
4a401865f2
Bump css-loader from 2.1.1 to 3.0.0 
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>
 2019-06-25 21:33:38 +02:00
Christoph Wurst
3174012adf Add event dispatcher to OCP 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-06-25 10:02:27 +02:00
John Molakvoæ (skjnldsv)
b53a9130a6
Unify webpack config 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-05-29 15:19:18 +02:00
Nextcloud bot
c3f779b97d
[tx-robot] updated from transifex 2019-05-28 02:13:42 +00:00
Nextcloud bot
cdfd2d8dd1
[tx-robot] updated from transifex 2019-05-27 02:13:41 +00:00
Nextcloud bot
579588a4cd
[tx-robot] updated from transifex 2019-05-02 00:12:57 +00:00
Nextcloud bot
4fd2cbeb94
[tx-robot] updated from transifex 2019-04-30 00:12:43 +00:00
Nextcloud bot
16b8017fc9
[tx-robot] updated from transifex 2019-04-18 00:12:48 +00:00
Joas Schilling
4c19b3b2c6
Bump versions of server and the requirements of apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-04-11 14:02:23 +02:00
Nextcloud bot
f7267468c0
[tx-robot] updated from transifex 2019-03-29 01:12:48 +00:00
Nextcloud bot
785ccae622
[tx-robot] updated from transifex 2019-03-19 01:12:41 +00:00
Roeland Jago Douma
c41687530d
Merge pull request #14721 from nextcloud/fix/14639/trash_delete_perm 
Trashbin: Delete => Delete permanently
 2019-03-18 10:09:59 +01:00
Roeland Jago Douma
9dd7bc1919
Trashbin: Delete => Delete permanently 
For #14639

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-16 15:04:20 +01:00
Roeland Jago Douma
50a2ab8bc6
Use higher preview resolution in trashbin 
For #14639

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-16 14:56:26 +01:00
Roeland Jago Douma
c7dd07966a
Merge pull request #14693 from nextcloud/trashbin-restore-readonly-target 
dont try to restore a trashbin item to a readonly target
 2019-03-14 20:26:49 +01:00
Nextcloud bot
6fcf729545
[tx-robot] updated from transifex 2019-03-14 16:08:31 +00:00
Robin Appelman
62a969f056
dont try to restore a trashbin item to a readonly target 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-14 16:18:43 +01:00
Morris Jobke
6c55e5f42d
Merge pull request #14640 from nextcloud/techdebt/noid/disable-failing-tests 
Disable fragile tests
 2019-03-13 21:29:59 +01:00
Morris Jobke
000a92bcde
Do not run fragile TrashbinTest 
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>
 2019-03-13 18:01:24 +01:00
Robin Appelman
0d41138c6e
prevent recursion when moving a file to the trashbin 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-13 11:42:01 +01:00
Morris Jobke
f0c85a0f5f
Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldav 
Change CALDAV to allow calendars be shared with circles.
 2019-03-13 00:06:46 +01:00
Morris Jobke
dd2496b275
Use proper dependency injection for app manager 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-05 16:00:47 +01:00
Morris Jobke
4704e719ed
Only fetch size of this storage without mount points - ref #14412 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-01 12:05:18 +01:00
Morris Jobke
f6967a974f
Revert "Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota)" 
This reverts commit e806aa658c.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-01 12:03:33 +01:00
Morris Jobke
7519a9a990
Merge pull request #14412 from nextcloud/fileinfo-raw-size 
add option to get raw size (without submounts) from fileinfo
 2019-02-28 13:49:27 +01:00
Morris Jobke
3459ffc4d1
Merge pull request #13844 from felixn/bugfix/10862-trash-bin-ignores-trashbin_retention_obligation 
Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
 2019-02-27 15:55:20 +01:00
Robin Appelman
8fc47c6f00
add option to get raw size (without submounts) from fileinfo 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-02-27 15:35:44 +01:00
Nextcloud bot
36b01e3c2d
[tx-robot] updated from transifex 2019-02-27 01:12:05 +00:00
Nextcloud bot
10388eab34
[tx-robot] updated from transifex 2019-02-21 01:12:02 +00:00
Roeland Jago Douma
af233f841f
Merge pull request #14197 from nextcloud/fix/trashbin_restore_translation 
Fix trashbin restore translation
 2019-02-14 19:44:17 +01:00
Roeland Jago Douma
e58128fe6f
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 12:00:12 +01:00
Roeland Jago Douma
93b896e3db
Fix trashbin restore translation 
The files app doesn't have this entry.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 11:57:52 +01:00
Nextcloud bot
4d8c42a4fb
[tx-robot] updated from transifex 2019-02-14 01:12:26 +00:00
Roeland Jago Douma
58ecc7d000
Move files_trashbin to webpack 
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>
 2019-02-13 09:46:29 +01:00
Nextcloud bot
0df5110127
[tx-robot] updated from transifex 2019-02-06 11:27:29 +00:00
Morris Jobke
979cf79555
Show original path in trashbin via extraData 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-05 09:36:21 +01:00
Robin Appelman
9a220214b8
add fallback for trashbin original location 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-29 15:14:04 +01:00
Felix Nieuwenhuizen
e806aa658c Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota) 
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
 2019-01-26 17:23:23 +01:00