Jenkins for ownCloud
c9df98abae
[tx-robot] updated from transifex
2014-05-14 01:55:31 -04:00
Thomas Müller
408189b7e4
Merge pull request #8556 from owncloud/kill-legacy-code-master
...
Kill legacy code master
2014-05-12 20:55:24 +02:00
Lukas Reschke
aea44ee0d5
Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
...
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
Lukas Reschke
cd7fc5cb80
Use array as type
2014-05-12 19:31:21 +02:00
Thomas Müller
33987eea83
remove legacy aka deprecated code: OC_Cache
2014-05-12 16:23:33 +02:00
Jenkins for ownCloud
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
Lukas Reschke
2ae1be762c
That's bool and not always true
2014-05-11 16:29:59 +02:00
Lukas Reschke
57640742af
Use WizardResult|false instead of mixed
2014-05-11 16:28:50 +02:00
Lukas Reschke
416f8b186d
Use @return instead of @returns
2014-05-11 16:27:18 +02:00
Lukas Reschke
cd3ed01483
Fix Typo
...
I guess that should be `default` and not `defautl`, wondering how this ever worked.
2014-05-11 15:24:42 +02:00
Lukas Reschke
fc8be5abc3
Use proper PHPDoc and variable names in the LDAP lib
...
My IDE was so sad about this that it marked the whole file in red and yellow and forced me to fix this.
2014-05-11 15:17:27 +02:00
Jenkins for ownCloud
05ea8c8a10
[tx-robot] updated from transifex
2014-05-10 01:55:50 -04:00
Jenkins for ownCloud
9919ec48df
[tx-robot] updated from transifex
2014-05-09 01:55:42 -04:00
Jenkins for ownCloud
4da6645a94
[tx-robot] updated from transifex
2014-05-08 01:55:39 -04:00
Jenkins for ownCloud
283b483100
[tx-robot] updated from transifex
2014-05-07 01:55:48 -04:00
Vincent Petry
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
Jenkins for ownCloud
9385b97b5f
[tx-robot] updated from transifex
2014-05-04 01:56:15 -04:00
Jenkins for ownCloud
cf20de185c
[tx-robot] updated from transifex
2014-05-03 01:56:11 -04:00
Jenkins for ownCloud
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
Jenkins for ownCloud
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
Jenkins for ownCloud
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
Arthur Schiwon
45e42c25de
Group Database backend must not gather user details itself but ask user
...
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Jenkins for ownCloud
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
Jenkins for ownCloud
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
Jenkins for ownCloud
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
blizzz
645ecb7644
Merge pull request #6297 from leo-b/fix_ldap_errors
...
only check ldap_errno if an ldap_* function actually fails
2014-04-23 16:26:43 +02:00
blizzz
97f21712cd
Merge pull request #8164 from owncloud/fix-6651
...
LDAP: fix random resets of filter
2014-04-23 11:09:35 +02:00
Thomas Müller
e0cac32442
fixing some JSHint warnings
2014-04-23 10:08:14 +02:00
Jenkins for ownCloud
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04:00
Arthur Schiwon
c1c2f2c49e
add additional comments, PHPdoc and check whether it's really applicable
2014-04-22 18:36:43 +02:00
Arthur Schiwon
1c71d5c444
LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example
2014-04-22 18:36:37 +02:00
Jenkins for ownCloud
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
blizzz
36c8dec10a
Merge pull request #8220 from owncloud/type-hinting-ldap
...
Fix PHPdoc in user_ldap
2014-04-17 18:15:40 +02:00
Robin McCorkell
13b463cc17
Merge pull request #8189 from Xenopathic/misc_fixes
...
Various fixes
2014-04-17 11:56:51 +01:00
Bart Visscher
81751cb616
Add missing param hint
2014-04-16 17:54:10 +02:00
blizzz
f6551d214f
Merge pull request #7815 from owncloud/ldap_fix_usercount_master
...
correct LDAP user count on setup with many users (occ user:report)
2014-04-16 10:36:19 +02:00
Jenkins for ownCloud
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
Bart Visscher
bad41c05b8
Fix PHPdoc in user_ldap
...
using scrutinizer patch
2014-04-15 21:05:49 +02:00
Lukas Reschke
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
Jenkins for ownCloud
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
Robin McCorkell
8bb003868c
Fix user_ldap default setting value
2014-04-13 16:49:23 +01:00
Jenkins for ownCloud
982d2bcc5b
[tx-robot] updated from transifex
2014-04-13 01:55:12 -04:00
Jenkins for ownCloud
329b8f3e99
[tx-robot] updated from transifex
2014-04-12 01:56:11 -04:00
Volkan Gezer
d67cba973e
Typo fix.
2014-04-11 15:23:43 +02:00
Arthur Schiwon
1c57ffa16f
Give hint when composing filter failed
2014-04-11 14:08:12 +02:00
Arthur Schiwon
e28227ecdc
fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh
2014-04-11 13:56:06 +02:00
Arthur Schiwon
6f1e9f8920
Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651
2014-04-11 13:48:45 +02:00
Jenkins for ownCloud
36107e1bad
[tx-robot] updated from transifex
2014-04-11 01:55:15 -04:00
Jenkins for ownCloud
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
blizzz
9feebeaf40
Merge pull request #7837 from owncloud/fix_7530
...
LDAP: fix determining objectclasses takes long
2014-04-09 12:27:17 +02:00