diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-06-20 09:31:13 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-06-20 09:31:13 +0300 |
commit | 732914c71f7a73b5b47549330ecbad1b00667463 (patch) | |
tree | d07801b3fa7256a25ec0d583a5325b0f626efd6e | |
parent | beb59414c7bbbaf8a9fb797abd20ad9fc68bf217 (diff) | |
parent | d934401379d89d7aeadc2d884b6bd6d9a4e3e542 (diff) | |
download | wekan-732914c71f7a73b5b47549330ecbad1b00667463.tar.gz wekan-732914c71f7a73b5b47549330ecbad1b00667463.tar.bz2 wekan-732914c71f7a73b5b47549330ecbad1b00667463.zip |
Merge branch 'GhassenRjab-edit-card-desc' into devel
Edit card description with invalid markdown. Thanks to GhassenRjab ! Closes #1039
-rw-r--r-- | CHANGELOG.md | 3 | ||||
-rw-r--r-- | client/components/main/layouts.styl | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e870d4c..a3511d1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,8 @@ and fixes the following bugs: * [Fix IE 11 drag board to scroll](https://github.com/wekan/wekan/pull/1052); * [Fix Export Wekan board](https://github.com/wekan/wekan/pull/1067); * [Fix "W" shortcut binding](https://github.com/wekan/wekan/pull/1066); -* [Fix login url in invitation email](https://github.com/wekan/wekan/issues/993). +* [Fix login url in invitation email](https://github.com/wekan/wekan/issues/993); +* [Edit card description with invalid markdown](https://github.com/wekan/wekan/pull/1073). Thanks to GitHub users BaobabCoder, GhassenRjab, nebulade, nztqa and xet7 for their contributions. diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl index 349ee743..ee87a5f8 100644 --- a/client/components/main/layouts.styl +++ b/client/components/main/layouts.styl @@ -335,6 +335,8 @@ a margin-left: 38px .viewer + min-height: 18px + ol list-style-type: decimal padding-left: 20px |