OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,025 Commits
223 Branches
563 Tags
445 MiB
Commit Graph

10025 Commits (edc8264cff0ee7110d786d76961b59a55830380c)

Author SHA1 Message Date
Matthew Hodgson edc8264cff shift to custom slate-md-serializer 2018-05-23 02:48:57 +01:00
Matthew Hodgson fc1c4996fc slate-md-serializer 3.1.0 now escapes correctly 2018-05-23 02:15:34 +01:00
Matthew Hodgson 6fba8311f9 escape blockquotes correctly 
and fix NPE
 2018-05-23 02:09:37 +01:00
Matthew Hodgson 6ac2324874 fix wordwrap and pre formatting 2018-05-23 01:43:03 +01:00
Matthew Hodgson 794a60b9f8 refocus editor immediately after executing commands 
and persist selections correctly across blur/focus
 2018-05-23 01:36:21 +01:00
Matthew Hodgson e7a4ffaf45 fix emojioneifying autoconverted emoji 2018-05-23 00:52:00 +01:00
Matthew Hodgson cace5e8bfc fix bug where selection breaks after inserting emoji 2018-05-23 00:41:46 +01:00
Matthew Hodgson 11cea61661 refocus editor after clicking on autocompletes 2018-05-21 12:28:08 +01:00
Matthew Hodgson 7de45f8b7b make quoting work 2018-05-21 03:48:59 +01:00
Matthew Hodgson 4439a04689 fix lint 2018-05-20 23:43:42 +01:00
Matthew Hodgson b616fd025e comment out all the tests for now 2018-05-20 23:34:06 +01:00
Matthew Hodgson e460cf35e0 hide formatting bar for MD editor 2018-05-20 22:48:40 +01:00
Matthew Hodgson f981d7b729 unify buttons on the node type names, and make them work 2018-05-20 22:39:40 +01:00
Matthew Hodgson d799b7e424 refactor roundtripping into a single place 
and fix isRichTextEnabled to be correctly camelCased everywhere...
 2018-05-20 16:30:39 +01:00
Matthew Hodgson aac6866779 switch back to using commonmark for serialising MD when roundtripping 
and escape MD correctly when serialising via slate-md-serializer
 2018-05-20 14:33:14 +01:00
Matthew Hodgson 9aba046f21 fix MD pill serialization 2018-05-20 14:32:20 +01:00
Matthew Hodgson c5676eef89 comment out more old draft stuff 2018-05-20 14:32:06 +01:00
Matthew Hodgson ad7782bc22 remove the remaining Draft specific stuff from RichText 2018-05-20 14:07:33 +01:00
Matthew Hodgson e9cabf0e85 add pill and emoji serialisation to Md 2018-05-20 03:17:51 +01:00
Matthew Hodgson a0d88a829d support sending inlines from the RTE. 
includes a horrific hack for sending emoji until
https://github.com/ianstormtaylor/slate/pull/1854 is merged
or otherwise solved
 2018-05-20 02:53:32 +01:00
Matthew Hodgson d76a2aba9b use <p/> as our root node everywhere and fix blank roundtrip bug 2018-05-20 01:07:25 +01:00
Matthew Hodgson c3a6a41e5d support links in RTE 2018-05-20 00:49:29 +01:00
Matthew Hodgson f2116943c8 switch schema to match the MD serializer 2018-05-20 00:17:11 +01:00
Matthew Hodgson 117519566e remove HRs from H1/H2s 2018-05-19 23:40:48 +01:00
Matthew Hodgson 65f0b05719 fix typo 2018-05-19 23:40:22 +01:00
Matthew Hodgson 572a31334f add h4, h5 and h6 2018-05-19 23:34:30 +01:00
Matthew Hodgson 1f05aea884 make HTML pasting work 2018-05-19 23:33:07 +01:00
Matthew Hodgson 1536ab433a make file pasting work again 2018-05-19 22:05:31 +01:00
Matthew Hodgson d426c3474f fix strikethough & code, improve shift-return & backspace 2018-05-19 21:36:22 +01:00
Matthew Hodgson 58670cc3e5 exit list more sanely on backspace 2018-05-19 21:14:39 +01:00
Matthew Hodgson a4d9338cf0 let backspace delete list nodes in RTE 2018-05-19 20:38:07 +01:00
Matthew Hodgson 167742d900 make RTE sending work 2018-05-19 20:28:38 +01:00
Matthew Hodgson 4972a234c4 Merge branch 'develop' into matthew/slate 2018-05-19 12:58:43 +01:00
Matthew Hodgson 089ac337f4 remove unused html serializer 2018-05-18 15:22:24 +01:00
David Baker 6d2d7bb287
Merge pull request #1908 from matrix-org/luke/fix-start-chat-error 
Specify valid address types to "Start a chat" dialog
 2018-05-18 10:47:54 +01:00
David Baker 5952de772b
Merge pull request #1906 from matrix-org/luke/opt-in-analytics 
Implement opt-in analytics with cookie bar
 2018-05-18 10:44:53 +01:00
Luke Barnard 3e79c3e8a5
Merge pull request #1910 from MazeChaZer/fix-emoji-line-break-bug 
Fix vector-im/riot-web#6523 Emoji rendering destroys paragraphs
 2018-05-18 10:42:20 +01:00
Jonas Schürmann 4a9f4ba5eb Fix vector-im/riot-web#6523 Emoji rendering destroys paragraphs 
This regression was probably introduced in
4f4441fb07 and is caused by the fact that
the variable `isHtml` conflates two different meanings:

- The event contains an HTML message
- The event message is displayed using HTML

This is an important difference. Plain text messages that contain
emojies are rendered with an HTML string and thus have to be sanitized
etc. But they must not use the MarkDown CSS styles for HTML messages.

The MarkDown CSS styles include `whitespace: normal` because HTML events
use `<br/>`-tags for line breaks. Plain text messages with emojies
obviously don't use `<br/>`-tags, so these styles must not be applied.

Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
 2018-05-17 20:12:51 +02:00
David Baker fa7f6c2c4c v0.12.5 2018-05-17 17:04:39 +01:00
David Baker 43dbf306b0 Prepare changelog for v0.12.5 2018-05-17 17:04:38 +01:00
Luke Barnard cc87b73de2
Merge pull request #1909 from matrix-org/dbkr/fix_image_size_jump 
Fix image size jumping regression
 2018-05-17 16:56:51 +01:00
David Baker a7006307bf Call afterComponentDidMount() after componentDidMount 2018-05-17 16:50:16 +01:00
David Baker e53497421e Fix image size jumping regression 
Fixes https://github.com/vector-im/riot-web/issues/6654
 2018-05-17 16:47:17 +01:00
Matthew Hodgson e51554c626 actually hook up RTE 2018-05-17 02:13:17 +01:00
Matthew Hodgson ae208da805 nudge towards supporting formatting buttons in MD 2018-05-17 00:01:23 +01:00
Luke Barnard fb79c57ec6 Specify valid address types to "Start a chat" dialog 
fixes https://github.com/vector-im/riot-web/issues/5459
 2018-05-16 18:57:53 +01:00
Luke Barnard 445badf4fc Merge branch 'luke/opt-in-analytics' of github.com:matrix-org/matrix-react-sdk into luke/opt-in-analytics 2018-05-16 15:58:04 +01:00
Luke Barnard 0bda607bb2 Only show cookie bar if analytics configured 2018-05-16 15:53:43 +01:00
Luke Barnard d15051a635 Add policyLink configuration to piwik 
Also:
 - Make CookieBar ES6 class
 - Alter phrasing on CookieBar
 - Conditionaly display longer "...(See our ++cookie and privacy
   policies++)." if policy link is configured.
 2018-05-16 15:49:23 +01:00
Luke Barnard 4e6594d64b Allow arbitrary hrefs for cookie/privacy links 2018-05-16 15:20:38 +01:00