Commit Graph

2150 Commits

Author SHA1 Message Date
Arthur Schiwon 685faad5ca
fix method name due to changes in master
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-25 13:03:08 +02:00
Arthur Schiwon b1d646640a
Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2 2017-04-25 12:42:17 +02:00
Xuanwo 8db21ad8c8 user_ldap: Add support for gidNumber
This patch is based on the work of @dleeuw (https://github.com/dleeuw)
(See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details).
The difference is user & group data will be written into cache to have
better performance, and functions splited from primaryGroupID series to
make them more readable.

Fixed https://github.com/nextcloud/server/issues/2640

Signed-off-by: Xuanwo <xuanwo@yunify.com>
2017-04-25 10:06:47 +08:00
blizzz 42e805f057 Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr
Handle password expiry in user_ldap
2017-04-24 12:17:04 +02:00
Nextcloud bot a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Nextcloud bot 11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Nextcloud bot 363d1c69dd
[tx-robot] updated from transifex 2017-04-22 00:07:36 +00:00
Nextcloud bot fb7663cefe
[tx-robot] updated from transifex 2017-04-21 00:07:37 +00:00
Nextcloud bot adf316c3af
[tx-robot] updated from transifex 2017-04-20 00:07:36 +00:00
Roeland Jago Douma ad24b86013 Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations
Adjust existing bruteforce protection code
2017-04-19 09:27:23 +02:00
Nextcloud bot febe01f571
[tx-robot] updated from transifex 2017-04-19 00:07:40 +00:00
Nextcloud bot 6b490f45fd
[tx-robot] updated from transifex 2017-04-18 23:08:43 +00:00
Morris Jobke 269600a04f Merge pull request #4369 from nextcloud/fix-translations
Fix translations
2017-04-18 18:01:50 -05:00
Joas Schilling 1c0bffe87f
Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Nextcloud bot c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Nextcloud bot b072d2c49d
[tx-robot] updated from transifex 2017-04-18 00:07:25 +00:00
Nextcloud bot df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Lukas Reschke 727688ebd9
Adjust existing bruteforce protection code
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-14 13:42:40 +02:00
Nextcloud bot 0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Lukas Reschke 51377f3d8c Merge pull request #4313 from nextcloud/ldap-name-change
Change LDAP method names
2017-04-13 12:28:24 +02:00
Nextcloud bot 396618fd19
[tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Morris Jobke 229d17e13b
Change LDAP method names
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 10:10:07 -05:00
Morris Jobke 1729e4471f
Update comments to Nextcloud
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
Nextcloud bot d25a96d921
[tx-robot] updated from transifex 2017-04-10 00:08:50 +00:00
Nextcloud bot 4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Roger Szabo 5fa218051b unit test adjustment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-07 18:06:50 +08:00
Nextcloud bot 536650c02f
[tx-robot] updated from transifex 2017-04-07 00:09:11 +00:00
Roger Szabo 0ea8729d1d lower case for attributes
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 19:17:24 +08:00
Roger Szabo f49ff74943 blizzz comments 03.04.2017 with caching
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 16:57:07 +08:00
Roger Szabo 33c8bf1857 blizzz comments 03.04.2017
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 16:26:41 +08:00
Nextcloud bot 7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Nextcloud bot 84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Nextcloud bot ec5377306d
[tx-robot] updated from transifex 2017-04-04 00:07:46 +00:00
Nextcloud bot d56f6399eb
[tx-robot] updated from transifex 2017-04-03 00:08:20 +00:00
Nextcloud bot 0056211672
[tx-robot] updated from transifex 2017-04-02 00:07:48 +00:00
Nextcloud bot 9098042c95
[tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Roger Szabo bd907a5dac usertest adjustment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 17:30:59 +08:00
Roger Szabo 9ed4fb0494 usertest adjustment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 16:54:22 +08:00
Roger Szabo 1853c1ade2 remove redundant tabs
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 15:27:50 +08:00
Roger Szabo 5e7723f15c restore ldap_password_renew_pr
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 15:16:22 +08:00
Nextcloud bot 6a6300b1f2
[tx-robot] updated from transifex 2017-03-31 00:08:35 +00:00
Roeland Jago Douma 70f93bf53a Merge pull request #4143 from nextcloud/ldap-downstream-64
Correctly apply quota
2017-03-30 14:10:21 +02:00
Nextcloud bot f984cf0987
[tx-robot] updated from transifex 2017-03-30 00:07:41 +00:00
Morris Jobke d17678b5b2 Merge pull request #4141 from nextcloud/ldap-downstream-9
Convert the group limit to match the same behaviour as the user search
2017-03-29 15:47:28 -06:00
Roeland Jago Douma 0315e2ea36 Merge pull request #4145 from nextcloud/ldap-downstream-54
Add tooltips to LDAP wizard special attributtes
2017-03-29 19:31:35 +02:00
Roeland Jago Douma 636575e3de Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid
Ldap no memberof with memberuid
2017-03-29 19:12:51 +02:00
David Toledo a4b9bd29a9
Add tooltips to LDAP wizard special attributtes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 14:38:01 +02:00
Juan Pablo Villafáñez 4622bebded
Include tests for "default" and "none" quotas
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez 3676189e05
Add comments in the updateQuota method to explain the behavior
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez ebd1a7d4b2
Add new testes to cover more cases
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez e9b96062e6
Adjust current tests to match the expectations
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez f9832ff347
Check if the user exists before trying to set the quota
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez 3345a72e7e
Correctly apply quota
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:11 +02:00
Juan Pablo Villafáñez 9e2e0c4c30
Convert the group limit to match the same behaviour as the user search
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 12:49:08 +02:00
Marius Blüm 0e058a9a94
Fix LDAP description
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-03-27 16:30:29 +02:00
Nextcloud bot 0981f9a18a
[tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Nextcloud bot 4ea79a5bbe
[tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Nextcloud bot e18d928d9b
[tx-robot] updated from transifex 2017-03-24 01:08:00 +00:00
Nextcloud bot d551b8e6fd
[tx-robot] updated from transifex 2017-03-22 21:14:04 +00:00
Nextcloud bot cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Nextcloud bot fd0e42e093
[tx-robot] updated from transifex 2017-03-21 01:08:16 +00:00
Nextcloud bot 5683365a2c
[tx-robot] updated from transifex 2017-03-17 01:07:41 +00:00
Morris Jobke a5ba1f7803
Remove legacy class OC_Group and OC_User
* basically a straight replacement of the wrapped code at the calling code parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 17:35:09 -06:00
Nextcloud bot 53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot a64c8637d9
[tx-robot] updated from transifex 2017-03-02 01:07:31 +00:00
Nextcloud bot aecec74a04
[tx-robot] updated from transifex 2017-03-01 01:07:42 +00:00
Nextcloud bot 7fc3129f0c
[tx-robot] updated from transifex 2017-02-28 01:07:54 +00:00
Nextcloud bot 556b958af2
[tx-robot] updated from transifex 2017-02-25 01:25:07 +00:00
Nextcloud bot 97b6c1496e
[tx-robot] updated from transifex 2017-02-24 01:21:37 +00:00
Nextcloud bot 54317e80c0
[tx-robot] updated from transifex 2017-02-23 01:18:48 +00:00
Nextcloud bot a08dfd9951
[tx-robot] updated from transifex 2017-02-22 01:12:24 +00:00
Nextcloud bot d754227b4c
[tx-robot] updated from transifex 2017-02-21 01:08:46 +00:00
Lukas Reschke a4266f59ae Merge pull request #3521 from nextcloud/ldap-fix-uuid-attr-detection
Fix Borken UUID Attribute Detection
2017-02-20 21:34:55 +01:00
Arthur Schiwon 866b218f37
Fix misleading wording: searching is affected, not user access.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-20 19:26:16 +01:00
Robert Scheck 25a2cb8c6e Only request "IndexIgnore" if mod_autoindex is loaded
Signed-off-by: Robert Scheck <robert@fedoraproject.org>
2017-02-20 13:09:15 +01:00
Arthur Schiwon ce97ab92c6
add tests to DB group
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 20:12:30 +01:00
Arthur Schiwon 42ddb12fd9
Background jobs can take 4k of characters only. We find a good batch size.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 20:06:25 +01:00
Arthur Schiwon 497ee3e3e6
Add repair steps
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 18:45:33 +01:00
Arthur Schiwon 45615cc940
add integration test for uuid attr detection
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 12:05:51 +01:00
Arthur Schiwon f87812fdd6
Fix determining the UUID attribute, default of the override is null
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 02:06:10 +01:00
Arthur Schiwon b740a21399
Fix integration test by not relying on Fake instances
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 02:04:42 +01:00
Morris Jobke 52ef851da3 Merge pull request #3421 from espro/freeipa-uuid-fix
Update uuidAttributes list to include FreeIPA's ipauniqueid
2017-02-15 08:07:58 -06:00
Nextcloud bot 41276f720b
[tx-robot] updated from transifex 2017-02-15 01:07:29 +00:00
Nextcloud bot 7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Lukas Reschke 5b9f96a434 Merge pull request #3324 from nextcloud/fix-2431
LDAP's checkPassword should only catch when a user was not found, fixes #2431
2017-02-13 23:21:08 +01:00
Brent Bloxam f7b8a31d63 Update uuidAttributes list to include FreeIPA's ipauniqueid
Signed-off-by: Brent Bloxam <brent.bloxam@gmail.com>
2017-02-10 10:23:13 -05:00
Nextcloud bot 5e4bbb394c
[tx-robot] updated from transifex 2017-02-07 01:08:50 +00:00
Nextcloud bot b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Andreas Pflug b64e48335f Don't try to use memberof on posixgroups, since it doesn't support
memberUid attributes.

Signed-off-by: Andreas Pflug <dev@admin4.org>
2017-01-31 01:40:09 +01:00
Arthur Schiwon 9983e05121
LDAP's checkPassword should only catch when a user was not found, fixes #2431
Also fixes error processing after ldap_search, due to different return format

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-30 17:06:51 +01:00
Nextcloud bot b614547ff8
[tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Morris Jobke 3a603ab8b4 Merge pull request #3264 from nextcloud/ldap-deny-long-dns
Gracefully deny users or groups with too long DNs
2017-01-26 01:15:43 -06:00
Morris Jobke feab1e5b94 Merge pull request #3162 from nextcloud/ldap-ocs
Part 1 of LDAP Backend OCS Api
2017-01-25 22:45:34 -06:00
Morris Jobke 6fe3cfa1e3 Merge pull request #3244 from nextcloud/settings-icon
Settings icon for LDAP and encryption
2017-01-25 18:43:21 -06:00
Arthur Schiwon 03ae7b654f
Gracefully deny users or groups with too long DNs
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-25 17:10:51 +01:00
Joas Schilling 95ef625a9d
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 11:24:42 +01:00
Nextcloud bot c3e57d228f
[tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Morris Jobke e46410e856
Add icon to admin page sidebar for LDAP
* follow up to nextcloud/server#3151

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:54:32 -06:00
Morris Jobke e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons
add icons to navigation of personal & admin settings
2017-01-24 10:56:31 -06:00
Nextcloud bot 8024f5a17f
[tx-robot] updated from transifex 2017-01-23 00:17:39 +00:00
Nextcloud bot 012e521239
[tx-robot] updated from transifex 2017-01-22 01:07:52 +00:00
Arthur Schiwon 91ed70f094
fix deletion for configIDs < s10
Also move ensureConfigIDExists checks into try, it might throw DB
related exceptions

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-20 23:01:46 +01:00
Arthur Schiwon 9ca4065ef5
LDAP PUT command now supports setting multiple keys at once
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-20 22:01:08 +01:00
Nextcloud bot 48a3f2a8a2
[tx-robot] updated from transifex 2017-01-20 01:07:41 +00:00
Joas Schilling 5812e99f1d
Fix app section tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 15:30:40 +01:00
Arthur Schiwon 1f7b08bd19
LDAP OCS Api for show config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 15:19:20 +01:00
Arthur Schiwon f2c9d04eac
test against OCS v2 instead
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 12:48:50 +01:00
Arthur Schiwon 01d469dfea
add LDAP OCS Api for modifying a configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 11:09:04 +01:00
Joas Schilling 17a7eaabcd
Add the icons for shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:22 +01:00
Arthur Schiwon 18a75bec0d
fix and extend behat tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 10:04:15 +01:00
Arthur Schiwon a515de54e7
LDAP OCS Api for delete config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 23:17:58 +01:00
Arthur Schiwon 689df9a843
LDAP OCS Api for create config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 21:13:23 +01:00
Nextcloud bot 09a46b7bd6
[tx-robot] updated from transifex 2017-01-12 01:07:43 +00:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Nextcloud bot d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Nextcloud bot 2e0cf21f7f
[tx-robot] updated from transifex 2017-01-04 12:09:43 +00:00
Nextcloud bot fc02564ea6
[tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Nextcloud bot b399ad2fee
[tx-robot] updated from transifex 2016-12-28 01:07:41 +00:00
Nextcloud bot bd20139f55
[tx-robot] updated from transifex 2016-12-27 01:07:38 +00:00
Nextcloud bot 3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Morris Jobke f88d615445 Merge pull request #2808 from alantygel/patch-1
Translation string corrected > 1 user
2016-12-22 10:04:35 +01:00
Nextcloud bot 0b64e96c9b
[tx-robot] updated from transifex 2016-12-22 01:07:28 +00:00
Alan Tygel efff51c7a8 Translation string corrected > 1 user 2016-12-21 16:34:24 -03:00
Nextcloud bot f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Arthur Schiwon 7887566cff
remove frequent, unimportant log message
Fixes #2585

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-19 23:36:11 +01:00
Roeland Jago Douma f86f4eb98d Merge pull request #2504 from nextcloud/downstream-ldap-15
Downstream LDAP Range Support
2016-12-16 16:40:04 +01:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Nextcloud bot 0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00
Nextcloud bot 74d1b0bada
[tx-robot] updated from transifex 2016-12-08 01:07:26 +00:00
Arthur Schiwon 0c8e4b91d3
adjust: sanitizeDN resides in Helper
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:36:20 +01:00
Juan Pablo Villafáñez efa1077872
Extract lowercase conversion out of the loop
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:29:47 +01:00
Arthur Schiwon 6496b95564
range support for LDAP read operations
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:29:16 +01:00
Nextcloud bot dda39728e3
[tx-robot] updated from transifex 2016-12-05 01:07:41 +00:00
Arthur Schiwon 1e5344ffe9
log exception about user not present on LDAP on login only if loglevel is set to debug
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-11-29 17:05:55 +01:00
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Nextcloud bot 4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Nextcloud bot 9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Lukas Reschke 4c5e7d270a
Add tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-23 19:58:43 +01:00
root 861c8572c0
restore ldap_password_pr
Signed-off-by: Roger Szabo <roger.szabo@web.de>

remove notification part

Signed-off-by: Roger Szabo <roger.szabo@web.de>

blizzz comments

Signed-off-by: Roger Szabo <roger.szabo@web.de>

morris comment

Signed-off-by: Roger Szabo <roger.szabo@web.de>

improved error message for changing password

Signed-off-by: Roger Szabo <roger.szabo@web.de>

blizz comments 20161013

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Adjust HintException usage

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Signed-off-by: Roger Szabo <roger.szabo@web.de>
2016-11-23 19:02:48 +01:00
Nextcloud bot 97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Nextcloud bot b1ee9862f8
[tx-robot] updated from transifex 2016-11-19 01:06:44 +00:00
Lukas Reschke bc1008ac38
Use 11.0 instead 9.2
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
Nextcloud bot ca3616cb58
[tx-robot] updated from transifex 2016-11-05 01:07:14 +00:00
Lukas Reschke 85016977f4 Merge pull request #1935 from nextcloud/downstream-ldap-26
Add prefix to the connection
2016-10-31 09:27:09 +01:00
Nextcloud bot ad597d498d
[tx-robot] updated from transifex 2016-10-28 00:07:11 +00:00
Juan Pablo Villafáñez 1937e58ec0
Add prefix to the connection
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-27 13:08:09 +02:00
Nextcloud bot e23a298a81
[tx-robot] updated from transifex 2016-10-25 09:36:09 +00:00
Arthur Schiwon dade28cadd
Merge branch 'master' into downstream-ldap-3
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-16 14:42:16 +02:00
Arthur Schiwon a49d571799
fix and tidy up tests after merge conflicts
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 15:34:40 +02:00