summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap
Commit message (Expand)AuthorAgeFilesLines
* use OC_Defaults directly from the templateBjörn Schießle2013-07-241-2/+2
* fix php syntaxThomas Müller2013-07-241-2/+2
* Merge branch 'master' into more-themable-stringsThomas Müller2013-07-245-11/+77
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-221-0/+52
| * LDAP: fix background job, resolves #3528Arthur Schiwon2013-07-191-11/+9
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-161-0/+3
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-122-0/+13
* | reword LDAP config and use themable strings, fix rest of #3791Jan-Christoph Borchardt2013-07-111-9/+9
|/
* LDAP: even better check for emptiness, fixes #3815Arthur Schiwon2013-07-101-8/+19
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-081-0/+7
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-072-0/+66
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-291-0/+12
* Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_m...Bart Visscher2013-06-282-7/+5
|\
| * fix numRows usage in user_ldapJörn Friedrich Dreyer2013-06-242-7/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-251-0/+12
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-211-0/+3
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-201-0/+3
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-141-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-111-0/+9
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-082-2/+11
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-071-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-063-0/+18
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-052-0/+16
* LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600Arthur Schiwon2013-06-041-0/+4
* merge master into backgroundjobRobin Appelman2013-06-0281-162/+599
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-021-0/+6
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-012-0/+5
| * Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_jsblizzz2013-05-312-2/+8
| |\
| | * LDAP: sqlite compatibility for emptyiing tablesArthur Schiwon2013-05-311-1/+7
| | * LDAP: fix setting value of checkbox after loading configurationArthur Schiwon2013-05-311-1/+1
| * | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handlingblizzz2013-05-311-3/+9
| |\ \ | | |/ | |/|
| | * LDAP: fix possible recursionArthur Schiwon2013-05-251-0/+7
| | * LDAP: fix handling when LDAP Host is offlineArthur Schiwon2013-05-251-3/+2
| * | LDAP: fix generation of alternate internal name on conflicts. Use also smalle...Arthur Schiwon2013-05-301-2/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-302-0/+9
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-261-0/+4
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-252-14/+31
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-241-0/+1
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-231-8/+8
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-212-0/+13
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-202-0/+3
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-193-0/+12
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-1863-45/+174
| * Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuidblizzz2013-05-169-4/+143
| |\
| | * Merge branch 'master' into ldap_configurable_username_n_uuidArthur Schiwon2013-05-1315-76/+105
| | |\
| | * | LDAP: fix display of numerical display namesArthur Schiwon2013-05-081-1/+1
| | * | LDAP: Implement clear mappings functionalityArthur Schiwon2013-05-084-1/+91
| | * | LDAP: implement UUID and internal username overrideArthur Schiwon2013-05-081-1/+19
| | * | LDAP: better variable nameArthur Schiwon2013-05-082-7/+11
| | * | LDAP: implement r+w for new settingsArthur Schiwon2013-05-081-2/+11