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

20155 commits

Author SHA1 Message Date
Nextcloud bot
f8988c257c
[tx-robot] updated from transifex 2019-03-16 01:12:34 +00:00
Morris Jobke
8ff536f4f7
Merge pull request #14641 from nextcloud/assemblystream-seek 
make assemblystream seekable
 2019-03-15 12:25:28 +01:00
Nextcloud bot
81c3549918
[tx-robot] updated from transifex 2019-03-15 01:15:19 +00:00
Morris Jobke
3e3d41ae4c
Merge pull request #14637 from nextcloud/design/grid-border 
Add border around previews
 2019-03-14 23:31:18 +01:00
Morris Jobke
5d2edc4a22
Merge pull request #14686 from nextcloud/bugfix/noid/fix-hardcoded-f-url-handling 
Add correct method for hardcoded `/f/{fileid}`
 2019-03-14 23:30:50 +01:00
rakekniven
d2787db34d
Fixed Uppercase of Product name 
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
 2019-03-14 20:30:28 +01:00
Morris Jobke
06c898cab4
Merge pull request #14690 from nextcloud/dav-rename-hande-failure 
throw a proper error if rename fails in dav
 2019-03-14 20:28:17 +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
Jan-Christoph Borchardt
e1e65021b1
Only show border for files with generated previews 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-03-14 16:37:05 +01:00
Morris Jobke
37b1a9c4ea
Import needed class 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-14 16:28:01 +01: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
Robin Appelman
dafbb42189
throw a proper error if rename fails in dav 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-14 15:40:21 +01:00
Joas Schilling
5e5c5a16dc
Add correct method for hardcoded /f/{fileid} 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-14 15:13:56 +01:00
Morris Jobke
b7f0091e0f
Add time between SMB test runs and properly log full changeset 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-14 13:34:17 +01:00
Morris Jobke
f18d989720
Fix translation sync for accessibiltiy 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-14 11:57:02 +01:00
Morris Jobke
6331f174d3
Merge pull request #12119 from nextcloud/add_circle_to_caldav_and_filepanel-15 
Add Circle to Caldav and Filepanel
 2019-03-14 10:11:31 +01:00
Morris Jobke
de8e02628e
Improve code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-13 23:01:47 +01:00
Julius Härtl
e2bc47d6f5
Use SCSS variables since CSS vars are not loaded on public pages 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-13 22:09:36 +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
ab29028da7
Wait up to 10 seconds for incoming changes from SMB notifier 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-13 18:01:24 +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
6a47f924fc
make assemblystream seekable 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-13 16:32:18 +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
389c2095a6
Use dependency injection for app manager 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-13 00:42:39 +01:00
Vinicius Cubas Brand
9bb13fb05f
Created infrastructure to show circles' shared files 
There is a proposal to allow users to filter files shared to circles. This commit is needed to provide the infrastucture for it.

Issue: https://github.com/nextcloud/circles/issues/137

Changes to comply to https://github.com/coletivoEITA/circles/pull/2

Polishing: get files shared to circles in caldav

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-13 00:31:38 +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
5cc5107cba
Fix PHPUnit 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-12 18:41:37 +01:00
Morris Jobke
c8aad3db81
Fix PHPUnit 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-12 18:27:59 +01:00
Jan-Christoph Borchardt
9306caec3e
Add border around previews in grid view 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-03-12 10:44:51 +01:00
Morris Jobke
89ed84e8b6
Fix display of i in personal settings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-11 12:47:14 +01:00
Marius Blüm
ab488a49d0
Add hint to user documentation (Federation) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-11 12:47:14 +01:00
Morris Jobke
ec5f4200ad
Merge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-container-creation 
Avoid duplicate App container creation
 2019-03-08 10:31:10 +01:00
Morris Jobke
49c7799496
Merge pull request #14585 from nextcloud/ocm-mention-federation 
Mention Open Cloud Mesh in Federated User Settings
 2019-03-08 09:42:22 +01:00
Morris Jobke
3f8235da62
Merge pull request #14583 from nextcloud/remove-g+-federation 
Remove Google+ federation usersettings
 2019-03-08 09:04:01 +01:00
blizzz
3af7f2c2ea
Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filter 
resolve user and groups in nested groups first before filtering the results
 2019-03-07 22:31:51 +01:00
Marius Blüm
993e15b72c
Remove G+ CSS rule (Feedback from Joas) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 14:28:36 +01:00
Marius Blüm
6c2b80170e
Mention Open Cloud Mesh in Federated User Settings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 13:55:09 +01:00
Marius Blüm
bdad72dfa9
Remove G+ code from Federated Files Sharing-usersettings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 13:46:49 +01:00
Marius Blüm
500986f30e
Remove G+ icon from Federated Files Sharing-usersettings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 13:45:23 +01:00
Roeland Jago Douma
7ff1f8366a
Merge pull request #14579 from nextcloud/fix/bump_streams_files_external 
Have streams of files_external in sync
 2019-03-07 12:53:07 +01:00
Roeland Jago Douma
bb3c3539cc
Have streams of files_external in sync 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-07 12:15:32 +01:00
Morris Jobke
5c6a46314a
Fix transifex sync for files_sharing 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 15:02:07 +01:00
Morris Jobke
88f0697cb9
Update generated webpack files to .l10nignore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 14:27:11 +01:00
Morris Jobke
bdf95ef0ec
Merge pull request #14558 from nextcloud/fix/13790/fix-comment 
Fix unnecessary boolean cast
 2019-03-06 11:42:14 +01:00
Joas Schilling
e13253c66a
"Fix" the unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-06 11:06:03 +01:00
Morris Jobke
58f6a777b1
Merge pull request #14553 from nextcloud/fix/14125/clear_backupcode_reminder_when_no_2fa 
Clear backupcode reminder when no 2fa
 2019-03-06 10:16:58 +01:00
Morris Jobke
4b49e2eb52
Fix unnecessary boolean cast 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 10:12:58 +01:00
Morris Jobke
fde4c54136
Merge pull request #13790 from fretn/master 
Fix for crashing occ files:scan
 2019-03-06 10:12:14 +01:00
Arthur Schiwon
e36cede994
remove unused use statement 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-03-06 00:34:29 +01:00