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

1703 commits

Author SHA1 Message Date
Jenkins for ownCloud
96d70aa270 [tx-robot] updated from transifex 2016-03-10 01:55:35 -05:00
Jenkins for ownCloud
afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Thomas Müller
0487b541a0 Merge pull request #22880 from owncloud/fix-21656 
improve log output when no LDAP user was found on login attempt
 2016-03-07 17:12:01 +01:00
Jenkins for ownCloud
c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Thomas Müller
6dcf70f244 Merge pull request #22807 from owncloud/remove-empty-translations 
ne, or_IN, uz and yo have been removed from transifex and will be rem…
 2016-03-06 19:59:57 +01:00
Jenkins for ownCloud
a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
Arthur Schiwon
5d3183afcd improve log output when no LDAP user was found on login attempt 2016-03-05 00:18:34 +01:00
Jenkins for ownCloud
bcc200cf9b [tx-robot] updated from transifex 2016-03-04 01:55:53 -05:00
Thomas Müller
4f25f34178 Merge pull request #22778 from owncloud/fix-22770 
untangle different user manager instances, fixes #22770
 2016-03-03 11:55:10 +01:00
Thomas Müller
8cacfce83d ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well 2016-03-03 11:29:57 +01:00
Jenkins for ownCloud
8b76e8c57b [tx-robot] updated from transifex 2016-03-03 01:56:04 -05:00
Arthur Schiwon
82b55c4db9 untangle different user manager instances, fixes #22770 2016-03-02 13:02:43 +01:00
Joas Schilling
8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Jenkins for ownCloud
702c1a8962 [tx-robot] updated from transifex 2016-03-02 01:56:33 -05:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
Jenkins for ownCloud
5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Thomas Müller
dfaebc36d2 Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname 
take the first result of that array, if present. Fixes 2nd display na…
 2016-02-25 14:35:06 +01:00
Jenkins for ownCloud
32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00
Arthur Schiwon
b9b85e32be take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled. 2016-02-24 21:32:03 +01:00
Jenkins for ownCloud
fe29feae9a [tx-robot] updated from transifex 2016-02-17 01:56:11 -05:00
Thomas Müller
fd21bfd9e8 Merge pull request #22358 from owncloud/fix-22278 
Fix race condition when switching filter mode. Fixes #22278
 2016-02-15 12:02:35 +01:00
Jenkins for ownCloud
be34cea970 [tx-robot] updated from transifex 2016-02-15 01:55:28 -05:00
Jenkins for ownCloud
2344c8e07d [tx-robot] updated from transifex 2016-02-13 01:55:39 -05:00
Arthur Schiwon
62aac81c45 Fix race condition when switching filter mode. Fixes #22278 2016-02-12 21:51:06 +01:00
Jenkins for ownCloud
f8607ac132 [tx-robot] updated from transifex 2016-02-12 01:56:04 -05:00
Jenkins for ownCloud
5165998723 [tx-robot] updated from transifex 2016-02-11 01:55:35 -05:00
Jenkins for ownCloud
9ebcc4ce31 [tx-robot] updated from transifex 2016-02-10 01:56:05 -05:00
Arthur Schiwon
d19c47a381 More fixed tests :) 2016-02-09 18:11:30 +01:00
Arthur Schiwon
3a796d1e15 Consolidate getQuota and setQuota methods in User instance 2016-02-09 17:16:43 +01:00
Jenkins for ownCloud
e749a02e6b [tx-robot] updated from transifex 2016-02-09 01:55:36 -05:00
Jenkins for ownCloud
4130639a7e [tx-robot] updated from transifex 2016-02-08 01:54:46 -05:00
Jenkins for ownCloud
feb0522cd0 [tx-robot] updated from transifex 2016-02-07 01:55:33 -05:00
Thomas Müller
69a4cd2898 Merge pull request #22102 from owncloud/ldap_2nddispname-master 
[LDAP] add second field for additional/optional display name attribute
 2016-02-06 13:27:01 +01:00
Jenkins for ownCloud
9fa09b67e6 [tx-robot] updated from transifex 2016-02-06 01:55:36 -05:00
Arthur Schiwon
e370b601db fix unit tests 2016-02-03 22:45:33 +01:00
alexweirig
cd19b648c6 change error logging 
replaced variable with print_r call
 2016-02-03 21:50:27 +01:00
alexweirig
f4d4bed10b Fixed undefined variable $dnGroup and variable name 
I renamed $memberURL into $dynamicGroup and print that variable in the writeLog.

I think this makes more sense.
 2016-02-03 21:50:27 +01:00
alexweirig
39aac2c66b Refactored code to avoid performance problem 
Moved the dynamic group processing to the top and removed condition in memberOf processing.

Also, changed variable name $value to $memberUrl
 2016-02-03 21:50:27 +01:00
Alex Weirig
0d797637f3 code changes for user_ldap Dynamic Group Membership 
Added new setting of “Dynamic Group Member URL”
(ldapDynamicGroupMemberURL) - see LDAP settings advanced tab.

Added public function getDynamicGroupMembers.

Updated function _groupMembers.

Updated function getUserGroups.
 2016-02-03 21:50:27 +01:00
Arthur Schiwon
c1871f5787 Port of test_ldap_2nddispname to master 2016-02-03 13:55:39 +01:00
Jenkins for ownCloud
92a1d1c0e3 [tx-robot] updated from transifex 2016-02-03 01:55:26 -05:00
Jenkins for ownCloud
9861a7f6cc [tx-robot] updated from transifex 2016-02-02 01:55:41 -05:00
Thomas Müller
21e9c6d1d0 Merge pull request #21999 from owncloud/properly-decode-cached-objects 
[user_ldap] properly decode cached objects
 2016-02-01 08:59:55 +01:00
Jenkins for ownCloud
3ada5c02a6 [tx-robot] updated from transifex 2016-02-01 01:54:40 -05:00
Morris Jobke
e4ad4c7e98 [user_ldap] properly decode cached objects 
* fixes #21896
 2016-01-29 07:51:16 +01:00
Jenkins for ownCloud
ecf2d178b1 [tx-robot] updated from transifex 2016-01-26 01:56:06 -05:00
Jenkins for ownCloud
f92119e02f [tx-robot] updated from transifex 2016-01-23 01:55:35 -05:00
Jenkins for ownCloud
50b303f3ad [tx-robot] updated from transifex 2016-01-21 01:55:20 -05:00