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
a18cff4479
remove debug output
2013-12-10 19:02:01 +01:00
e1d80b3356
Merge remote branch 'upstream/master' into ldap_nested_groups
2013-12-10 18:57:04 +01:00
4fb16804d6
move nested group checkbox to directory settings
2013-12-10 18:47:59 +01:00
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
86809be638
combineFilterWithAnd recently moved to Access
2013-12-08 15:49:25 +01:00
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
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
48e426b589
add support for nested groups
2013-12-06 16:46:52 +01:00
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
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
3480766a78
LDAP Wizard: don't generate filter when not allowed
2013-12-04 18:59:30 +01:00
60b1191c88
some equals are more equal than other equals
2013-12-04 18:59:12 +01:00
01af3bdb05
LDAP Wizard: return correct var
2013-12-04 18:58:52 +01:00
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
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
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
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
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
1c6568cf68
LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143
2013-12-04 17:57:40 +01:00
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
4a78f12682
[tx-robot] updated from transifex
2013-11-27 12:10:54 -05:00
34704eded6
Merge pull request #5955 from owncloud/fix5863
...
LDAP Wizard: Add raw login filter to corresponding tab for consistency, fix behaviour on raw filter input
2013-11-27 00:30:15 -08:00
4f15282bc9
Merge pull request #6058 from owncloud/ldap2avatar
...
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
69518b9013
Make sure Avatar is set from LDAP upon first login, not later, but also not before due to missing user folder
2013-11-26 12:57:39 +01:00
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
03375d6c52
LDAP: username2dn should only return DNs that belong to the current LDAP server. Might be not perfect. Easy perfect solution would increase communication with LDAP server. Let's see if it is good enough
2013-11-25 22:08:11 +01:00
3955388f20
LDAP: proxy: configurable return to determine when to try the next LDAP server and when to return (multi server setup)
2013-11-25 22:05:00 +01:00
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
d9347f2c9b
LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh?
2013-11-22 23:58:30 +01:00
6fdce3b7e9
LDAP: user proxy must support canChangeAvatar too
2013-11-22 13:25:20 +01:00
54f0deff2a
LDAP: get user photo from LDAP and set it as avatar if available
2013-11-22 13:25:20 +01:00
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
dd5e1092c7
LDAP Wizard: add objectclass for group detection in Zimbra
2013-11-21 11:20:31 +01:00
ce1318c9f1
LDAP Wizard: clear the cache on save so changes have immediate effect
2013-11-20 15:56:25 +01:00
ff9ecc8a51
LDAP Wizard: proper behaviour for raw filter input. remember the editing mode and compose filter only when desired.
2013-11-19 23:58:08 +01:00
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
cb968c77d1
Merge pull request #5772 from owncloud/fix5741
...
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-15 08:52:41 -08:00
1e863cd959
Merge pull request #5700 from owncloud/ldapWizSetDisplayNames
...
LDAP Wizard: do not forget to set display name attributes for user and g...
2013-11-15 01:12:54 -08:00
98c9334175
LDAP Wizard: move raw login filter field from advanced tab to login filter tab for consistency
2013-11-14 18:29:18 +01:00
84a882c651
LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take too much awareness
2013-11-13 19:07:28 +01:00
7a61dcadd2
LDAP Wizard: move status indicator in one line with back and continue buttons
2013-11-13 19:07:28 +01:00
4ee296051b
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-13 19:07:28 +01:00
5aae550b11
Merge pull request #5809 from owncloud/fix5753
...
LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
2013-11-13 06:52:07 -08:00
550f2d0089
LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN
2013-11-11 19:27:38 +01:00
082357a670
LDAP Wizard: remove ugly whitespace where it should not be
2013-11-11 19:25:20 +01:00
da61c6ef72
LDAP Wizard: determine port without credentials. don't hide the port input field
2013-11-11 15:16:54 +01:00
ea9f392f4e
LDAP Wizard: improve check for Agent DN and Credentials
2013-11-11 13:36:28 +01:00
e431ba5ce8
[tx-robot] updated from transifex
2013-11-11 05:47:59 -05:00
3428c03b80
[tx-robot] updated from transifex
2013-11-09 01:45:32 -05:00
58aad1096f
LDAP Wizard: keep Base DN always visible
2013-11-08 17:48:29 +01:00
0b1749e581
Merge pull request #5682 from owncloud/fix5585
...
LDAP: make buttons on Expert page work again, fixes #5585
2013-11-07 03:34:49 -08:00
263603aa4c
[tx-robot] updated from transifex
2013-11-06 21:44:36 -05:00
95a5ff63b8
LDAP: resolve namespace harakiri, fixes background job
2013-11-06 16:25:31 +01:00
8b3da23368
LDAP Wizard: l10ned Save button
2013-11-06 12:40:07 +01:00
fc040755c1
LDAP Wizard: do not forget to set display name attributes for user and group, makes Test Connection succeed
2013-11-05 13:19:32 +01:00
ef1183bf86
allows agent and password or neither agent nor password
...
this contribution is MIT licensed
2013-11-05 11:51:53 +01:00
5b9bdaadaa
allow empty user-dn and password
...
help tooltip shows completely right: leave both blank for anonyous access. But if you leave it blank js doesn't allow you to edit any other settings...
2013-11-05 01:24:20 +01:00
3d6030b2ae
LDAP: improve design and placement of Save button
2013-11-04 16:54:48 +01:00
17820fbef6
LDAP: make buttons on Expert page work again, fixes #5585
2013-11-04 16:48:40 +01:00
26ecf2062c
Merge pull request #5656 from owncloud/fix-wizard-typo
...
Fix typo in LDAP wizard
* owncloud/fix-wizard-typo:
Excpetion->Exception
2013-11-04 09:39:19 +01:00
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
4e9a23dffe
Excpetion->Exception
2013-11-01 12:19:44 +03:00
4c7ef85252
Merge pull request #5616 from owncloud/fixing-l10n-master
...
Fixing l10n master
2013-10-30 02:44:54 -07:00
54ae799cd9
[tx-robot] updated from transifex
2013-10-30 03:33:25 -04:00
ffb0e14d7b
replacing ownCloud by theme-able name or avoid it's usage
2013-10-29 23:29:16 +01:00
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
8df8211225
[tx-robot] updated from transifex
2013-10-27 07:27:22 -04:00
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
81dbe7dab7
Port PR #5457 to master
2013-10-25 14:15:05 +02:00
3fc232370e
make sure the shared ldap connection is rebound to the configured user after being used for password checking.
2013-10-25 11:12:18 +02:00
c48157e3b8
LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518
2013-10-24 20:26:05 +02:00
7fa418c81a
LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520
2013-10-24 18:21:02 +02:00
20f46602bd
LDAP: when multiline values are passed as array, do not try to preg_split them. Fixes #5521
2013-10-24 14:27:33 +02:00
6284e95e2b
typo, fixes #5517
2013-10-24 14:16:58 +02:00
30c0f5dee6
LDAP Wizard: proper strings and translations for user and group count text
2013-10-23 12:20:13 +02:00
d78a80a689
merge master with resolved conflicts
2013-10-23 12:01:45 +02:00
76a195a0be
LDAP Wizard: l10n improvements
2013-10-21 23:15:21 +02:00
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
e61d961efb
LDAP: Fix base-comparison with multibyte characters, fixes #5081 . Thanks to @sfyang
2013-10-19 00:51:37 +02:00
17010e8f58
Don't set Base User and Base Group when Base DN was detected, would case problems but does not provide any benefit. also make sure that empty string is saved instead of false for multiline values
2013-10-17 20:58:43 +02:00
183dd813d3
Fix Spinner issues with Base DN field
2013-10-17 20:57:19 +02:00
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
6acd01d9f2
resolve merge conflicts from rebase
2013-10-17 19:40:59 +02:00
0b90cc0b4b
Ldap Wizard: also disable tabs, if the first step is not complete
2013-10-17 19:13:29 +02:00
6b160d8507
LDAP Wizard: make Back and Continue work
2013-10-17 19:13:29 +02:00
63e9c56d48
LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall port detection
2013-10-17 19:13:29 +02:00
f64ae75107
LDAP Wizard: fix couple more or less nasty bugs aka polishing
2013-10-17 19:13:28 +02:00
7ad8319488
do not instantiate LDAP Proxy if there are no active configurations
2013-10-17 19:13:28 +02:00
109ddde944
Wizard: autodetection of group-member-assoc attribute
2013-10-17 19:13:28 +02:00
5606b60f36
LDAP: set displayname as default attribute for user display name
2013-10-17 19:13:28 +02:00
c975021a67
clean up
2013-10-17 19:13:28 +02:00
3ae696f843
Wizard does not need data-defaults here
2013-10-17 19:13:28 +02:00
f6b60c6586
LDAP Wizard: add forgotten templates
2013-10-17 19:13:28 +02:00
def834b0a1
LDAP: dissolve LDAP Basic settings, move Login Filter to Advanced and clean up Advanced settings, too. This is all done via Wizard, now.
2013-10-17 19:13:28 +02:00
b2ccb712e2
Ldap Wizard: Group Filter configuration
2013-10-17 19:13:28 +02:00
7c6a9c2256
Ldap Wizard: Login filter UI, detection of username attribute, composing of login filter
2013-10-17 19:13:28 +02:00
e903db7887
LDAP Wizard: create user list filter, show number of user that will have access to OC
2013-10-17 19:13:28 +02:00
5c99645f7d
Cleanup code, sort results
2013-10-17 19:13:27 +02:00
162bfb231a
Ldap Wizard: find out whether server supports memberOf in LDAP Filter and disable group chooser if not
2013-10-17 19:13:27 +02:00
e87b091536
cleanup and coding style
2013-10-17 19:13:27 +02:00
87bd5a2bbb
cleanup, doc and todo
2013-10-17 19:13:27 +02:00
3cafcc2d47
LDAP Wizard: add detection, load and save of LDAP groups for filter purposes
2013-10-17 19:13:27 +02:00
5425511259
Remove debug output
2013-10-17 19:13:27 +02:00
ee1b597345
css cleanup
2013-10-17 19:13:27 +02:00
3b1822cf91
LDAP Wizard: add detection, load and save of LDAP objectClasses for filter purposes
2013-10-17 19:13:27 +02:00
8290929aa6
LDAP Wizard: autodetect base DN
2013-10-17 19:13:14 +02:00
7c60384f20
ignore autodetect-attribute on public save method
2013-10-17 19:13:14 +02:00
3fe400a3ca
Simplify WizardResult
2013-10-17 19:13:14 +02:00
53db1fe5ac
First stage of new Wizard, neither feature complete nor ready
2013-10-17 19:13:14 +02:00
652caa1c88
LDAP: move Configuration out of Connection into class of its own. The new wizard requires it.
2013-10-17 19:13:14 +02:00
02f292d0fd
Doc fix
2013-10-17 19:01:08 +02:00
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
666e52a46b
Merge pull request #5114 from owncloud/ldap_uuid_attr_groups
...
LDAP: allow different UUID attributes for groups and users
2013-10-10 03:27:28 -07:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
cf84154ee0
Cleans up Core apps for relative(em) to absolute(px) styles.
2013-10-06 23:38:24 +05:30
0c837cefb6
LDAP: allow different UUID attributes for groups and users
2013-10-04 11:47:40 +02:00
c38638fdf4
Merge pull request #4815 from owncloud/ldap_improve_testing
...
LDAP modularization and tests
2013-10-04 02:41:06 -07:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
3e1bdd8a04
remove outdated (thus failing) and anyway insufficient group tests - for now
2013-09-27 13:34:16 +02:00
05ee6606f1
give test file a proper name
2013-09-27 13:34:16 +02:00
2cebd8b92e
added user_ldap tests via public api calls
2013-09-27 13:34:16 +02:00
a1aff3e8a1
LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors
2013-09-27 13:34:16 +02:00
81cf4a22ef
LDAP: coding style
2013-09-27 13:34:15 +02:00
84f522f406
LDAP: simple tests for the user backend
2013-09-27 13:34:15 +02:00
bb162b1f94
LDAP: get rid of some PHP Warnings
2013-09-27 13:34:15 +02:00
d4f92494a2
LDAP: make Access be a dependency to the user and group backend instead of inheriting it.
2013-09-27 13:34:15 +02:00
b9cc2ad660
Whitespaces
2013-09-27 13:34:15 +02:00
f04aa1af5d
LDAP: don't check var type when you can specify the type in the parameter list
2013-09-27 13:34:15 +02:00
b9cd22cf78
LDAP: use wrapper, not direct function call
2013-09-27 13:34:15 +02:00
5090ca3eb4
LDAP: add phpdoc
2013-09-27 13:34:15 +02:00
6e850e0bee
LDAP: establish wrapper interface to allow proper mocking
2013-09-27 13:34:15 +02:00
52454e39b7
LDAP: move is_resource check to ldap wrapper to make it mockable
2013-09-27 13:34:15 +02:00
d34fbf3a86
LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing
2013-09-27 13:34:15 +02:00
1a020e0696
Resolve merge conflict
2013-09-27 13:34:15 +02:00
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
321c514782
LDAP: case insensitive replace for more robustness
2013-08-27 22:23:48 +02:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
c482512e23
LDAP: fix wrong hook name
2013-08-22 00:00:33 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
dda5eb2530
Merge pull request #4486 from owncloud/ldap_adjust_cache
...
LDAP: use memcache if available
2013-08-18 02:50:41 -07:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
ce9103d522
Merge pull request #4426 from owncloud/ldap_settings_design
...
Ldap settings design
2013-08-18 01:52:51 -07:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
f41c4312ff
LDAP: use memcache if available
2013-08-17 17:22:54 +02:00
c538ac3081
LDAP: only connect to LDAP once on login
2013-08-17 12:16:51 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
42fc2295e4
LDAP: Update Host in configuration chooser on Save
2013-08-15 16:10:49 +02:00
479f893f6d
LDAP: Show Host name in configuration drop down
2013-08-15 15:55:06 +02:00
cbfee81068
LDAP: slightly smaller input fields
2013-08-15 12:45:37 +02:00
7b17fd2f17
LDAP: move small info text strings into tooltips
2013-08-14 16:51:38 +02:00
a4fc9bbe8c
LDAP: right align labels on settings page
2013-08-14 16:38:25 +02:00
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
17fe748abc
[tx-robot] updated from transifex
2013-08-03 01:56:46 -04:00
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
0fde473cb7
[tx-robot] updated from transifex
2013-07-29 01:57:04 -04:00
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
003ae7b916
use OC_Defaults directly from the template
2013-07-24 12:04:18 +02:00
9d91ceade4
fix php syntax
2013-07-24 10:49:33 +02:00
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
01f3f8e0cc
[tx-robot] updated from transifex
2013-07-22 02:03:23 -04:00
f6d133955e
LDAP: fix background job, resolves #3528
2013-07-19 18:41:29 +02:00
a8acbfdf7b
[tx-robot] updated from transifex
2013-07-16 02:06:21 -04:00
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
83b2411b81
reword LDAP config and use themable strings, fix rest of #3791
2013-07-11 17:45:13 +02:00
5387e5c354
LDAP: even better check for emptiness, fixes #3815
2013-07-10 11:39:47 +02:00
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
096d7674fc
[tx-robot] updated from transifex
2013-07-07 02:06:06 +02:00
d2f50bc089
[tx-robot] updated from transifex
2013-06-29 02:09:10 +02:00
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
88fc410c19
fix numRows usage in user_ldap
2013-06-24 16:29:58 +02:00
8c923a85de
[tx-robot] updated from transifex
2013-06-21 08:53:57 +02:00
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
root
Jenkins for ownCloud
blizzz
Morris Jobke
miicha
Andreas Fischer
VicDeo
Vincent Petry
Donald Buczek
raghunayyar
Christopher
Bart Visscher
Jan-Christoph Borchardt
Björn Schießle
Jörn Friedrich Dreyer