Volkan Gezer
f880734827
make user_ldap fully translatable
2014-05-25 14:41:59 +02:00
Jenkins for ownCloud
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
Jenkins for ownCloud
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
Jenkins for ownCloud
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Andreas Fischer
6c4b650524
Merge pull request #8585 from owncloud/phpdoc-improvements-apps
...
PHPDoc improvements /apps
* owncloud/phpdoc-improvements-apps:
Fix whitespace issues
Reduce double-space with single-space.
Remove spaces around | operator in doc block.
Fix more missing or broken PHPDoc
PHPDoc fixes for user_ldap
Fix PHPDoc in /apps
2014-05-19 14:08:42 +02:00
Jenkins for ownCloud
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
Jenkins for ownCloud
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
Robin McCorkell
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
Andreas Fischer
5b1ffd7611
Reduce double-space with single-space.
2014-05-16 22:21:57 +01:00
Andreas Fischer
e04d956cac
Remove spaces around | operator in doc block.
2014-05-16 22:21:57 +01:00
Robin McCorkell
a17f9111a0
PHPDoc fixes for user_ldap
2014-05-16 22:21:57 +01:00
Robin McCorkell
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
Jenkins for ownCloud
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
Jenkins for ownCloud
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
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
Arthur Schiwon
dbebf6bb5e
add comment to clearify when a skip in the foreach happens
2014-04-09 12:25:48 +02:00
Arthur Schiwon
ee3368d2ad
replace hardcoded limit of 400 with user controlled ldapPagingSize value
2014-04-09 11:38:51 +02:00
Arthur Schiwon
2e5adadad7
Put inner loop into own method, let's see whether it makes scrutinizer happier
2014-04-09 11:31:56 +02:00
Arthur Schiwon
bdc418d1f9
var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop
2014-04-09 11:31:56 +02:00
Arthur Schiwon
43402c56dd
initialize variable
2014-04-09 11:31:56 +02:00
Arthur Schiwon
40f9875f11
LDAP: fix user report i.e. count for LDAP servers with really many users
2014-04-09 11:31:56 +02:00
Arthur Schiwon
8bb27551bd
LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0
2014-04-09 11:31:56 +02:00
Jenkins for ownCloud
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
Arthur Schiwon
2407321625
add tests for LDAP
2014-04-08 12:57:06 +02:00
Arthur Schiwon
142fc5f3af
fix return value when a search string was passed to return integer instead of array
2014-04-08 12:53:59 +02:00
Arthur Schiwon
96cb75f5cf
implement countUsersInGroup in LDAP group backend
2014-04-08 12:04:38 +02:00
Jenkins for ownCloud
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
blizzz
3c9f588449
Merge pull request #6221 from leo-b/ldap_get_all_groups
...
fix updateGroups background job for ldap servers with > 1000 groups
2014-04-07 13:00:32 +02:00
Jenkins for ownCloud
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
Jenkins for ownCloud
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
Vincent Petry
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Jenkins for ownCloud
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
Jan-Christoph Borchardt
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
Jenkins for ownCloud
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
Alexander Bergolth
b158939283
adapt description of paging size configuration
2014-03-28 14:20:01 +01:00
Alexander Bergolth
0d9d70b51c
change default ldap paging size to 500
2014-03-28 14:02:19 +01:00
Jan-Christoph Borchardt
25326b89da
replace personalblock fieldset with section class in core user_ apps
2014-03-27 17:00:47 +01:00
Robin McCorkell
50dba97bde
Miscellaneous text fixes for core apps
2014-03-26 15:43:03 +00:00
Jenkins for ownCloud
75d8de378c
[tx-robot] updated from transifex
2014-03-26 01:56:21 -04:00
Jenkins for ownCloud
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
Arthur Schiwon
422ccf4cdb
add test for cloning and keeping configuration seperate
2014-03-21 15:31:30 +01:00
Arthur Schiwon
86d479cb28
Use array_key_exists instead of isset, because the latter returns false if the assigned value is null
2014-03-21 15:29:49 +01:00
Arthur Schiwon
055a09e487
On clone create a new instance of the Configuration
...
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
2014-03-21 15:27:51 +01:00
blizzz
3f95f9325f
Merge pull request #7823 from owncloud/fix_7796
...
Add FreeIPA UUID compatibility, fixes #7796
2014-03-21 11:27:18 +01:00
Arthur Schiwon
4230983e69
define var
2014-03-21 10:10:49 +01:00
Arthur Schiwon
6f605ecd67
make tests work on systems without php5_ldap
2014-03-21 10:08:17 +01:00
Jenkins for ownCloud
bcf388d3c5
[tx-robot] updated from transifex
2014-03-21 01:55:35 -04:00
Arthur Schiwon
3d2ab76347
add tests for cumulativeSearchOnAttribute
2014-03-21 00:17:51 +01:00
Arthur Schiwon
a085d7715f
fix potential infinite loop when the DN of the first entry was already read.
2014-03-20 22:59:41 +01:00
Arthur Schiwon
561d699ca6
Use the LDAP wrapper for checking resources, needs for proper testing
2014-03-20 22:58:57 +01:00