]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoFix tests 3400/head
Joas Schilling [Thu, 12 Jan 2017 09:49:22 +0000 (10:49 +0100)]
Fix tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFilter out sensitive appconfig values
Joas Schilling [Wed, 11 Jan 2017 10:42:36 +0000 (11:42 +0100)]
Filter out sensitive appconfig values

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 7 Feb 2017 01:09:03 +0000 (01:09 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 6 Feb 2017 01:07:13 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 5 Feb 2017 01:07:13 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 4 Feb 2017 01:07:29 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 3 Feb 2017 01:07:30 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 2 Feb 2017 01:07:13 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 1 Feb 2017 01:07:06 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 31 Jan 2017 01:07:13 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 30 Jan 2017 01:07:22 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 29 Jan 2017 01:07:03 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 28 Jan 2017 01:07:09 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 27 Jan 2017 01:07:28 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3213 from nextcloud/ldap-ocs-stable11
Morris Jobke [Thu, 26 Jan 2017 04:50:27 +0000 (22:50 -0600)]
Merge pull request #3213 from nextcloud/ldap-ocs-stable11

[stable] 11 LDAP OCS API

7 years agoMerge pull request #3115 from nextcloud/backport-3106-spreed-calls-are-objects
Morris Jobke [Thu, 26 Jan 2017 04:07:32 +0000 (22:07 -0600)]
Merge pull request #3115 from nextcloud/backport-3106-spreed-calls-are-objects

[stable11] Define spreed calls

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 26 Jan 2017 01:07:27 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 25 Jan 2017 01:10:10 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 24 Jan 2017 01:07:25 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoLDAP OCS API (Part 1) 3213/head
Arthur Schiwon [Wed, 18 Jan 2017 20:13:23 +0000 (21:13 +0100)]
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>
7 years agoMerge pull request #2953 from nextcloud/backport-2797-sudo-password-with-ldap
Joas Schilling [Mon, 23 Jan 2017 11:09:38 +0000 (12:09 +0100)]
Merge pull request #2953 from nextcloud/backport-2797-sudo-password-with-ldap

[stable11] Use login name to fix password confirm with ldap users

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 23 Jan 2017 00:17:48 +0000 (00:17 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 22 Jan 2017 01:08:00 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 21 Jan 2017 01:07:55 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 20 Jan 2017 01:07:49 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 19 Jan 2017 01:08:17 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3138 from nextcloud/backport-2776-prevent-quotes-from-being-a...
Christoph Wurst [Wed, 18 Jan 2017 16:52:56 +0000 (17:52 +0100)]
Merge pull request #3138 from nextcloud/backport-2776-prevent-quotes-from-being-a-problem

[stable11] Escape the name for the jquery selector

7 years agoMerge pull request #3143 from senden9/patch-2
Morris Jobke [Wed, 18 Jan 2017 16:33:25 +0000 (10:33 -0600)]
Merge pull request #3143 from senden9/patch-2

Fix style in comment.

7 years agoFix style in comment. 3143/head
Stefano Probst [Wed, 18 Jan 2017 15:42:11 +0000 (16:42 +0100)]
Fix style in comment.

Add missing grave accent to fix the highlighting in the documentation.

7 years agoEscape the name for the jquery selector 3138/head
Joas Schilling [Tue, 20 Dec 2016 08:32:47 +0000 (09:32 +0100)]
Escape the name for the jquery selector

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 18 Jan 2017 01:07:47 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3117 from nextcloud/backport-1594-markdown-support-for-app-descri...
Joas Schilling [Tue, 17 Jan 2017 15:32:13 +0000 (16:32 +0100)]
Merge pull request #3117 from nextcloud/backport-1594-markdown-support-for-app-descriptions

[stable11] Markdown support for app descriptions

7 years agoadd a bit of space around paragraphs 3117/head
Morris Jobke [Tue, 17 Jan 2017 04:25:27 +0000 (22:25 -0600)]
add a bit of space around paragraphs

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agofix list style of app description
Morris Jobke [Tue, 17 Jan 2017 04:22:05 +0000 (22:22 -0600)]
fix list style of app description

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAllow ordered lists as well
Joas Schilling [Mon, 16 Jan 2017 14:00:54 +0000 (15:00 +0100)]
Allow ordered lists as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoManually whitelist tags
Lukas Reschke [Fri, 13 Jan 2017 17:46:41 +0000 (18:46 +0100)]
Manually whitelist tags

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoApply DOMPurify over HTML
Lukas Reschke [Fri, 13 Jan 2017 17:30:43 +0000 (18:30 +0100)]
Apply DOMPurify over HTML

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix JSUnit tests
Morris Jobke [Wed, 11 Jan 2017 16:08:52 +0000 (17:08 +0100)]
Fix JSUnit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix tests
Joas Schilling [Wed, 11 Jan 2017 09:57:26 +0000 (10:57 +0100)]
Fix tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't render non HTTP links, images and quotes
Joas Schilling [Thu, 15 Dec 2016 16:07:07 +0000 (17:07 +0100)]
Don't render non HTTP links, images and quotes

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix "broken" app descriptions
Joas Schilling [Fri, 30 Sep 2016 12:41:55 +0000 (14:41 +0200)]
Fix "broken" app descriptions

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRemove the magic parsing of the description
Joas Schilling [Fri, 30 Sep 2016 12:41:37 +0000 (14:41 +0200)]
Remove the magic parsing of the description

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRender markdown
Joas Schilling [Fri, 30 Sep 2016 12:41:19 +0000 (14:41 +0200)]
Render markdown

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd marked
Joas Schilling [Fri, 30 Sep 2016 11:52:41 +0000 (13:52 +0200)]
Add marked

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd call-type in case the information shall be used for styling or something else... 3115/head
Joas Schilling [Tue, 17 Jan 2017 09:08:02 +0000 (10:08 +0100)]
Add call-type in case the information shall be used for styling or something else in the future

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDefine spreed calls
Joas Schilling [Mon, 16 Jan 2017 17:41:00 +0000 (18:41 +0100)]
Define spreed calls

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 17 Jan 2017 01:08:03 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3080 from nextcloud/share-by-mail-use-display-name-stable11
Morris Jobke [Mon, 16 Jan 2017 17:02:23 +0000 (11:02 -0600)]
Merge pull request #3080 from nextcloud/share-by-mail-use-display-name-stable11

[stable11] generate correct path for owner and use the display name

7 years agoMerge pull request #3063 from nextcloud/backport-3051-change-row-format-before-collation
Morris Jobke [Mon, 16 Jan 2017 16:45:10 +0000 (10:45 -0600)]
Merge pull request #3063 from nextcloud/backport-3051-change-row-format-before-collation

[stable11] Change the row-format before changing the collation

7 years agogenerate correct path for owner and use the display name instead of the user id 3080/head
Bjoern Schiessle [Wed, 11 Jan 2017 17:11:27 +0000 (18:11 +0100)]
generate correct path for owner and use the display name instead of the user id

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 16 Jan 2017 01:15:59 +0000 (01:15 +0000)]
[tx-robot] updated from transifex

7 years agoBump to 11.0.1 v11.0.1
Lukas Reschke [Sun, 15 Jan 2017 15:49:00 +0000 (16:49 +0100)]
Bump to 11.0.1

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoChange the row-format before changing the collation 3063/head
Joas Schilling [Thu, 12 Jan 2017 15:54:29 +0000 (16:54 +0100)]
Change the row-format before changing the collation

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 12 Jan 2017 01:07:53 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 11 Jan 2017 15:20:31 +0000 (15:20 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3010 from nextcloud/backport-3009-fix-calendar-todo-event-type
Joas Schilling [Tue, 10 Jan 2017 15:49:23 +0000 (16:49 +0100)]
Merge pull request #3010 from nextcloud/backport-3009-fix-calendar-todo-event-type

[stable11] Make sure the used event type and the setting/filter are the same

7 years agoMerge pull request #3011 from nextcloud/backport-2951-handle-nextcloud-log-type-grace...
Roeland Jago Douma [Tue, 10 Jan 2017 14:47:33 +0000 (15:47 +0100)]
Merge pull request #3011 from nextcloud/backport-2951-handle-nextcloud-log-type-gracefully

[stable11] Handle log_type "nextcloud" more gracefully

7 years agoBetter fallback for unknown log types 3011/head
Joas Schilling [Tue, 10 Jan 2017 11:58:23 +0000 (12:58 +0100)]
Better fallback for unknown log types

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd tests
Joas Schilling [Mon, 9 Jan 2017 09:55:40 +0000 (10:55 +0100)]
Add tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoHandle log_type "nextcloud" more gracefully
Joas Schilling [Thu, 5 Jan 2017 11:47:27 +0000 (12:47 +0100)]
Handle log_type "nextcloud" more gracefully

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMake sure the used event type and the setting/filter are the same 3010/head
Joas Schilling [Tue, 10 Jan 2017 11:28:55 +0000 (12:28 +0100)]
Make sure the used event type and the setting/filter are the same

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2980 from nextcloud/backport-2930-kill-group-restriction-when... v11.0.1RC1
Morris Jobke [Tue, 10 Jan 2017 08:59:57 +0000 (09:59 +0100)]
Merge pull request #2980 from nextcloud/backport-2930-kill-group-restriction-when-not-applicable

[stable11] Remove group restrictions when those are not allowed anymore

7 years agoMerge pull request #2994 from nextcloud/stable11_2987
Morris Jobke [Tue, 10 Jan 2017 08:57:03 +0000 (09:57 +0100)]
Merge pull request #2994 from nextcloud/stable11_2987

dont write a certificate bundle if the shipped ca bundle is empty

7 years agoMerge pull request #2993 from nextcloud/stable11-rc1
Christoph Wurst [Mon, 9 Jan 2017 21:30:52 +0000 (22:30 +0100)]
Merge pull request #2993 from nextcloud/stable11-rc1

Increase version to 11.0.1 RC1

7 years agodont write a certificate bundle if the shipped ca bundle is empty 2994/head
Robin Appelman [Mon, 9 Jan 2017 13:26:31 +0000 (14:26 +0100)]
dont write a certificate bundle if the shipped ca bundle is empty

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoIncrease version to 11.0.1 RC1 2993/head
Lukas Reschke [Mon, 9 Jan 2017 20:11:17 +0000 (21:11 +0100)]
Increase version to 11.0.1 RC1

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2981 from nextcloud/backport-2854-2fa-redirect-url
Roeland Jago Douma [Mon, 9 Jan 2017 18:37:16 +0000 (19:37 +0100)]
Merge pull request #2981 from nextcloud/backport-2854-2fa-redirect-url

[stable11] Set redirect_url on 2FA challenge page

7 years agoMerge pull request #2988 from nextcloud/backport-2933-dont-link-to-oc-forum
Morris Jobke [Mon, 9 Jan 2017 17:38:25 +0000 (18:38 +0100)]
Merge pull request #2988 from nextcloud/backport-2933-dont-link-to-oc-forum

[stable11] Don't link to the oC forum

7 years agoDon't link to the oC forum 2988/head
Joas Schilling [Wed, 4 Jan 2017 11:44:10 +0000 (12:44 +0100)]
Don't link to the oC forum

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoSet redirect_url on 2FA challenge page 2981/head
Christoph Wurst [Fri, 23 Dec 2016 19:53:26 +0000 (20:53 +0100)]
Set redirect_url on 2FA challenge page

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoRemove group restrictions when those are not allowed anymore 2980/head
Joas Schilling [Wed, 4 Jan 2017 09:40:14 +0000 (10:40 +0100)]
Remove group restrictions when those are not allowed anymore

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 9 Jan 2017 08:25:08 +0000 (08:25 +0000)]
[tx-robot] updated from transifex

7 years agoRemove warning 2953/head
Joas Schilling [Thu, 5 Jan 2017 11:17:01 +0000 (12:17 +0100)]
Remove warning

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix tests
Joas Schilling [Thu, 5 Jan 2017 11:16:50 +0000 (12:16 +0100)]
Fix tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMake sure the loginname is set when logging in via cookie
Joas Schilling [Wed, 21 Dec 2016 09:53:20 +0000 (10:53 +0100)]
Make sure the loginname is set when logging in via cookie

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse login name to fix password confirm with ldap users
Joas Schilling [Wed, 21 Dec 2016 08:51:21 +0000 (09:51 +0100)]
Use login name to fix password confirm with ldap users

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 5 Jan 2017 13:10:01 +0000 (13:10 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2949 from nextcloud/backport-2677-fix-avatars-in-mail
Morris Jobke [Thu, 5 Jan 2017 12:27:34 +0000 (13:27 +0100)]
Merge pull request #2949 from nextcloud/backport-2677-fix-avatars-in-mail

[stable11] Don't set Content-Disposition header if one already exists

7 years agoDon't set Content-Disposition header if one already exists 2949/head
Lukas Reschke [Wed, 14 Dec 2016 16:35:27 +0000 (17:35 +0100)]
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>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 4 Jan 2017 12:09:51 +0000 (12:09 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 3 Jan 2017 01:07:56 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 2 Jan 2017 01:07:41 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 1 Jan 2017 01:07:38 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 31 Dec 2016 01:08:44 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2882 from nextcloud/stable11-update
Roeland Jago Douma [Fri, 30 Dec 2016 20:37:30 +0000 (21:37 +0100)]
Merge pull request #2882 from nextcloud/stable11-update

Increase version to 11.0.1

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 30 Dec 2016 01:07:36 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoIncrease version to 11.0.1 2882/head
Lukas Reschke [Thu, 29 Dec 2016 15:27:31 +0000 (16:27 +0100)]
Increase version to 11.0.1

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 29 Dec 2016 01:08:08 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 28 Dec 2016 01:07:49 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 27 Dec 2016 01:07:48 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 26 Dec 2016 01:09:33 +0000 (01:09 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2825 from nextcloud/stable11-2659
Morris Jobke [Thu, 22 Dec 2016 13:47:40 +0000 (14:47 +0100)]
Merge pull request #2825 from nextcloud/stable11-2659

[stable11] Fix overwriting parameter

7 years agoMerge pull request #2804 from nextcloud/backport-2752-firefox-password-completion
Roeland Jago Douma [Thu, 22 Dec 2016 13:42:15 +0000 (14:42 +0100)]
Merge pull request #2804 from nextcloud/backport-2752-firefox-password-completion

[stable11] Use a form so firefox doesn't try to save the space as a password

7 years agoMerge pull request #2751 from nextcloud/backport-2643-apps-buttons-wording
Morris Jobke [Thu, 22 Dec 2016 13:39:16 +0000 (14:39 +0100)]
Merge pull request #2751 from nextcloud/backport-2643-apps-buttons-wording

[stable11] fix wording for apps mgmt buttons

7 years agoMerge pull request #2750 from nextcloud/backport-2671-reduce-log-level-on-database...
Morris Jobke [Thu, 22 Dec 2016 13:33:41 +0000 (14:33 +0100)]
Merge pull request #2750 from nextcloud/backport-2671-reduce-log-level-on-database-user-creation

[stable11] Only log as info when we can not create a new DB user

7 years agoFix overwriting parameter 2825/head
Roeland Jago Douma [Tue, 13 Dec 2016 21:28:09 +0000 (22:28 +0100)]
Fix overwriting parameter

Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2807 from nextcloud/stable11-2273
Lukas Reschke [Thu, 22 Dec 2016 09:12:54 +0000 (10:12 +0100)]
Merge pull request #2807 from nextcloud/stable11-2273

[stable11] Add DAV repair step to fix calendar data

7 years agoMerge pull request #2809 from nextcloud/stable11-2757
Lukas Reschke [Thu, 22 Dec 2016 09:07:34 +0000 (10:07 +0100)]
Merge pull request #2809 from nextcloud/stable11-2757

[stable11] Also check in cron for old php version

7 years agoAlso check in cron for old php version 2809/head
Roeland Jago Douma [Mon, 19 Dec 2016 14:29:52 +0000 (15:29 +0100)]
Also check in cron for old php version

Fixes #2756

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd DAV repair step to fix calendar data 2807/head
Roeland Jago Douma [Wed, 23 Nov 2016 10:51:32 +0000 (11:51 +0100)]
Add DAV repair step to fix calendar data

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>