Commit Graph

12860 Commits

Author SHA1 Message Date
Luke Barnard 03c97140a6 Merge pull request #1925 from matrix-org/luke/deactivate-account-reword
Change wording and appearance of Deactivate Account dialog
2018-05-24 12:02:10 +01:00
Luke Barnard dca1217a45 Change wording and appearance of Deactivate Account dialog 2018-05-24 11:50:45 +01:00
Matthew Hodgson 3bee23e733 Merge pull request #1924 from matrix-org/matthew/fix-memberlist-ordering
fix membership list ordering when presence is disabled.
2018-05-24 11:29:29 +01:00
Matthew Hodgson cc79384839 fix https://github.com/vector-im/riot-web/issues/6643 2018-05-24 01:57:22 +01:00
Matthew Hodgson 864a33f978 switch to using 'code' for both blocks & marks to match md-serializer 2018-05-23 20:12:13 +01:00
Richard Lewis 2a9859c7b6 Styling for consistency. 2018-05-23 17:40:15 +01:00
Richard Lewis 9f9cde12ce Make devTools styling more consistent and easier to edit event data. 2018-05-23 17:18:33 +01:00
Luke Barnard b124989968 Implement erasure option upon deactivation 2018-05-23 16:33:32 +01:00
Matthew Hodgson b0ff61f7ef switch code schema to match slate-md-serializer 2018-05-23 14:12:08 +01:00
Luke Barnard ba3dd0c87a Refactor onOk to async function 2018-05-23 13:35:42 +01:00
Luke Barnard ef686a966d Add cookie warning to widget warning (AppPermission) 2018-05-23 10:46:32 +01:00
Luke Barnard c1a42637e7 Merge pull request #1919 from matrix-org/luke/consent-dialog
Terms and Conditions dialog
2018-05-23 10:17:14 +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 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
Richard Lewis 6df3371c6c Add a "reload widget" button. 2018-05-22 19:14:54 +01:00
Luke Barnard 538979a4ee Fix MVideoBody spinner 2018-05-22 17:13:45 +01:00
Luke Barnard c249bee9b5 Grammar 2018-05-22 16:09:54 +01:00
Luke Barnard c47c7b8d98 Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users
improve privileged section users in room settings
2018-05-22 16:07:01 +01:00
Luke Barnard 31dcd85c08 Add customisable cancel button to QuestionDialog 2018-05-22 15:45:58 +01:00
Luke Barnard fb5dd4a410 Remove spurious fixupHeight 2018-05-22 10:46:10 +01:00
Luke Barnard e4f8c09c32 Only include placeholder in DOM when necessary 2018-05-22 10:43:16 +01:00
Luke Barnard e9ae3de00f Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-05-21 17:15:54 +01:00
Luke Barnard 836dc8b0ef Factor out all shared logic between MStickerBody and MImageBody
The benefits of this:
 - One code path for determining spinner/placeholder and it's position
   for loading images/stickers. This includes spinner used in e2e
   decryption of images.
 - Very small definition for MStickerBody, only overriding the minimal
   differences is has from MImageBody.

The disadvantages:
 - Slightly more complicated MImageBody, but hopefully not less
   readable.
2018-05-21 16:59:13 +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 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 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 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
Luke Barnard 015093b371 Move inline style to stylesheet 2018-05-18 11:34:41 +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