Commit Graph

15158 Commits

Author SHA1 Message Date
Nextcloud bot dfe4491b00
[tx-robot] updated from transifex 2017-02-08 01:07:18 +00:00
Morris Jobke 2c4f8089b0 Merge pull request #3363 from nextcloud/fix/2787/busy_also_for_creator_bug_stable11
fix shared-as-busy events for owner
2017-02-07 16:03:41 -06:00
Joas Schilling 0cb057e256
Fix Sharing app description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 14:34:48 +01:00
Nextcloud bot cd82be929d
[tx-robot] updated from transifex 2017-02-07 01:09:03 +00:00
Nextcloud bot aa124646d2
[tx-robot] updated from transifex 2017-02-06 01:07:13 +00:00
Nextcloud bot 335f2087a3
[tx-robot] updated from transifex 2017-02-05 01:07:13 +00:00
Nextcloud bot 69f0bfb2c1
[tx-robot] updated from transifex 2017-02-04 01:07:29 +00:00
Georg Ehrke d398de5c6a
fix shared-as-busy events for owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-02-03 11:08:13 +01:00
Nextcloud bot 8d12c43556
[tx-robot] updated from transifex 2017-02-03 01:07:30 +00:00
Nextcloud bot d71e472ab6
[tx-robot] updated from transifex 2017-02-02 01:07:13 +00:00
Nextcloud bot 44264daa42
[tx-robot] updated from transifex 2017-02-01 01:07:06 +00:00
Nextcloud bot 97a4688580
[tx-robot] updated from transifex 2017-01-31 01:07:13 +00:00
Nextcloud bot 6ab21c2e94
[tx-robot] updated from transifex 2017-01-30 01:07:22 +00:00
Nextcloud bot ea51c2fc12
[tx-robot] updated from transifex 2017-01-29 01:07:03 +00:00
Nextcloud bot 89cd31bd0f
[tx-robot] updated from transifex 2017-01-28 01:07:09 +00:00
Nextcloud bot edb9d83658
[tx-robot] updated from transifex 2017-01-27 01:07:28 +00:00
Morris Jobke 475e466d58 Merge pull request #3213 from nextcloud/ldap-ocs-stable11
[stable] 11 LDAP OCS API
2017-01-25 22:50:27 -06:00
Nextcloud bot 6b3ddd5ccd
[tx-robot] updated from transifex 2017-01-26 01:07:27 +00:00
Nextcloud bot 026ceab35f
[tx-robot] updated from transifex 2017-01-25 01:10:10 +00:00
Nextcloud bot 175435c76b
[tx-robot] updated from transifex 2017-01-24 01:07:25 +00:00
Arthur Schiwon 9299c9fc79
LDAP OCS API (Part 1)
LDAP OCS Api for create config

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

LDAP OCS Api for delete config

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

fix and extend behat tests

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

add LDAP OCS Api for modifying a configuration

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

test against OCS v2 instead

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

LDAP OCS Api for show config

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

also, let ldap integration tests run

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

fix indentation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

enable user_ldap app for tests

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

LDAP PUT command now supports setting multiple keys at once

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

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>

remove outdated scenario

covered by "Delete a non-existing configuration"

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-23 14:24:10 +01:00
Nextcloud bot 34fff32409
[tx-robot] updated from transifex 2017-01-23 00:17:48 +00:00
Nextcloud bot 948ab09a18
[tx-robot] updated from transifex 2017-01-22 01:08:00 +00:00
Nextcloud bot 8c4a329b6d
[tx-robot] updated from transifex 2017-01-21 01:07:55 +00:00
Nextcloud bot f6b42901dc
[tx-robot] updated from transifex 2017-01-20 01:07:49 +00:00
Nextcloud bot 623ea04317
[tx-robot] updated from transifex 2017-01-19 01:08:17 +00:00
Joas Schilling d17635b502
Escape the name for the jquery selector
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 09:08:13 +01:00
Nextcloud bot 0c8220d57e
[tx-robot] updated from transifex 2017-01-18 01:07:47 +00:00
Joas Schilling 832007a993
Fix "broken" app descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:40 +01:00
Nextcloud bot cbc76a1ccb
[tx-robot] updated from transifex 2017-01-17 01:08:03 +00:00
Bjoern Schiessle 84ae958c12
generate correct path for owner and use the display name instead of the user id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-16 12:31:09 +01:00
Nextcloud bot f044edaadc
[tx-robot] updated from transifex 2017-01-16 01:15:59 +00:00
Nextcloud bot fc2a2c3ee9
[tx-robot] updated from transifex 2017-01-12 01:07:53 +00:00
Nextcloud bot 685381f3a1
[tx-robot] updated from transifex 2017-01-11 15:20:31 +00:00
Joas Schilling 73e93d11c2
Make sure the used event type and the setting/filter are the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:34:13 +01:00
Nextcloud bot 639391717d
[tx-robot] updated from transifex 2017-01-09 08:25:08 +00:00
Nextcloud bot 2c2c4cc6c7
[tx-robot] updated from transifex 2017-01-05 13:10:01 +00:00
Morris Jobke 7f648905b3 Merge pull request #2949 from nextcloud/backport-2677-fix-avatars-in-mail
[stable11] Don't set Content-Disposition header if one already exists
2017-01-05 13:27:34 +01:00
Lukas Reschke adef282c44
Don't set Content-Disposition header if one already exists
If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients.

Fixes https://github.com/nextcloud/server/issues/1992

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-05 12:22:27 +01:00
Nextcloud bot 4f8329c95a
[tx-robot] updated from transifex 2017-01-04 12:09:51 +00:00
Nextcloud bot 14bc90df9e
[tx-robot] updated from transifex 2017-01-03 01:07:56 +00:00
Nextcloud bot c9039a59aa
[tx-robot] updated from transifex 2017-01-02 01:07:41 +00:00
Nextcloud bot 93d0cb220a
[tx-robot] updated from transifex 2017-01-01 01:07:38 +00:00
Nextcloud bot fba1008d19
[tx-robot] updated from transifex 2016-12-31 01:08:44 +00:00
Nextcloud bot 768f1cf533
[tx-robot] updated from transifex 2016-12-30 01:07:36 +00:00
Nextcloud bot a2b45c3cb7
[tx-robot] updated from transifex 2016-12-29 01:08:08 +00:00
Nextcloud bot a4c85c76a9
[tx-robot] updated from transifex 2016-12-28 01:07:49 +00:00
Nextcloud bot ca6d8c5eba
[tx-robot] updated from transifex 2016-12-27 01:07:48 +00:00
Nextcloud bot 015408fc3a
[tx-robot] updated from transifex 2016-12-26 01:09:33 +00:00
Morris Jobke 43dcc686bd Merge pull request #2825 from nextcloud/stable11-2659
[stable11] Fix overwriting parameter
2016-12-22 14:47:40 +01:00