Bjoern Schiessle
|
659320dfca
|
unify endpoints form core and the the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
|
2017-01-25 14:19:41 +01:00 |
|
Bjoern Schiessle
|
c4ae0cd433
|
add data from the users profile to the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
|
2017-01-25 14:17:18 +01: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 |
|
Joas Schilling
|
275db05a46
|
Merge pull request #2953 from nextcloud/backport-2797-sudo-password-with-ldap
[stable11] Use login name to fix password confirm with ldap users
|
2017-01-23 12:09:38 +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 |
|
Christoph Wurst
|
ecb6354933
|
Merge pull request #3138 from nextcloud/backport-2776-prevent-quotes-from-being-a-problem
[stable11] Escape the name for the jquery selector
|
2017-01-18 17:52:56 +01:00 |
|
Morris Jobke
|
98aa4557f6
|
Merge pull request #3143 from senden9/patch-2
Fix style in comment.
|
2017-01-18 10:33:25 -06:00 |
|
Stefano Probst
|
90bd4b1fc1
|
Fix style in comment.
Add missing grave accent to fix the highlighting in the documentation.
|
2017-01-18 16:42:11 +01: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
|
6eb31b5639
|
Merge pull request #3117 from nextcloud/backport-1594-markdown-support-for-app-descriptions
[stable11] Markdown support for app descriptions
|
2017-01-17 16:32:13 +01:00 |
|
Morris Jobke
|
4158f386b5
|
add a bit of space around paragraphs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-01-17 11:38:09 +01:00 |
|
Morris Jobke
|
bc604299b5
|
fix list style of app description
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-01-17 11:37:50 +01:00 |
|
Joas Schilling
|
e05f53e018
|
Allow ordered lists as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
2017-01-17 11:37:37 +01:00 |
|
Lukas Reschke
|
a30d170aca
|
Manually whitelist tags
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
|
2017-01-17 11:37:26 +01:00 |
|
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 |
|