Commit Graph

20189 Commits

Author SHA1 Message Date
Morris Jobke de8e02628e
Improve code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 23:01:47 +01:00
Evilham de648f6a3e [app:files] Use current directory for hashing.
This fixes collisions that were causing uploads to break in a very
terrible way.

Kudos to @kesselb for finding the problematic place and to
@hottwister for the proposed solution.

Fixes #10527.
2019-03-13 22:21:32 +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
Roeland Jago Douma 3d17ab0936
Do not send notification if no active 2fa
If the job is still present we should also not fire it off if there is
not a single active 2FA provider.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-05 20:21:37 +01:00
Roeland Jago Douma 1c29a01956
Clear backupcodes reminder if no 2FA is enabled
Fixes #14125

Listen to 2FA disable event. If a provider is disabled for a user. We
check if there are no more providers. If there are no more providers we
Remove the backupcode reminder notification (if still present).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-05 20:14:16 +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 789aaa489d
Fix whitespace
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 15:48:50 +01:00
Morris Jobke 8322cec951
Suppress phan exceptions because they are catched by a class_exists
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 15:46:56 +01:00
Julius Härtl add43bc19c
Check if password can be changed for the users backend in OCS api
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-05 13:44:25 +01:00
Arthur Schiwon 5dd2207c95
fix nested group retrieval also for 2 other cases
and also consolidate logic in one method

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-05 11:07:40 +01:00
Roland Tapken 459b8a4845
Fixed unit test: groupsMatchFilter will not be called multiple times anymore.
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-05 11:07:40 +01:00
Roland Tapken e7c506cff1
Reduce queries to LDAP by caching nested groups
Nested groups are now cached in a CappedMemoryCache object to reduce
queries to the LDAP backend.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-05 11:07:40 +01:00
Roland Tapken afb182650e
user_ldap: really resolve nested groups
The previous patch fixed the problem only for one level of indirection
because groupsMatchFilter() had been applied on each recursive call (and
thus there would be no second level if the first level fails the check).

This new implementation replaces the recursive call with a stack that
iterates all nested groups before filtering with groupsMatchFilter().

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-05 11:07:40 +01:00
Roland Tapken c2d8a36d9a
user_ldap: Filter groups after nexted groups
Currently groupsMatchFilter is called before nested groups are resolved.
This basicly breaks this feature since it is not possible to inherit
membership in a group from another group.

Minimal example:

  Group filter: (&(objectClass=group),(cn=nextcloud))
  Nested groups: enabled

  cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local
    objectClass: group

  cn=IT,ou=groups,dn=company,dn=local
    objectClass: group
    memberOf: cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local

  cn=John Doe,ou=users,dn=company,dn=local
    objectClass: person
    memberOf: cn=IT,ou=groups,dn=company,dn=local

Since 'cn=IT,ou=groups,dn=company,dn=local' doesn't match the group
filter, John wouldn't be a member of group 'nextcloud'.

This patch fixes this by filtering the groups after all nested groups
have been collected. If nested groups is disabled the result will be the
same as without this patch.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-05 11:07:35 +01:00
Morris Jobke a4585b35c0
Fix missing $config dependency in RetryJob
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 10:08:27 +01:00
Morris Jobke 679afa251b
Merge pull request #14519 from nextcloud/feature/config-undefined
Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$config
2019-03-05 10:06:09 +01:00
Morris Jobke ede5f4486a
Merge pull request #14470 from felixn/master
use node API for free space calculation in versions app
2019-03-05 09:40:11 +01:00
Roeland Jago Douma 243bc96ad9
Merge pull request #14480 from cowai/reconnect-db-notify
Reconnect to DB after timeout for Notify command. Fixes #14479
2019-03-04 21:36:12 +01:00
Roeland Jago Douma eb175584f6
Merge pull request #14514 from nextcloud/fix/no_debug_output
Do not just write foobar
2019-03-04 21:26:20 +01:00
Daniel Kesselberg 7406f42fdf
Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$config
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-04 19:12:46 +01:00
Morris Jobke 79ec7bbcf6
Merge pull request #13871 from PLUTEX/master
dav: Fix handling of chunked WebDAV upload
2019-03-04 17:43:31 +01:00
Morris Jobke 36b7fc7bef
Merge pull request #14499 from nextcloud/fix/svg-api/dark-mode
Do not cut full color on accessibility svg color invert
2019-03-04 17:39:24 +01:00
Roeland Jago Douma c8d1b29407
Do not just write foobar
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-04 17:14:32 +01:00
Robin Appelman 41f8bfbe93
update icewind/smb to 3.1.1
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-04 16:41:22 +01:00
Ari Selseng 1ac9a9a1bb Correct log attribute
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-04 15:02:15 +01:00
Roeland Jago Douma 138fdf0793
Merge pull request #13401 from nextcloud/improve-lookup-server-behaviour
improve lookup server behaviour
2019-03-04 14:25:24 +01:00
Ari Selseng 3218e0f70d Added logging to Notify command.
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-04 14:23:13 +01:00
Morris Jobke bbb168a8ba
Merge pull request #14430 from nextcloud/bugfix/13990/remove-upload-setting
Remove the upload and memory setting
2019-03-04 13:32:37 +01:00
Morris Jobke daee222534
Merge pull request #12978 from tobiasKaminsky/noteOnDav
Add note to dav endpoint
2019-03-04 12:58:09 +01:00
Joas Schilling c6a69ba925
Remove the upload and memory setting
* Remove unneeded private method phpFileSize()
* Bump autoloader
* Remove setUploadLimit tests
* Remove integrity check hacks for upload limit

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-04 12:14:22 +01:00
John Molakvoæ (skjnldsv) 3bb2c87648
Do not cut full color on accessibility svg color invert
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-04 11:24:23 +01:00
John Molakvoæ feefb0ca89
Merge pull request #14467 from nextcloud/dependabot/npm_and_yarn/vue-and-vue-template-compiler-2.6.8
Bump vue and vue-template-compiler
2019-03-04 09:17:57 +01:00
John Molakvoæ (skjnldsv) cf37899bca
Build
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-04 08:47:10 +01:00
Christoph Wurst aee348c5f5
Update apps/dav/lib/Connector/Sabre/Node.php
Co-Authored-By: tobiasKaminsky <tobias@nextcloud.com>
2019-03-04 08:24:14 +01:00
Georg Ehrke 12d3f246aa
use class_exists on correct class to please phan
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-03-04 00:36:52 +01:00
Georg Ehrke dc26d94014
properly catch exceptions of detailsCircle
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-03-03 23:07:07 +01:00
John Molakvoæ (skjnldsv) d6e9a2ea15
Fix dav has-photo plugin extend
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-03 19:06:22 +01:00
Ari Selseng 71a0cdceaa Reconnect to DB after timeout for Notify command. Fixes #14479
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-03 01:36:27 +01:00
Felix Nieuwenhuizen 56457505af set availableSpace to 0 if userFolder not found
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
2019-03-02 13:55:11 +01:00
Felix Nieuwenhuizen 0f43d1dfaa use node API for free space calculation in versions app (same method as trashbin app)
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
2019-03-02 13:44:47 +01:00
Roeland Jago Douma ba155a98db
Merge pull request #14448 from mzamot/master
Convert value of timestamp metadata key in swift files_external
2019-03-01 21:26:56 +01:00
Roeland Jago Douma 2398d1183e
Merge pull request #11871 from nextcloud/feature/11015/collaboration-resources
Collaboration resources
2019-03-01 21:22:34 +01:00
Vinicius Cubas Brand 58c92e6047 Get user's circles without touching session
This works with nextcloud/circles#260

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2019-03-01 17:04:43 -03:00
Julius Härtl ca0624d79c
Remove unneeded files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:59:38 +01:00
Julius Härtl 48f34b877a
Add bundled files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:59:37 +01:00
Joas Schilling 0c32b212ed
Fix files_external tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-01 20:57:01 +01:00
Julius Härtl f0e50bcb74
Fetch node and filename also if access cache was used
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:57:01 +01:00
Julius Härtl e5162fb9af
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:57:01 +01:00
Julius Härtl 6ee7286b41
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:57:01 +01:00
Julius Härtl 37e6488206
Use nextcloud-vue-collection 0.1.2
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:57:00 +01:00
Joas Schilling 55cd9eab03
Update autoloader
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-01 20:57:00 +01:00
Joas Schilling fdfe984adb
Register providers via class names
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-01 20:57:00 +01:00
Joas Schilling 01b4db62fb
Add dispatcher events to User and Group objects
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-01 20:56:59 +01:00
Joas Schilling 55ae7fa2a4
Invalidate the cache when a share is updated
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-01 20:56:59 +01:00
Joas Schilling 1a73cab3db
Fix doc block
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-01 20:56:59 +01:00
Julius Härtl 7207a777a1
Use nextcloud-vue-collections library
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:58 +01:00
Julius Härtl cab704f0cc
Merge webpack into main one
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:19 +01:00
Julius Härtl 103298ecd1
Use icon-close to remove resources
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:19 +01:00
Joas Schilling 59c92a7513
Further work on the access cache
Searching for all is still a problem

Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-01 20:56:19 +01:00
Julius Härtl 31340b8be9
Add icon for resource type and icons for folder/file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:18 +01:00
Julius Härtl d1a4856b5d
Add eslint settings and reorganize files
Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add files_sharing package-lock

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:18 +01:00
Julius Härtl 53ac9bdda1
Implement frontend for search/rename
Signed-off-by: Julius Härtl <jus@bitgrid.net>

Move to vuex

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:18 +01:00
Julius Härtl 3777df64ae
Add link to resource provider
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:18 +01:00
Julius Härtl 506eb885bc
Only call resource provider if type matches
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:17 +01:00
Julius Härtl d85e3e3a6d
Allow apps to register resource providers
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:17 +01:00
Julius Härtl 88aa3de784
Add iconClass to resources
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:17 +01:00
Julius Härtl 51057c539f
Use proper public javascript methods
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:17 +01:00
Julius Härtl 322f7c3c85
Add vue app for collaboration resources
Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add js api for resources

Signed-off-by: Julius Härtl <jus@bitgrid.net>

More frontend work

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:16 +01:00
Julius Härtl d6aae4317d
Move files_sharing to webpack
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 20:56:16 +01:00