mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
36,597 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

36597 Commits

Author SHA1 Message Date
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
Morris Jobke 90c5912eec Merge pull request #2980 from nextcloud/backport-2930-kill-group-restriction-when-not-applicable 
[stable11] Remove group restrictions when those are not allowed anymore
 2017-01-10 09:59:57 +01:00
Morris Jobke 97788f1533 Merge pull request #2994 from nextcloud/stable11_2987 
dont write a certificate bundle if the shipped ca bundle is empty
 2017-01-10 09:57:03 +01:00
Christoph Wurst ca81eb01ac Merge pull request #2993 from nextcloud/stable11-rc1 
Increase version to 11.0.1 RC1
 2017-01-09 22:30:52 +01:00
Robin Appelman daa4f393cb
dont write a certificate bundle if the shipped ca bundle is empty 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-09 21:11:50 +01:00
Lukas Reschke 048617a5a5
Increase version to 11.0.1 RC1 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-09 21:11:17 +01:00
Roeland Jago Douma 120009f7a5 Merge pull request #2981 from nextcloud/backport-2854-2fa-redirect-url 
[stable11] Set redirect_url on 2FA challenge page
 2017-01-09 19:37:16 +01:00
Morris Jobke ea8617fc8f Merge pull request #2988 from nextcloud/backport-2933-dont-link-to-oc-forum 
[stable11] Don't link to the oC forum
 2017-01-09 18:38:25 +01:00
Joas Schilling 564740d2d4
Don't link to the oC forum 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-09 14:57:47 +01:00
Christoph Wurst 2625b6297b
Set redirect_url on 2FA challenge page 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-09 10:42:23 +01:00
Joas Schilling f5310c0c26
Remove group restrictions when those are not allowed anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-09 10:21:16 +01:00
Nextcloud bot 639391717d
[tx-robot] updated from transifex 2017-01-09 08:25:08 +00:00
Joas Schilling a3d8442835
Remove warning 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-05 15:16:32 +01:00
Joas Schilling 1179471e41
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-05 15:16:24 +01:00
Joas Schilling 5339d216e3
Make sure the loginname is set when logging in via cookie 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-05 15:16:18 +01:00
Joas Schilling 15d6a13cfb
Use login name to fix password confirm with ldap users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-05 15:16:08 +01: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
Roeland Jago Douma d41721b14e Merge pull request #2882 from nextcloud/stable11-update 
Increase version to 11.0.1
 2016-12-30 21:37:30 +01:00
Nextcloud bot 768f1cf533
[tx-robot] updated from transifex 2016-12-30 01:07:36 +00:00
Lukas Reschke 5bf56f67be
Increase version to 11.0.1 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-29 18:36:31 +01: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
Roeland Jago Douma 64ea055f59 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
 2016-12-22 14:42:15 +01:00
Morris Jobke a581e2fab3 Merge pull request #2751 from nextcloud/backport-2643-apps-buttons-wording 
[stable11] fix wording for apps mgmt buttons
 2016-12-22 14:39:16 +01:00
Morris Jobke b03876ac41 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
 2016-12-22 14:33:41 +01:00
Roeland Jago Douma 1339e51585
Fix overwriting parameter 
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-22 14:02:55 +01:00
Lukas Reschke 40d802549c Merge pull request #2807 from nextcloud/stable11-2273 
[stable11] Add DAV repair step to fix calendar data
 2016-12-22 10:12:54 +01:00
Lukas Reschke 55782a677c Merge pull request #2809 from nextcloud/stable11-2757 
[stable11] Also check in cron for old php version
 2016-12-22 10:07:34 +01:00
Roeland Jago Douma b322078f8f
Also check in cron for old php version 
Fixes #2756

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-21 20:34:46 +01:00
Roeland Jago Douma 3649d86b65
Add DAV repair step to fix calendar data 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-21 20:30:27 +01:00
Morris Jobke cd4b15b5af Merge pull request #2805 from nextcloud/stable11-2714 
[stable11] Changed anchor
 2016-12-21 17:57:41 +01:00
amittel a1779827c5
Changed anchor 
from `avatar` to `personal-settings`

fixes #2711
 2016-12-21 17:09:04 +01:00
Joas Schilling f7ba86884a
Use a form so firefox doesn't try to save the space as a password 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-21 16:55:01 +01:00
Morris Jobke 62cbaa0227 Merge pull request #2793 from nextcloud/stable11-update-drone-images 
[stable11] update drone images to latest version
 2016-12-21 15:52:06 +01:00
Morris Jobke df7c4743f4
[stable11] update drone images to latest version 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-20 23:35:03 +01:00
Jan-Christoph Borchardt c86f779e4a
fix wording for apps mgmt buttons 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-12-19 11:54:38 +01:00
Joas Schilling c4e93cbb49
Only log as info when we can not create a new DB user 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-19 11:51:25 +01:00
Roeland Jago Douma 391f3ea5d9 Merge pull request #2746 from nextcloud/backport-2625 
[stable11] Fix todo list activity filter
 2016-12-19 11:21:07 +01:00
Roeland Jago Douma 29cc292e2a
Fix TodoTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-19 09:48:08 +01:00
Joas Schilling a1210fe5b0
Fix the Todos filter 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-19 09:47:11 +01:00