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

48850 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
1aad0100b5
Merge pull request #14529 from nextcloud/regression/13491/fix-missing-dependency 
Fix missing $config dependency in RetryJob
 2019-03-05 11:01:39 +01:00
Morris Jobke
1a92142051
Merge pull request #14528 from nextcloud/bugfix/noid/fix-database-configuration 
Fix database configuration
 2019-03-05 11:00:38 +01:00
Morris Jobke
d3d885f9fd
Dump autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-05 10:40:02 +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
Joas Schilling
c32c91d1da
Fix whitespaces 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-05 09:31:45 +01:00
Joas Schilling
e18cc22ed9
Fix database configuration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-05 09:28:36 +01:00
Morris Jobke
c72b442203
Merge pull request #14501 from nextcloud/version/noid/16.0.0-alpha-1 
16.0.0 Alpha 1
 2019-03-04 22:23:55 +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
Morris Jobke
3b155c8f14
Merge pull request #14510 from nextcloud/smb-3.1.1 
update icewind/smb to 3.1.1
 2019-03-04 17:17:19 +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
Roeland Jago Douma
1153123b90
Use a tmp file for swift writes 
Else this leads to a seekable stream error with chunked uploads

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-04 13:11:59 +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
bd916cc6b2
Add activities for group membership changes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-04 12:46:59 +01:00
Morris Jobke
51202c9768
16.0.0 Alpha 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-04 12:45:49 +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
Morris Jobke
814bf0de20
Merge pull request #14493 from nextcloud/tech-debt/noid/remove-php5-config 
Remove unused php5 config from .htaccess
 2019-03-04 12:07:40 +01:00
Maxence Lange
adfadf821b fixing phpdoc 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-03-04 09:54:45 -01:00
Maxence Lange
3bdc78e981 fixing INDEX_DONE 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-03-04 09:54:45 -01:00
Maxence Lange
4ac0375f89 cleaning the excerpts managment 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-03-04 09:54:45 -01:00
Maxence Lange
83d70d9008 cleaning 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-03-04 09:54:45 -01:00
Maxence Lange
a644ad5793 moving final class to private, new interface in public 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-03-04 09:54:45 -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
Morris Jobke
92b5743bf4
Remove unused php5 config from .htaccess 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-04 11:24:10 +01:00
Morris Jobke
358c9e649b
Merge pull request #14494 from nextcloud/tests/noid/make-header.feature-more-robust 
Make header.feature more robust by running it on apache
 2019-03-04 11:08:13 +01:00
Morris Jobke
4b2efd94f9
Make header.feature more robust by running it on apache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-04 10:22:16 +01:00
Morris Jobke
b41ae8c98a
Merge pull request #14484 from nextcloud/fix/users-and-groups/vue-multiselect 
Fix/users and groups/vue multiselect
 2019-03-04 10:19:57 +01:00
Roeland Jago Douma
aa69b9d67d
Merge pull request #14465 from nextcloud/dependabot/npm_and_yarn/vue-multiselect-2.1.4 
Bump vue-multiselect from 2.1.3 to 2.1.4
 2019-03-04 10:00:22 +01:00
dependabot[bot]
fc64871c7d
Bump vue-multiselect from 2.1.3 to 2.1.4 
Bumps [vue-multiselect](https://github.com/shentao/vue-multiselect) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/shentao/vue-multiselect/releases)
- [Commits](https://github.com/shentao/vue-multiselect/compare/v2.1.3...2.1.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-04 09:27:06 +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
Roeland Jago Douma
35d5d57839
Merge pull request #14468 from nextcloud/fix/inline-input-confirm-button 
Fix default input element height
 2019-03-04 08:49:41 +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
Morris Jobke
c706009ced
Merge pull request #14488 from nextcloud/fix/dav/has-photo 
Fix dav has-photo plugin extend
 2019-03-03 23:23:16 +01:00
Morris Jobke
3b9ced22dc
Merge pull request #14489 from nextcloud/fix/accessibility/l10n 
Add accessibility translations
 2019-03-03 23:22:06 +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)
a3447ed49a
Add accessibility translations 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-03 19:49:44 +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