root
bd65a17203
Nextcloud license header for new files
2016-07-28 15:13:00 +08:00
root
2719dcabed
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-27 15:17:29 +08:00
root
1c64ee67af
comments amended
2016-07-27 15:16:57 +08:00
root
32fb6beac3
final changes
2016-07-27 15:10:35 +08:00
blizzz
f88109be75
Merge pull request #349 from nextcloud/ldab-groupOfUniqueNames
...
add groupOfUniqueNames as valid group object class
2016-07-26 23:32:47 +02:00
Arthur Schiwon
686cb599b6
fix autoloading in LPAP integration tests, resolves #544
2016-07-25 11:05:59 +02:00
root
1fb080df2b
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-25 16:56:14 +08:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex
2016-07-23 00:09:06 +00:00
Joas Schilling
7400ff05ac
Also increase the min version
2016-07-22 14:46:52 +02:00
Robin Appelman
6062b6365b
bumb compatible app versions for core apps
2016-07-22 13:04:23 +02:00
root
c1b37e4ccb
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-22 16:47:27 +08:00
root
02ec8b1726
New LDAPProvider for user_ldap
2016-07-22 16:46:29 +08:00
Joas Schilling
03cb588ea9
Merge pull request #500 from nextcloud/bump_version
...
Bump version
2016-07-22 10:03:42 +02:00
Joas Schilling
0215b004da
Update with robin
2016-07-21 18:13:58 +02:00
Joas Schilling
813f0a0f40
Fix apps/
2016-07-21 18:13:57 +02:00
Joas Schilling
86129a8b88
Increase app versions
2016-07-21 15:50:30 +02:00
Nextcloud bot
b7c5a59adf
[tx-robot] updated from transifex
2016-07-21 00:09:07 +00:00
Aaron Wood
7c0de08cc4
Escape special characters ( #25429 )
...
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Use correct method in the AbstractMapping class
* Change the getNamesBySearch method so that input can be properly escaped while still supporting matches
* Don't escape hardcoded wildcard
2016-07-20 14:46:47 +02:00
Robin Appelman
81d4d85803
add groupOfUniqueNames as valid group object class
2016-07-08 18:13:22 +02:00
Nextcloud bot
a84250e0af
[tx-robot] updated from transifex
2016-07-08 00:09:25 +00:00
Lukas Reschke
2a1a3957b6
Merge pull request #333 from nextcloud/sync-master
...
Sync master
2016-07-07 19:29:43 +02:00
Juan Pablo Villafáñez
6d680bdebf
Change png icons to svg
2016-07-07 15:09:28 +02:00
Morris Jobke
ba16fd0d33
Merge branch 'master' into sync-master
2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438
Revert "[tx-robot] updated from transifex"
...
This reverts commit 3731b2a006
.
Revert "[tx-robot] updated from transifex"
This reverts commit 94d91113f1
.
Revert "[tx-robot] updated from transifex"
This reverts commit e7cc8bac1e
.
Revert "[tx-robot] updated from transifex"
This reverts commit 59fc3ff45a
.
Revert "[tx-robot] updated from transifex"
This reverts commit 6a89a63d2e
.
Revert "[tx-robot] updated from transifex"
This reverts commit b0bad03234
.
2016-07-07 11:04:08 +02:00
Nextcloud bot
4a0efa38c0
[tx-robot] updated from transifex
2016-07-07 08:58:00 +00:00
Jenkins for ownCloud
38718bf89e
[tx-robot] updated from transifex
2016-07-07 01:56:27 -04:00
Nextcloud bot
da2363a1dd
[tx-robot] updated from transifex
2016-07-06 13:28:06 +00:00
Jenkins for ownCloud
6103df97cc
[tx-robot] updated from transifex
2016-07-06 01:56:27 -04:00
Vincent Petry
b77fcc19d4
Merge pull request #25344 from owncloud/fix-ldap-check-user
...
check if renamed user is still valid by reapplying the ldap filter
2016-07-05 11:29:55 +02:00
felixboehm
e901ec4941
check if renamed user is still valid by reapplying the ldap filter ( #25338 )
2016-07-04 14:20:08 +02:00
Jörn Friedrich Dreyer
d2d2a75529
Cap LDAP user cache ( #25323 )
2016-07-04 13:57:15 +02:00
Jenkins for ownCloud
9e0d8fcf41
[tx-robot] updated from transifex
2016-07-04 01:56:34 -04:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Jenkins for ownCloud
1b9fa4dd5f
[tx-robot] updated from transifex
2016-06-30 01:55:56 -04:00
Morris Jobke
5961d5aae4
Add app:check-code for already compatible apps
...
* admin_audit, comments, federation
* removed not needed call to OC_Util::checkAdminUser() (is already
done by the request handler before)
2016-06-27 16:50:10 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Jenkins for ownCloud
3d65979f0a
[tx-robot] updated from transifex
2016-06-25 01:56:48 -04:00
Jenkins for ownCloud
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
Jörn Friedrich Dreyer
704a993e37
Fix null pointer exception in user_ldap ( #25062 )
2016-06-21 16:30:48 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
Morris Jobke
e95c15e53a
fix more strings
2016-06-20 13:14:24 +02:00
Jenkins for ownCloud
5887afbb37
[tx-robot] updated from transifex
2016-06-14 08:02:15 +02:00
Thomas Müller
990ac34aaa
Use proper namespaces - fixes #25078 ( #25079 )
2016-06-13 19:32:54 +02:00
Vincent Petry
1abe5b0408
Merge pull request #25024 from owncloud/ldap-cachedgroupsbymember
...
Use array_merge when reading cached groups members
2016-06-10 11:06:41 +02:00
Jenkins for ownCloud
e8a66f8e7d
[tx-robot] updated from transifex
2016-06-10 05:55:19 +00:00
Vincent Petry
059778bef0
Add unit test for LDAP multi group caching
2016-06-09 17:57:07 +02:00
Vincent Petry
c5a6c8b70b
Use array_merge when reading cached groups members
2016-06-08 11:22:01 +02:00
Jenkins for ownCloud
fb5fb6a9b5
[tx-robot] updated from transifex
2016-06-06 06:51:58 -04:00
Jenkins for ownCloud
4234892a60
[tx-robot] updated from transifex
2016-06-04 02:01:18 -04:00
Jenkins for ownCloud
63132483ca
[tx-robot] updated from transifex
2016-06-03 02:19:30 -04:00