Commit Graph

36415 Commits

Author SHA1 Message Date
Lukas Reschke 2382bf9011
Apply DOMPurify over HTML
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-17 11:37:16 +01:00
Morris Jobke 45c12d26ce
Fix JSUnit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-17 11:37:06 +01:00
Joas Schilling 964d7b2389
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:57 +01:00
Joas Schilling a21dfdf8e7
Don't render non HTTP links, images and quotes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:49 +01:00
Joas Schilling 832007a993
Fix "broken" app descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:40 +01:00
Joas Schilling de1a89a12b
Remove the magic parsing of the description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:32 +01:00
Joas Schilling eb94f748c8
Render markdown
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:23 +01:00
Joas Schilling 33644d9da3
Add marked
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:10 +01:00
Nextcloud bot cbc76a1ccb
[tx-robot] updated from transifex 2017-01-17 01:08:03 +00:00
Morris Jobke d27f36f5d3 Merge pull request #3080 from nextcloud/share-by-mail-use-display-name-stable11
[stable11] generate correct path for owner and use the display name
2017-01-16 11:02:23 -06:00
Morris Jobke 88cb3c7cbd Merge pull request #3063 from nextcloud/backport-3051-change-row-format-before-collation
[stable11] Change the row-format before changing the collation
2017-01-16 10:45:10 -06: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
Lukas Reschke 34e7a72257
Bump to 11.0.1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-15 16:49:00 +01:00
Joas Schilling b7117d0b10
Change the row-format before changing the collation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 14:35:02 +01: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 fb4224c723 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
2017-01-10 16:49:23 +01:00
Roeland Jago Douma 0474abe5c7 Merge pull request #3011 from nextcloud/backport-2951-handle-nextcloud-log-type-gracefully
[stable11] Handle log_type "nextcloud" more gracefully
2017-01-10 15:47:33 +01:00
Joas Schilling 78e685ce8f
Better fallback for unknown log types
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 13:01:00 +01:00
Joas Schilling acf62afe2d
Add tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 13:00:47 +01:00
Joas Schilling b61486efca
Handle log_type "nextcloud" more gracefully
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 13:00:35 +01: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
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
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