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

20315 commits

Author SHA1 Message Date
Roeland Jago Douma
fb5eebd33b
Merge pull request #14892 from nextcloud/bugfix/noid/collections 
Bugfix/noid/collections
 2019-03-29 10:25:59 +01:00
Nextcloud bot
f7267468c0
[tx-robot] updated from transifex 2019-03-29 01:12:48 +00:00
Julius Härtl
15a29003b3
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-28 16:05:38 +01:00
Julius Härtl
635df15ff2
Move translations to core 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-28 15:47:19 +01:00
Julius Härtl
3860373fd4
Fix various theming issues on bright colors 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-28 08:02:46 +01:00
Nextcloud bot
5ae9eda314
[tx-robot] updated from transifex 2019-03-28 01:13:21 +00:00
Christoph Wurst
0d825c3f81
Merge pull request #14883 from nextcloud/bugfix/14156/checkboxes-light-theme 
Fix light theme form elements
 2019-03-27 20:02:09 +01:00
Roeland Jago Douma
87fbaf501a
Merge pull request #14829 from nextcloud/backupcodes-theme-name 
Use name from theme when downloading/printing twofactor backup codes.
 2019-03-27 19:59:09 +01:00
Christoph Wurst
839cdd9b8c
Merge pull request #14886 from nextcloud/bugfix/13028/open-folder-share-list 
Fix opening folders from different file lists
 2019-03-27 18:48:04 +01:00
Julius Härtl
798b2e87b9
Fix light primary button styling 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-27 18:42:06 +01:00
Julius Härtl
6b2a212c69
Fix opening folders from different file lists 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-27 17:44:54 +01:00
Julius Härtl
181fce8ba4
Merge pull request #14878 from nextcloud/bugfix/noid/name-all-indexes 
Make sure all tables have named indexes
 2019-03-27 16:55:51 +01:00
Julius Härtl
f1f113c523
Fix checkbox styling with dark theme 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-27 16:03:56 +01:00
Julius Härtl
00b2afb222
Darken element color and add exception for primary buttons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-27 16:03:31 +01:00
Joas Schilling
592093079f
Deduplicate index names 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-27 13:32:59 +01:00
Joas Schilling
274658629d
Make sure all tables have named indexes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-27 13:32:59 +01:00
Julius Härtl
b11d6c94fe
Always show full previews 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-27 13:29:58 +01:00
Nextcloud bot
86594e8c18
[tx-robot] updated from transifex 2019-03-27 11:47:47 +00:00
Joachim Bauch
10aab0cdab
Use name from theme when downloading/printing twofactor backup codes. 
Signed-off-by: Joachim Bauch <bauch@struktur.de>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-03-26 16:46:44 +01:00
Nextcloud bot
a541443be7
[tx-robot] updated from transifex 2019-03-26 10:41:31 +00:00
Morris Jobke
787369c168
Exclude compiled assets of files_sharing for transifex 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-26 11:23:31 +01:00
Roeland Jago Douma
4785faed0b
Merge pull request #14809 from nextcloud/fix/accessibility-theme-keyboard 
Fix selecting an accessibility theme with the keyboard
 2019-03-25 09:05:55 +01:00
Christoph Wurst
6a5f081fc6
Fix selecting an accessibility theme with the keyboard 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-03-25 08:16:01 +01:00
Roeland Jago Douma
fad750b0b6
Allow string to be translated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-03-22 16:04:53 +01:00
Joachim Bauch
5a786136da
Use monospaced font when printing twofactor backup codes. 
This helps differentiating similar characters like "I" / "1".

Signed-off-by: Joachim Bauch <bauch@struktur.de>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-03-22 11:01:56 +01:00
Georg Ehrke
d74e49b3e6
implement principal property search for calendar user address set property 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-03-21 16:32:41 +01:00
Vinicius Cubas Brand
61572a5b2e
LDAP plugin: force createUser to return new user's DN 
LDAP plugins must change the createUser method to return the DN, as we
need this to update the cache.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2019-03-21 10:20:46 +01:00
Vinicius Cubas Brand
a2c38148e7
Cache cleaning when subadmin adds user to group 
This commit fix an error happening when the subadmin tries to create an
user, adding him/her to the group s/he is subadmin of, using a LDAP
User/Group plugin.

This just forces the cache to be reset after an user is added to a
group.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2019-03-21 10:20:46 +01:00
Vinicius Cubas Brand
c4dbc428f9
fix user creation using LDAP Plugin 
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2019-03-21 10:20:46 +01:00
Morris Jobke
651495e3ae
Merge pull request #14776 from nextcloud/fix/files/size-color 
Use max contrast variable to cap the generated colours
 2019-03-21 09:59:07 +01:00
John Molakvoæ (skjnldsv)
ec09f121af
Use max contrast variable to cap the generated colours 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:45:01 +01:00
John Molakvoæ (skjnldsv)
ff164db935
Add link icon for public link too 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:16:00 +01:00
John Molakvoæ (skjnldsv)
4c884f1b23
Put sharing entry all above 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:14:24 +01:00
John Molakvoæ (skjnldsv)
4ad922d4f6
Show sharing in menu in grid view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:14:16 +01:00
Nextcloud bot
6ea5beccd7
[tx-robot] updated from transifex 2019-03-21 01:13:49 +00:00
Roeland Jago Douma
03dc79f665
Merge pull request #14578 from nextcloud/enh/force_enable_apps 
Force enable apps
 2019-03-20 19:22:38 +01:00
Roeland Jago Douma
8b21c5e64d
Revert "Do not register unexisting section" 
This reverts commit 24354bde1d.
 2019-03-20 15:17:31 +01:00
Roeland Jago Douma
575b3f9ff8
Revert "Where is your data?" 2019-03-20 15:17:31 +01:00
Joas Schilling
942281a48e
Remove unused IUserSession 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-20 15:16:13 +01:00
Joas Schilling
2d00e2bbe7
Do not ignore the max-version for the "update-available" check 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-20 15:16:13 +01:00
Morris Jobke
69f18712ea
Merge pull request #14674 from CamilionEU/master 
[app:files] Use current directory for hashing.
 2019-03-20 11:20:41 +01:00
Nextcloud bot
21c726ae53
[tx-robot] updated from transifex 2019-03-20 01:12:47 +00:00
Roeland Jago Douma
2fcb6ddc22
Merge pull request #14664 from nextcloud/bugfix/noid/absolute-paths-of-images-for-linked-collaboration-resources 
Replace the icon-class with an absolute link to an image
 2019-03-19 19:23:29 +01:00
Julius Härtl
5de3a0feaa
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:13:51 +01:00
Julius Härtl
8a26022f92
Adjust resource type to file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:06:55 +01:00
Julius Härtl
e8fe00003b
Dispatch event to allow apps to load their script for collections 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:06:55 +01:00
Joas Schilling
3022ef687a
Use rich objects instead of name, link and icon 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-19 13:06:55 +01:00
Joas Schilling
403b673b93
Replace the icon-class with an absolute link to an image 
Otherwise the icon can not be displayed in mobile apps

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-19 13:06:55 +01:00
Joas Schilling
5eae69bd2d
Always register the Notifier 
... so background jobs without a user can prepare push notifications

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-19 08:54:05 +01:00
Morris Jobke
ff6f105ea6
Merge pull request #14571 from cowai/optimize-files_external-notify 
Use index to mark parent as outdated, fixes: #14537
 2019-03-19 07:25:41 +01:00
Nextcloud bot
785ccae622
[tx-robot] updated from transifex 2019-03-19 01:12:41 +00:00
Ari Selseng
11b3fbf612 Use two queries to mark parent as outdated 
Signed-off-by: Ari Selseng <ari@selseng.net>
 2019-03-18 18:24:57 +01:00
Roeland Jago Douma
219fb1a855
Fix showpassword loads 
This is bundled by default. So trying to load it throws a warning in the
logs.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-18 14:38:44 +01: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
6c856ac588
Merge pull request #14719 from nextcloud/fix/14639/fix_preview_size_trash 
Use higher preview resolution in trashbin
 2019-03-18 10:07:25 +01:00
Nextcloud bot
0930e3ecee
[tx-robot] updated from transifex 2019-03-18 01:12:27 +00:00
Nextcloud bot
4547e75078
[tx-robot] updated from transifex 2019-03-17 01:13:23 +00: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
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
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