7de6f7cd07
Merge pull request #6677 from nextcloud/downstream-dont-reset-quota
...
don't reset quota
2017-10-19 11:42:37 +02:00
4388ec2231
Little bit of code cleanup
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-19 11:05:24 +02:00
a6760560c6
Do not check existance before fetch
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-19 11:03:31 +02:00
59c3ea91fd
[tx-robot] updated from transifex
2017-10-17 00:08:23 +00:00
84a7285f08
[tx-robot] updated from transifex
2017-10-16 00:08:26 +00:00
d251623b01
[tx-robot] updated from transifex
2017-10-14 02:29:04 +00:00
7bac8a32b4
[tx-robot] updated from transifex
2017-10-03 00:08:20 +00:00
8be053516b
[tx-robot] updated from transifex
2017-09-30 00:08:25 +00:00
e62ae5b2df
fix test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-29 12:49:04 +02:00
c9622ccb62
fix LDAP User deletion (cleanup)
...
discovered a bug in the integration test which lead to following a
different code path and giving a false-positive success feedback.
Also listens now to the evendispatcher instead of old hook system
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-29 11:44:04 +02:00
e5d39e63d1
[tx-robot] updated from transifex
2017-09-28 00:08:36 +00:00
3e2015a24c
and add missing whitespaces to log outout
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-28 01:16:57 +02:00
eac542a3cc
Adjust unittest
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-28 01:13:53 +02:00
d6d895dd74
Keep the current quota if no suitable quota is found
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-28 01:13:48 +02:00
de2dc3c919
[tx-robot] updated from transifex
2017-09-27 00:08:23 +00:00
d603d78630
[tx-robot] updated from transifex
2017-09-19 00:08:27 +00:00
967b563113
[tx-robot] updated from transifex
2017-09-16 00:08:23 +00:00
2372e2d849
Merge pull request #6453 from nextcloud/fix-5273
...
Fix initializing paged search under some circumstances
2017-09-15 17:03:19 +02:00
113fd47f30
[tx-robot] updated from transifex
2017-09-15 00:08:08 +00:00
0b625069e8
adapted integration tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
5e74affea4
fix counting found results in search op
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
fc097a80f5
improve and extend paging integration test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
34f9590169
replace hard-coded attribute with the corresponding settings option
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
89f4e16cdb
fix limit-flaw in search on paged results
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
7698781a1e
[tx-robot] updated from transifex
2017-09-14 00:08:12 +00:00
ba2e1c5db9
Merge pull request #5689 from nextcloud/fix-4117
...
LDAP: simplify returning the homePath and fixing #4117
2017-09-14 00:23:01 +02:00
cebbb1633a
Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_Wizard
...
recognize groupOfUniqueNames as valid LDAP group object
2017-09-05 13:33:15 +02:00
ff93dd7eb1
Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes
...
LDAP Connectivity Fixes
2017-09-04 18:31:32 +02:00
45f687a279
[tx-robot] updated from transifex
2017-09-01 00:08:27 +00:00
ab92e2ee14
listen to deletion hooks for proper handling, adjust and add tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-08-31 23:03:21 +02:00
efedc81c0a
simplify returning the homePath and fixing #4117
...
homesToKill was not set in runtime since some changes some place else. It
required deleteUser() to be called first. The method acts independent of it
now.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-08-31 23:03:16 +02:00
99dcf5036d
[tx-robot] updated from transifex
2017-08-31 00:08:31 +00:00
8e4085526d
[tx-robot] updated from transifex
2017-08-28 00:08:24 +00:00
7b8bd8188e
[tx-robot] updated from transifex
2017-08-25 00:08:59 +00:00
a7f2dc6dd6
[tx-robot] updated from transifex
2017-08-24 00:08:50 +00:00
ae0789ef43
[tx-robot] updated from transifex
2017-08-22 00:08:20 +00:00
9e1884b27c
[tx-robot] updated from transifex
2017-08-21 00:08:13 +00:00
8c458de4c2
[tx-robot] updated from transifex
2017-08-20 00:08:15 +00:00
6b978ebd29
[tx-robot] updated from transifex
2017-08-19 00:08:26 +00:00
231cffffb9
[tx-robot] updated from transifex
2017-08-18 00:08:15 +00:00
0ceb06fde5
[tx-robot] updated from transifex
2017-08-17 00:08:14 +00:00
d7406e5159
[tx-robot] updated from transifex
2017-08-16 00:08:33 +00:00
cc40f02684
[tx-robot] updated from transifex
2017-08-15 00:08:15 +00:00
d1f3e1de96
[tx-robot] updated from transifex
2017-08-14 00:08:21 +00:00
a2e3c8ede5
[tx-robot] updated from transifex
2017-08-12 00:08:18 +00:00
43facdb95f
Merge pull request #5616 from nextcloud/ldap-wizard-remove-LDAPTLS_REQCERT-attempt
...
LDAP Wizard: do not attempt to recognise cert issue by using LDAPTLS_REQCERT
2017-08-10 21:06:14 +02:00
c6f6413bb1
Fix ldap tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 21:10:15 +02:00
8549fcf6e4
[tx-robot] updated from transifex
2017-08-09 00:08:20 +00:00
481002a00b
[tx-robot] updated from transifex
2017-08-08 00:08:10 +00:00
21f2fe5cb9
[tx-robot] updated from transifex
2017-08-05 00:08:08 +00:00
1f8a45bbd7
[tx-robot] updated from transifex
2017-08-04 00:08:18 +00:00
2fcf4f2f29
Improve spelling in LDAP
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 18:12:31 +02:00
45e2c415d4
Fix comparison in the ldap app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
ede15f0988
Fix L10N::t
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
456392e627
[tx-robot] updated from transifex
2017-08-01 00:08:26 +00:00
7b2c08a31a
Merge pull request #5905 from nextcloud/ocp-config
...
Use IConfig instead of static OCP\Config
2017-07-31 10:54:40 +02:00
97d06a7698
[tx-robot] updated from transifex
2017-07-31 00:08:02 +00:00
98b664a000
[tx-robot] updated from transifex
2017-07-30 00:08:03 +00:00
b43abf7512
[tx-robot] updated from transifex
2017-07-29 00:08:31 +00:00
c27498db71
Use IConfig instead of static OCP\Config
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-27 13:43:18 +02:00
65ade4b6d5
[tx-robot] updated from transifex
2017-07-27 00:08:03 +00:00
da31a30edb
[tx-robot] updated from transifex
2017-07-26 00:08:06 +00:00
89a7b007f2
Fix comments
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-25 08:57:58 +02:00
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
69f6d42b17
LDAP: Simplify conditions in establishConnection
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
6a62b4784a
LDAP: Add testStartTlsNegotiationFailure unit test
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
3a6511eac8
LDAP: Add testBindWithInvalidCredentials unit test
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
6103677a91
LDAP: Use imported exception in Connection class
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
79fbed4064
LDAP: Clean-up doConnect
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
d87375cbaa
LDAP: Throw an exception if disabling LDAP referrals fails
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
97e14cccf2
LDAP: Fix testUseBackupServer unit test
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
de9a9bc004
LDAP: Throw an exception if Start TLS fails
...
This ensures that only a secure connection to the LDAP server will be used,
if Start TLS has been enabled.
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
ee2c6e8215
LDAP: Remove unnecessary "recursion" fix
...
This reverts commit 86d72b9a61
2017-07-23 14:50:01 +03:00
039a836d4a
LDAP: Don't handle invalid credentials as a connection error
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
4e2e592635
LDAP: Connect to backup server only if it exists + handle errors
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
46332b0d8e
[tx-robot] updated from transifex
2017-07-23 00:07:58 +00:00
ce7c62d9bb
[tx-robot] updated from transifex
2017-07-22 00:08:07 +00:00
25439919f8
fix phpdoc return types (no code change)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-21 14:55:12 +02:00
9b2f171cbd
do not attempt to recognise cert issue by using LDAPTLS_REQCERT
...
first, it does not work (at least not everywhere/reliably), second if it
did it was not reset properly. Removes a bit of complexity.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-21 14:55:11 +02:00
964d5338dc
[tx-robot] updated from transifex
2017-07-21 00:08:06 +00:00
26c42d3d30
[tx-robot] updated from transifex
2017-07-20 00:08:04 +00:00
0ee83ac56b
[tx-robot] updated from transifex
2017-07-19 00:08:22 +00:00
1ac6eae7d5
Merge pull request #5739 from nextcloud/comradekingu-patch-4
...
Spelling: Bigversal and LDAP
2017-07-18 09:09:46 +02:00
4b1f258198
Merge pull request #5735 from nextcloud/comradekingu-patch-1
...
Spelling: Shortening and binding
2017-07-18 08:52:09 +02:00
99555faffd
Merge pull request #5737 from nextcloud/comradekingu-patch-2
...
Spelling: command-line, Consider narrowing
2017-07-18 08:49:48 +02:00
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
ddc804aa32
: Bigversal and LDAP
2017-07-14 15:46:05 +02:00
4b8c1eaa91
command-line, Consider narrowing
2017-07-14 15:32:47 +02:00
66cbf90853
Spelling: Shortening and binding
2017-07-14 15:24:55 +02:00
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
0ebec6f9a4
Rectify variable $uid->$user
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:46:39 +08:00
4f7fafb5c5
[tx-robot] updated from transifex
2017-07-10 00:08:41 +00:00
f8735a3205
recognize groupOfUniqueNames as valid LDAP group object
...
This was already partly done in f88109b
2017-07-07 08:29:58 +02:00
e836efe68b
Merge pull request #5569 from GitHubUser4234/ldap_password_renew_nc12fix
...
Ldap password renewal fixes for NC12
2017-07-05 11:49:13 +02:00
51ecc7ce11
suppress superflous php error on rejected password change
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-30 18:36:33 +08:00
2afb4857cc
[tx-robot] updated from transifex
2017-06-30 00:08:23 +00:00
665ded38aa
[tx-robot] updated from transifex
2017-06-25 00:08:18 +00:00
bf9412df63
set needsPasswordReset flag correctly
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-22 15:58:30 +08:00
1d8e73b108
css for button adjustment for nc12
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-22 15:53:11 +08:00
0fcbc0954c
pass missing function parameter
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-21 14:40:44 +08:00
2660a3b49c
[tx-robot] updated from transifex
2017-06-20 00:08:41 +00:00
76d10bc46b
[tx-robot] updated from transifex
2017-06-19 00:08:20 +00:00
26d6c4a64a
[tx-robot] updated from transifex
2017-06-17 00:08:26 +00:00
74654288e6
[tx-robot] updated from transifex
2017-06-16 00:08:44 +00:00
7a269ae872
[tx-robot] updated from transifex
2017-06-15 00:08:40 +00:00
f3f3d077ae
Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-check
...
remove check, user_webdavauth is not an app anymore for long
2017-06-14 10:32:14 +02:00
ea64cb0028
[tx-robot] updated from transifex
2017-06-13 00:08:22 +00:00
08702cbaba
[tx-robot] updated from transifex
2017-06-11 00:08:21 +00:00
ee1b9d8762
Merge pull request #5122 from nextcloud/fix-ldap-integration-tests
...
Fix ldap integration tests
2017-06-09 16:05:36 +02:00
a74901fce1
[tx-robot] updated from transifex
2017-06-08 00:08:26 +00:00
a3c5d43cd5
[tx-robot] updated from transifex
2017-06-07 00:09:00 +00:00
f03d6f225e
[tx-robot] updated from transifex
2017-06-04 00:08:29 +00:00
5d39f700e4
[tx-robot] updated from transifex
2017-06-03 00:09:00 +00:00
c70de161cf
[tx-robot] updated from transifex
2017-06-02 00:08:30 +00:00
8801b68d45
[tx-robot] updated from transifex
2017-06-01 00:08:38 +00:00
2bbd5147e7
remove check, user_webdavauth is not an app anymore for long
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 01:33:04 +02:00
8318b2a137
Merge pull request #5104 from nextcloud/ldap-attempt-reconnect
...
Contd: Add layer on top of LDAP methods to catch server disconnects and attempt re-connection
2017-06-01 01:20:57 +02:00
5f9cc5a2d5
[tx-robot] updated from transifex
2017-05-31 00:08:48 +00:00
b9b7f8bede
[tx-robot] updated from transifex
2017-05-30 00:08:44 +00:00
4be17dff0f
[tx-robot] updated from transifex
2017-05-29 00:08:33 +00:00
4f2b26d246
[tx-robot] updated from transifex
2017-05-28 00:08:14 +00:00
b79f9cadc2
fix paging
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 13:44:43 +02:00
a619d349bf
add convenience script to run all tests at once
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:31:26 +02:00
f11d998371
Make IDE happy
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:30:43 +02:00
10ef98a3b1
add missing INotificationManager when creating User backend, LDAP
...
UserManager
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:25:54 +02:00
c1925ddfd0
[tx-robot] updated from transifex
2017-05-26 00:08:16 +00:00
a46d2f1d39
[tx-robot] updated from transifex
2017-05-25 00:08:04 +00:00
bd5d12528f
make sure used ldap connection resource is always up to date
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:45:48 +02:00
8c89bf7c59
moved to something a little less invasive. back to passing CR around.
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:36:51 +02:00
8829d84949
special case for controlPagedResultResponse. It would be nice if there was a generic way to pass by reference with call_user_func_array..
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:34:52 +02:00
6cc26efbc5
[tx-robot] updated from transifex
2017-05-24 00:08:22 +00:00
9c8a838624
[tx-robot] updated from transifex
2017-05-23 00:08:29 +00:00
3ec9d91bd0
Split multi-author entries
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
bc8fbc1a67
Bump app versions as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
fdfe8f7f15
Adjust version requirement
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
462f12611c
[tx-robot] updated from transifex
2017-05-22 00:08:23 +00:00
a442c86a84
[tx-robot] updated from transifex
2017-05-20 00:08:27 +00:00
11e04e394d
[tx-robot] updated from transifex
2017-05-17 15:56:32 +00:00
7d1f362aa0
[tx-robot] updated from transifex
2017-05-16 00:08:08 +00:00
b1bd9ff0b9
[tx-robot] updated from transifex
2017-05-14 00:07:54 +00:00
6e3a914f4a
[tx-robot] updated from transifex
2017-05-13 00:08:00 +00:00
241226c23c
[tx-robot] updated from transifex
2017-05-11 00:08:08 +00:00
fb78774eb8
[tx-robot] updated from transifex
2017-05-10 00:08:31 +00:00
f6a4028fad
[tx-robot] updated from transifex
2017-05-09 00:07:51 +00:00
9d8e9b1efb
[tx-robot] updated from transifex
2017-05-08 20:49:06 +00:00
278637feb5
Merge pull request #4556 from nextcloud/downstream-ldap-78
...
LDAP: only use proxy classes as backend
2017-05-08 12:29:38 +02:00
6109afc14d
[tx-robot] updated from transifex
2017-05-08 00:07:37 +00:00
56bb8745df
[tx-robot] updated from transifex
2017-05-07 00:07:31 +00:00
59ee22101f
[tx-robot] updated from transifex
2017-05-06 00:07:33 +00:00
619d09529c
[tx-robot] updated from transifex
2017-05-05 00:07:28 +00:00
806aeae71d
[tx-robot] updated from transifex
2017-05-04 00:07:29 +00:00
3dbf30c220
[tx-robot] updated from transifex
2017-05-03 00:07:31 +00:00
f27d382c47
[tx-robot] updated from transifex
2017-05-02 00:07:20 +00:00
2152d5f1f6
[tx-robot] updated from transifex
2017-05-01 00:07:32 +00:00
4518f6dc64
[tx-robot] updated from transifex
2017-04-30 00:07:21 +00:00
6908818999
[tx-robot] updated from transifex
2017-04-28 00:07:41 +00:00
a9a80f95e3
Use proxy classes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-27 15:57:25 +02:00
c1c5f51fd8
[tx-robot] updated from transifex
2017-04-27 00:07:40 +00:00
ba43a09380
Merge pull request #4512 from nextcloud/fix-translations-2
...
Fix translations
2017-04-26 08:57:08 -03:00
6c28c4ac8b
Use correct plural form and add special strings for tomorrow and today
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:34:59 +02:00
8a004ac41f
Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo
...
user_ldap: Add support for gidNumber
2017-04-25 22:34:30 -03:00
e5fe41e16b
[tx-robot] updated from transifex
2017-04-26 00:07:43 +00:00
43f451e9e0
Fix usersInGroup retrieval
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-25 15:07:05 +02:00
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
b1d646640a
Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2
2017-04-25 12:42:17 +02:00
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
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
a01f946c56
[tx-robot] updated from transifex
2017-04-24 00:07:28 +00:00
11c7953888
[tx-robot] updated from transifex
2017-04-23 00:07:31 +00:00
363d1c69dd
[tx-robot] updated from transifex
2017-04-22 00:07:36 +00:00
fb7663cefe
[tx-robot] updated from transifex
2017-04-21 00:07:37 +00:00
adf316c3af
[tx-robot] updated from transifex
2017-04-20 00:07:36 +00:00
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
febe01f571
[tx-robot] updated from transifex
2017-04-19 00:07:40 +00:00
6b490f45fd
[tx-robot] updated from transifex
2017-04-18 23:08:43 +00:00
269600a04f
Merge pull request #4369 from nextcloud/fix-translations
...
Fix translations
2017-04-18 18:01:50 -05:00
1c0bffe87f
Fix translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
c40b7acb09
[tx-robot] updated from transifex
2017-04-18 20:47:45 +00:00
b072d2c49d
[tx-robot] updated from transifex
2017-04-18 00:07:25 +00:00
df2235c71f
[tx-robot] updated from transifex
2017-04-17 00:07:33 +00:00
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
0f96d5a641
[tx-robot] updated from transifex
2017-04-14 00:07:36 +00:00
51377f3d8c
Merge pull request #4313 from nextcloud/ldap-name-change
...
Change LDAP method names
2017-04-13 12:28:24 +02:00
396618fd19
[tx-robot] updated from transifex
2017-04-13 00:08:02 +00:00
229d17e13b
Change LDAP method names
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 10:10:07 -05:00
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
d25a96d921
[tx-robot] updated from transifex
2017-04-10 00:08:50 +00:00
4b0f50c456
[tx-robot] updated from transifex
2017-04-08 00:07:45 +00:00
5fa218051b
unit test adjustment
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-07 18:06:50 +08:00
536650c02f
[tx-robot] updated from transifex
2017-04-07 00:09:11 +00:00
0ea8729d1d
lower case for attributes
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 19:17:24 +08:00
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
33c8bf1857
blizzz comments 03.04.2017
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 16:26:41 +08:00
7d9688c89e
[tx-robot] updated from transifex
2017-04-06 00:07:50 +00:00
84035862f7
[tx-robot] updated from transifex
2017-04-05 00:08:20 +00:00
ec5377306d
[tx-robot] updated from transifex
2017-04-04 00:07:46 +00:00
d56f6399eb
[tx-robot] updated from transifex
2017-04-03 00:08:20 +00:00
0056211672
[tx-robot] updated from transifex
2017-04-02 00:07:48 +00:00
9098042c95
[tx-robot] updated from transifex
2017-04-01 00:08:09 +00:00
bd907a5dac
usertest adjustment
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 17:30:59 +08:00
9ed4fb0494
usertest adjustment
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 16:54:22 +08:00
1853c1ade2
remove redundant tabs
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 15:27:50 +08:00
5e7723f15c
restore ldap_password_renew_pr
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 15:16:22 +08:00
6a6300b1f2
[tx-robot] updated from transifex
2017-03-31 00:08:35 +00:00
70f93bf53a
Merge pull request #4143 from nextcloud/ldap-downstream-64
...
Correctly apply quota
2017-03-30 14:10:21 +02:00
f984cf0987
[tx-robot] updated from transifex
2017-03-30 00:07:41 +00:00
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
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
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
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
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
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
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
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
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
3345a72e7e
Correctly apply quota
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:11 +02:00
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
0e058a9a94
Fix LDAP description
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-03-27 16:30:29 +02:00
0981f9a18a
[tx-robot] updated from transifex
2017-03-26 01:07:03 +00:00
4ea79a5bbe
[tx-robot] updated from transifex
2017-03-25 01:07:45 +00:00
e18d928d9b
[tx-robot] updated from transifex
2017-03-24 01:08:00 +00:00
d551b8e6fd
[tx-robot] updated from transifex
2017-03-22 21:14:04 +00:00
cae8702ab2
[tx-robot] updated from transifex
2017-03-22 01:07:53 +00:00
fd0e42e093
[tx-robot] updated from transifex
2017-03-21 01:08:16 +00:00
5683365a2c
[tx-robot] updated from transifex
2017-03-17 01:07:41 +00:00
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
53195b156c
[tx-robot] updated from transifex
2017-03-02 16:48:52 +00:00
a64c8637d9
[tx-robot] updated from transifex
2017-03-02 01:07:31 +00:00
aecec74a04
[tx-robot] updated from transifex
2017-03-01 01:07:42 +00:00
7fc3129f0c
[tx-robot] updated from transifex
2017-02-28 01:07:54 +00:00
556b958af2
[tx-robot] updated from transifex
2017-02-25 01:25:07 +00:00
97b6c1496e
[tx-robot] updated from transifex
2017-02-24 01:21:37 +00:00
54317e80c0
[tx-robot] updated from transifex
2017-02-23 01:18:48 +00:00
a08dfd9951
[tx-robot] updated from transifex
2017-02-22 01:12:24 +00:00
d754227b4c
[tx-robot] updated from transifex
2017-02-21 01:08:46 +00:00
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
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
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
ce97ab92c6
add tests to DB group
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 20:12:30 +01:00
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
497ee3e3e6
Add repair steps
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 18:45:33 +01:00
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
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
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
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
41276f720b
[tx-robot] updated from transifex
2017-02-15 01:07:29 +00:00
7113af3f91
[tx-robot] updated from transifex
2017-02-14 01:07:20 +00:00
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
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
5e4bbb394c
[tx-robot] updated from transifex
2017-02-07 01:08:50 +00:00
b946ec9d6c
[tx-robot] updated from transifex
2017-02-02 01:07:05 +00:00
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
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
b614547ff8
[tx-robot] updated from transifex
2017-01-28 01:06:59 +00:00
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
feab1e5b94
Merge pull request #3162 from nextcloud/ldap-ocs
...
Part 1 of LDAP Backend OCS Api
2017-01-25 22:45:34 -06:00
6fe3cfa1e3
Merge pull request #3244 from nextcloud/settings-icon
...
Settings icon for LDAP and encryption
2017-01-25 18:43:21 -06:00
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
95ef625a9d
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 11:24:42 +01:00
c3e57d228f
[tx-robot] updated from transifex
2017-01-25 01:10:00 +00:00
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
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
8024f5a17f
[tx-robot] updated from transifex
2017-01-23 00:17:39 +00:00
012e521239
[tx-robot] updated from transifex
2017-01-22 01:07:52 +00:00
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
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
48a3f2a8a2
[tx-robot] updated from transifex
2017-01-20 01:07:41 +00:00
5812e99f1d
Fix app section tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 15:30:40 +01:00
1f7b08bd19
LDAP OCS Api for show config
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 15:19:20 +01:00
f2c9d04eac
test against OCS v2 instead
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 12:48:50 +01:00
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
17a7eaabcd
Add the icons for shipped apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:22 +01:00
18a75bec0d
fix and extend behat tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 10:04:15 +01:00
a515de54e7
LDAP OCS Api for delete config
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 23:17:58 +01:00
689df9a843
LDAP OCS Api for create config
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 21:13:23 +01:00
09a46b7bd6
[tx-robot] updated from transifex
2017-01-12 01:07:43 +00:00
4f9ff96f79
[tx-robot] updated from transifex
2017-01-09 08:24:58 +00:00
d9035e2805
[tx-robot] updated from transifex
2017-01-05 13:09:52 +00:00
2e0cf21f7f
[tx-robot] updated from transifex
2017-01-04 12:09:43 +00:00
fc02564ea6
[tx-robot] updated from transifex
2016-12-30 01:07:28 +00:00
b399ad2fee
[tx-robot] updated from transifex
2016-12-28 01:07:41 +00:00
bd20139f55
[tx-robot] updated from transifex
2016-12-27 01:07:38 +00:00
3fc4e1b5b9
[tx-robot] updated from transifex
2016-12-26 01:09:23 +00:00
f88d615445
Merge pull request #2808 from alantygel/patch-1
...
Translation string corrected > 1 user
2016-12-22 10:04:35 +01:00
0b64e96c9b
[tx-robot] updated from transifex
2016-12-22 01:07:28 +00:00
efff51c7a8
Translation string corrected > 1 user
2016-12-21 16:34:24 -03:00
f50252c7c1
[tx-robot] updated from transifex
2016-12-20 12:02:31 +00:00
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
f86f4eb98d
Merge pull request #2504 from nextcloud/downstream-ldap-15
...
Downstream LDAP Range Support
2016-12-16 16:40:04 +01:00
edec1fafe7
Update app versions and requirements
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
0c6c85bafb
[tx-robot] updated from transifex
2016-12-12 01:07:18 +00:00
74d1b0bada
[tx-robot] updated from transifex
2016-12-08 01:07:26 +00:00
0c8e4b91d3
adjust: sanitizeDN resides in Helper
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:36:20 +01:00
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
6496b95564
range support for LDAP read operations
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:29:16 +01:00
dda39728e3
[tx-robot] updated from transifex
2016-12-05 01:07:41 +00:00
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
e8ea9a5d27
[tx-robot] updated from transifex
2016-11-29 01:06:47 +00:00
4e682d4113
[tx-robot] updated from transifex
2016-11-28 01:06:56 +00:00
9788cf04ee
[tx-robot] updated from transifex
2016-11-27 01:07:08 +00:00
8f4ec8583d
[tx-robot] updated from transifex
2016-11-26 01:06:57 +00:00
4c5e7d270a
Add tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-23 19:58:43 +01:00
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
97af4f762d
[tx-robot] updated from transifex
2016-11-20 01:06:44 +00:00
b1ee9862f8
[tx-robot] updated from transifex
2016-11-19 01:06:44 +00:00
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
ca3616cb58
[tx-robot] updated from transifex
2016-11-05 01:07:14 +00:00
85016977f4
Merge pull request #1935 from nextcloud/downstream-ldap-26
...
Add prefix to the connection
2016-10-31 09:27:09 +01:00
ad597d498d
[tx-robot] updated from transifex
2016-10-28 00:07:11 +00:00
1937e58ec0
Add prefix to the connection
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-27 13:08:09 +02:00
e23a298a81
[tx-robot] updated from transifex
2016-10-25 09:36:09 +00:00
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
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
c4fcd1f282
Update tests for phunit 5.5
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 01:06:45 +02:00
011d5f554c
Harden empty
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 00:53:34 +02:00
9e817e9e0b
symfony replaced table helper by class, fixes two broken LDAP occ commands
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-12 23:47:07 +02:00
7d2f70ef72
Use more IConfig and add unit tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-10 10:51:13 +02:00
bdf4bf4669
DI IConfig into ldap helper
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-10 10:18:18 +02:00
1ba2b7e5d4
Do not query data that is already in the appconfig
...
This is already available. We better use a simple regex.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-10 09:39:20 +02:00
0beecbf2c5
[tx-robot] updated from transifex
2016-10-08 00:06:50 +00:00
a30341823e
cache loginName2UserName and cover the method with unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-07 01:39:57 +02:00
979612fa08
get rid of test warnings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-06 22:53:14 +02:00
82c29e1204
Log the error with display name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-06 11:21:43 +02:00
0ae9a2c9fe
Prevent user with empty uid
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-04 12:26:06 +02:00
da03018add
[tx-robot] updated from transifex
2016-10-01 00:08:23 +00:00
0f321fe116
Merge pull request #1534 from nextcloud/svg-optimization
...
Svgo optimization
2016-09-28 23:05:48 +02:00
e2670e62eb
[tx-robot] updated from transifex
2016-09-28 00:10:20 +00:00
71830b285c
Svgo optimization
...
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
b30c79b63c
[tx-robot] updated from transifex
2016-09-23 00:09:45 +00:00
6a873acf46
[tx-robot] updated from transifex
2016-09-22 00:11:32 +00:00
01cf85e4e5
Fix the User_LDAP app
2016-09-12 16:48:11 +02:00
b992bf2142
[tx-robot] updated from transifex
2016-09-08 00:10:21 +00:00
1110ef52ed
[tx-robot] updated from transifex
2016-09-07 00:09:25 +00:00
5fb2eee5df
Fix getMock user_ldap
2016-09-06 09:29:27 +02:00
5d48809609
[tx-robot] updated from transifex
2016-09-06 00:09:18 +00:00
8b484eedf0
[tx-robot] updated from transifex
2016-09-05 00:09:10 +00:00
1ae4a2f9e4
Merge pull request #1143 from nextcloud/ldap-smells-for-fun-and-profit
...
fix a few minor code smells
2016-09-01 10:09:23 +02:00
4a5cd74fb2
[tx-robot] updated from transifex
2016-09-01 00:09:24 +00:00
013f691fe9
Fix phpdoc
2016-08-29 20:20:17 +02:00
4d31caa6f8
fix a few minor code smells
2016-08-29 14:34:37 +02:00
5b4e752079
Hide the LDAP password in the client side
...
Connection checks will be done by using the configuration id, with the
stored password. LDAP password won't be sent to the client.
2016-08-19 12:23:41 +02:00
ec4d127e58
Merge pull request #905 from nextcloud/invisible_icons
...
Fix icons on App page in FF
2016-08-17 17:24:16 +02:00
39c180117e
[tx-robot] updated from transifex
2016-08-17 13:30:52 +00:00
ba4633b165
Add viewBox to app icons
...
If we don't add a viewbox a lot of browsers will just say NOPE!!! when
we ask them to scale.
2016-08-17 15:23:51 +02:00
0cc8b8b244
[tx-robot] updated from transifex
2016-08-17 00:09:19 +00:00
717e22267a
Merge branch 'master' into implement_712
2016-08-16 18:31:59 +02:00
8c424c7971
[tx-robot] updated from transifex
2016-08-16 00:10:47 +00:00
6c6338b810
Merge branch 'master' into implement_712
2016-08-15 21:55:09 +02:00
Lukas Reschke
Roeland Jago Douma
Nextcloud bot
Arthur Schiwon
Juan Pablo Villafáñez
Morris Jobke
Allan Nordhøy
Joas Schilling
Jarkko Lehtoranta
Roeland Jago Douma
Roger Szabo
Tobias Brunner
bline
Xuanwo
David Toledo
Marius Blüm
Robert Scheck
Brent Bloxam
Andreas Pflug
Alan Tygel
Arthur Schiwon
Victor Dubiniuk
Jörn Friedrich Dreyer
skjnldsv