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
Luke Barnard
d01e738839
Fix UserSettings for new analyticsOptIn
2018-05-16 15:20:38 +01:00
Luke Barnard
aa4bbbc3db
Remove cookie bar setting from UserSettings
2018-05-16 15:20:38 +01:00
Luke Barnard
ac1cd384e7
Implement opt-in analytics with cookie bar
2018-05-16 15:20:38 +01:00
David Baker
bf0ec249b6
v0.12.4
2018-05-16 11:49:06 +01:00
David Baker
7bd9863e6a
Prepare changelog for v0.12.4
2018-05-16 11:49:05 +01:00
Luke Barnard
e98b31958b
Allow arbitrary hrefs for cookie/privacy links
2018-05-16 10:41:18 +01:00
David Baker
a0b6bd183c
v0.12.4-rc.6
2018-05-15 18:03:40 +01:00
David Baker
1a3777ad0c
Prepare changelog for v0.12.4-rc.6
2018-05-15 18:03:40 +01:00
David Baker
9dd90fb63f
Merge pull request #1907 from matrix-org/dbkr/wait_for_widget_delete
...
Wait for deletion of widgets as well addition
2018-05-15 17:39:53 +01:00
David Baker
fadf264a1b
Rename uses of function too
2018-05-15 17:34:02 +01:00
David Baker
e4a221e42d
More helpful function name
2018-05-15 17:28:55 +01:00
David Baker
bb5ae741bc
Wait for deletion of widgets as well addition
...
We were previously waiting for them to appear which is silly if we
were deleting them.
2018-05-15 17:12:59 +01:00
Luke Barnard
db092c81d3
v0.12.4-rc.5
2018-05-15 15:54:15 +01:00
Luke Barnard
b64e10a095
Prepare changelog for v0.12.4-rc.5
2018-05-15 15:54:14 +01:00
Luke Barnard
c191464e97
Fix UserSettings for new analyticsOptIn
2018-05-15 15:39:12 +01:00