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

1007 commits

Author SHA1 Message Date
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
Arthur Schiwon
bd881348e8 Fix wildcard handling and check even less DNs per filter, enough will be looked at anyway 2014-03-20 22:57:50 +01:00
Robin McCorkell
7c3da27bf6 Fix duplicate ipauniqueid 2014-03-20 20:38:06 +00:00
Arthur Schiwon
057c2638e4 LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530 2014-03-20 13:58:08 +01:00
Jenkins for ownCloud
3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Robin McCorkell
ca595611f5 Add FreeIPA UUID compatibility, fixes #7796 
Ability to use ipauniqueid for the UUID of a user
 2014-03-19 20:30:24 +00:00
Jenkins for ownCloud
7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Jenkins for ownCloud
b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Jenkins for ownCloud
4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
ben-denham
8a8a32cf43 Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation. 2014-03-14 09:17:39 +13:00
Alexander Bergolth
c76d952dac make getGroupsChunk() protected instead of private 2014-03-13 10:57:19 +01:00
Alexander Bergolth
7f8b04d3e0 adapt coding style 2014-03-13 09:33:07 +01:00
Jenkins for ownCloud
1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Jenkins for ownCloud
8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Jenkins for ownCloud
b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
ben-denham
ef65381a0b Moved LdapFilter into a separate js file in user_ldap. 2014-03-07 10:10:42 +13:00
ben-denham
43e79f41f3 Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition. 2014-03-07 09:17:41 +13:00
Alexander Bergolth
f850fcfac5 "reset" ldap pagedSearch control by setting it to a high value 2014-03-06 12:23:20 +01:00
root
6585bd5a50 "reset" ldap pagedSearch control by setting it to a high value 
call nextEntry via invokeLDAPMethod
 2014-03-06 12:07:03 +01:00
root
8fcc29ee8b only check ldap_errno if an ldap_* function actually fails 
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
  (avoids json_encode(): Invalid UTF-8 sequence in argument errors)
 2014-03-06 12:07:03 +01:00
root
84550fbfb4 fix another oversight... sigh.. 2014-03-05 10:42:35 +01:00
root
4645d0a93a getGroups(): fix overall max search limit for paged searches 2014-03-04 21:12:47 +01:00
root
eb1e361824 getGroups() $limit was not handled correctly 2014-03-04 21:07:27 +01:00
root
eb59e63c3b revert updateGroups job to use getGroups() instead of getAllGroups() 2014-03-04 19:47:49 +01:00
root
039f7b054a merge functionality of getAllGroups into getGroups 2014-03-04 18:02:27 +01:00
root
15ef3145f8 Merge branch 'ldap_paging_chunksize' into ldap_get_all_groups 2014-03-04 17:24:46 +01:00
root
a5813acb64 add ldap_paging_size config option 2014-03-04 17:23:04 +01:00
root
bacda81bf7 use getAllGroup() in the updateGroups background job 
needed in active directory deployments with > 1000 groups
 2014-03-04 14:17:22 +01:00
root
a135f1ebbb add getAllGroups() that uses a paged search if available 
this circumvents server side search limits
(active directory has a limit of 1000 by default)
 2014-03-04 14:17:22 +01:00
Vincent Petry
fd5dec0298 Fixed configkey casing for PostgreSQL 2014-03-03 16:15:23 +01:00
Arthur Schiwon
b968eed27b remove remaining testing artefact 2014-03-03 10:20:37 +01:00
Arthur Schiwon
c7751c0795 intendetion. where did the whitespaces come from? 2014-03-03 10:20:31 +01:00
Arthur Schiwon
a8883f4ed2 LDAP: let proxy for multiple server access methods from Access 2014-03-03 10:20:25 +01:00
VicDeo
ec9fe3f57f Merge pull request #6299 from leo-b/ldap_nested_groups 
Add LDAP nested groups
 2014-02-25 15:41:10 +02:00
root
300b1131b4 replace spaces with tabs 
use true instead of 1
 2014-02-21 17:09:36 +01:00
Thomas Müller
fe24aafe7d Merge pull request #7312 from owncloud/ldap_fix_add_test 
LDAP: fix and extend tests
 2014-02-21 00:42:43 +01:00
blizzz
984ea7b3ff Merge pull request #7205 from owncloud/fix_7153 
LDAP: prevent other configuration from being deleted when deleting the f...
 2014-02-20 16:22:43 +01:00
Arthur Schiwon
d5690a174e LDAP: fix and extend tests 2014-02-20 14:05:45 +01:00
Arthur Schiwon
c0328b4f0f LDAP: improve compilation of filters 2014-02-19 13:13:01 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1 Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
 2014-02-19 09:31:54 +01:00
Thomas Müller
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +01:00
Arthur Schiwon
54f9db403f LDAP: improve wizard strings, fixes #5567 2014-02-17 17:19:48 +01:00
Thomas Müller
9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/appconfig.php
 2014-02-14 23:03:27 +01:00
Arthur Schiwon
d88c6778ff LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons 2014-02-14 15:34:22 +01:00
root
d10f6e94dc fix coding style to blizzz happy.. ;-) 2014-02-12 16:56:17 +01:00
Arthur Schiwon
14d1abf63f LDAP: improve debug message 2014-02-10 14:45:37 +01:00
Arthur Schiwon
18e1a10e96 LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image 2014-02-10 14:45:31 +01:00
Arthur Schiwon
299d37154b LDAP: add documentation info in info.xml 2014-02-10 12:59:11 +01:00
Arthur Schiwon
e156f85bfb Rephrase and clarify log message 2014-02-10 11:29:08 +01:00
Arthur Schiwon
a76840d206 Wizard: enable base DN for editing, if not base DN could have been detected. Also part of fix for #6670 2014-02-10 11:29:02 +01:00
Arthur Schiwon
e825a008c9 Wizard: disable LDAP referrals, fixes #6670 2014-02-10 11:28:55 +01:00
Arthur Schiwon
a908bd5695 throw an info message, when base dn test failed 2014-02-10 11:28:46 +01:00
Arthur Schiwon
bc17b40650 LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard 2014-02-10 11:28:38 +01:00
Joas Schilling
b330d07b51 Fix more documentation failes 
Issue #7111
 2014-02-08 11:47:55 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
icewind1991
a27529709b Merge pull request #6647 from owncloud/memcache-public 
Add Memcache to the public api
 2014-02-04 05:38:53 -08:00
Jan-Christoph Borchardt
46745895ae Merge pull request #5153 from owncloud/core-em-to-px 
Cleans up Core apps for relative(em) to absolute(px) styles.
 2014-01-27 02:29:47 -08:00
raghunayyar
2a0e8329f9 Fixes settings.css and converts more styles. 2014-01-26 03:02:52 +05:30
Robin Appelman
02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Jörn Friedrich Dreyer
21832bc890 user workarount to compare CLOB column with CHAR value 2014-01-21 11:56:34 +01:00
raghunayyar
775e08e0ee Merge branch 'master' into core-em-to-px 
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
 2014-01-16 14:42:37 +05:30
Robin Appelman
729210daa0 Merge branch 'master' into memcache-public 
Conflicts:
	apps/user_ldap/lib/connection.php
 2014-01-15 13:02:15 +01:00
Arthur Schiwon
25fecb4f25 typo, grammar 2014-01-14 16:33:18 +01:00
Arthur Schiwon
097b6b8be9 LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page 2014-01-14 16:33:09 +01:00
Arthur Schiwon
bb6bad6b3c remove unused variables 2014-01-14 16:33:02 +01:00
Arthur Schiwon
e4b7c6ef10 LDAP: fix TLS detection 2014-01-14 16:32:55 +01:00
Thomas Müller
92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Robin Appelman
5d456c7cc2 Merge branch 'master' into memcache-public 2014-01-09 13:54:58 +01:00
Robin Appelman
d50c7391d8 Use $server->getMemCacheFactory() in ldap connection 2014-01-09 13:54:50 +01:00
blizzz
d8b8abb429 Merge pull request #6681 from owncloud/userreport 
add command line option to get user number statistics
 2014-01-08 10:41:39 -08:00
Arthur Schiwon
677d83d45f LDAP: add tests for countUsers 2014-01-08 12:24:29 +01:00
Arthur Schiwon
53498bc876 remove unnecessary line 2014-01-08 12:20:56 +01:00
Arthur Schiwon
b669e1a3c1 LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search. 2014-01-08 12:07:57 +01:00
Jenkins for ownCloud
d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Jenkins for ownCloud
0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Jenkins for ownCloud
e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud
760fa9ea30 [tx-robot] updated from transifex 2013-12-31 01:55:42 -05:00
Jenkins for ownCloud
9ea9638490 [tx-robot] updated from transifex 2013-12-30 01:55:38 -05:00
Jenkins for ownCloud
e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud
71c829f92a [tx-robot] updated from transifex 2013-12-28 01:55:35 -05:00
Jenkins for ownCloud
f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Jenkins for ownCloud
6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Jenkins for ownCloud
a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Jenkins for ownCloud
77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Arthur Schiwon
1292793c4b LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng 2013-12-13 16:29:42 +01:00
Arthur Schiwon
5ba9344b0e LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283 2013-12-12 14:15:39 +01:00
Jenkins for ownCloud
7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
root
2b127a6ac5 fix indentation 
use identity test where appropriate
use camelcase variable names
_getGroupsByMember is a private function
 2013-12-11 10:43:48 +01:00
root
a18cff4479 remove debug output 2013-12-10 19:02:01 +01:00
root
e1d80b3356 Merge remote branch 'upstream/master' into ldap_nested_groups 2013-12-10 18:57:04 +01:00
root
4fb16804d6 move nested group checkbox to directory settings 2013-12-10 18:47:59 +01:00
Jenkins for ownCloud
6aab1ebf44 [tx-robot] updated from transifex 2013-12-09 06:40:22 -05:00
root
86809be638 combineFilterWithAnd recently moved to Access 2013-12-08 15:49:25 +01:00
Jenkins for ownCloud
079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
blizzz
b5939324b0 Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode 
correctly propagate the return value of ldap_set_option
 2013-12-06 08:54:29 -08:00
root
48e426b589 add support for nested groups 2013-12-06 16:46:52 +01:00
root
54e47b4180 correctly propagate the return value of ldap_set_option 
otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn
active directory paging will stop working
(Operations error on ldap_control_paged_result_response)
 2013-12-06 12:04:17 +01:00
Jenkins for ownCloud
7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
Arthur Schiwon
3480766a78 LDAP Wizard: don't generate filter when not allowed 2013-12-04 18:59:30 +01:00
Arthur Schiwon
60b1191c88 some equals are more equal than other equals 2013-12-04 18:59:12 +01:00
Arthur Schiwon
01af3bdb05 LDAP Wizard: return correct var 2013-12-04 18:58:52 +01:00
Arthur Schiwon
06577f1fe2 LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions. 2013-12-04 18:58:29 +01:00
Arthur Schiwon
cc725674e0 LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly 2013-12-04 18:58:09 +01:00
Arthur Schiwon
a10d1977b5 LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work 2013-12-04 18:57:54 +01:00
Arthur Schiwon
9808dee149 LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner 2013-12-04 18:57:32 +01:00
Arthur Schiwon
430f85cc59 LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page 2013-12-04 17:57:47 +01:00