summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17923 from owncloud/fix-17921blizzz2015-07-291-8/+0
|\
| * remove unused varblizzz2015-07-291-2/+0
| * Remove Log info when no group filter is set, fixes #17921blizzz2015-07-281-6/+0
* | Merge pull request #17464 from owncloud/fix-17232blizzz2015-07-299-98/+340
|\ \
| * | fix test after rebasingArthur Schiwon2015-07-271-1/+1
| * | fix uncaught exception on not permitted file types when setting avatar, fixes...Arthur Schiwon2015-07-271-1/+7
| * | add integration tests for avatar updateArthur Schiwon2015-07-275-2/+144
| * | refactor integration tests to make it easier to add new onesArthur Schiwon2015-07-274-95/+189
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-292-0/+2
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-282-0/+14
|/
* Merge pull request #17526 from owncloud/fix-17516Morris Jobke2015-07-274-2/+96
|\
| * LDAP: when checking group for matching filter, also take base DN into conside...Arthur Schiwon2015-07-094-2/+96
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-252-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-232-4/+46
* | Fixing line comments and indentationViktor Szépe2015-07-211-3/+3
* | Merge pull request #17723 from owncloud/fix-17631blizzz2015-07-202-125/+133
|\ \
| * | fix indentation. no code changes, whitespace only.Arthur Schiwon2015-07-201-126/+126
| * | fix runtime caching in ldap's user manager, fixes #17631Arthur Schiwon2015-07-172-2/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-204-0/+4
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-172-2/+2
* | Merge pull request #17046 from nicolas-grekas/fix-16654blizzz2015-07-163-9/+5
|\ \
| * | Do not use OC*::mb_*_replace(), they are uselessNicolas Grekas2015-07-163-9/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-112-0/+26
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-104-10/+20
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-092-4/+16
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-072-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-062-8/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-054-16/+72
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-034-0/+44
* | Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-s...Joas Schilling2015-07-021-1/+1
|\ \
| * | Bump versionsLukas Reschke2015-07-021-1/+1
* | | [master] Remove OCS IDsLukas Reschke2015-07-021-1/+0
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-028-4/+20
* | Merge pull request #17255 from owncloud/fix-17119Thomas Müller2015-07-019-1/+389
|\ \
| * | tests solidityArthur Schiwon2015-06-303-0/+24
| * | adjust unit testArthur Schiwon2015-06-301-0/+4
| * | integration testArthur Schiwon2015-06-305-0/+331
| * | ensure groups match filter when using memberOf to read users group, refs #17119Arthur Schiwon2015-06-262-1/+30
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-292-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-288-0/+8
* | | Add missing annotations for parametersLukas Reschke2015-06-272-9/+16
* | | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-277-5/+2
|\ \ \
| * | | update license headers and authorsMorris Jobke2015-06-257-5/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2710-0/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2638-40/+2
|/ / /
* | | Merge pull request #17152 from owncloud/LDAP/AD-TypoMorris Jobke2015-06-251-1/+1
|\ \ \
| * | | Dropped an S from the mouseoverLukas Reschke2015-06-241-1/+1
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2015-06-254-8/+14
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-214-0/+64
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-202-6/+6
|/