OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
28,770 Commits
211 Branches
549 Tags
664 MiB
Commit Graph

526 Commits (0ac4f21652b7ded873c770400ae0b0333662c67d)

Author SHA1 Message Date
Travis Ralston 77df610653 Appease the linter a bit more 2020-04-17 14:38:05 -06:00
Travis Ralston 5a9898591d Appease the linter 2020-04-17 14:35:02 -06:00
Travis Ralston e72008d7f1 Fix end-to-end tests for end-to-end encryption verification 
Fixes https://github.com/vector-im/riot-web/issues/13226

This isn't the fastest route, but it is a predictable route for the happy path we probably want to test. For example, Alice will already be staring at the DM and could easily accept the verification there, but we probably want to make sure that the toast is present and does the right thing. Similarly, neither of them need to verify that there's green shields everywhere, they should be implied, however an explicit check follows a real user's gaze.
 2020-04-17 14:31:33 -06:00
Travis Ralston 885bb112ae
Merge pull request #4430 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/https-proxy-agent-2.2.4 
Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests
 2020-04-17 12:44:57 -06:00
Travis Ralston e485f7a82c
Merge pull request #4432 from matrix-org/travis/e2e-docs 
Minor updates to e2e test instructions on Windows
 2020-04-17 09:54:58 -06:00
Travis Ralston a5f5f759cb Create unencrypted rooms by default in e2e-tests 
Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible. 

See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362
 2020-04-16 16:27:43 -06:00
Travis Ralston 0489dcc8da Minor updates to e2e test instructions on Windows 2020-04-16 15:55:33 -06:00
dependabot[bot] d05ceec9d6
Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests 
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4.
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-16 18:53:03 +00:00
Travis Ralston 4af33d91eb Track the issue number too 2020-04-16 12:26:08 -06:00
Travis Ralston d04af1f3a8 Disable e2e tests for now 2020-04-16 12:24:04 -06:00
Travis Ralston f4a5361b14 Wait a bit before continuing with the passphrase 
The continue button is probably no-oping due to being disabled.
 2020-04-16 12:13:05 -06:00
Travis Ralston 5769b07a92 Select the right continue button 
There's no buttons in the field.
 2020-04-16 12:04:48 -06:00
Travis Ralston 25fa675f88 Blind attempt at fixing the end to end tests 2020-04-16 11:46:29 -06:00
Michael Telatynski e942a35525 Fixxy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:09:41 +01:00
Michael Telatynski 9c1939b756 match all, not just first instance of tokens to escape 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 02:31:30 +01:00
Michael Telatynski 4454db30d6 Escape opening square bracket too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 01:02:08 +01:00
Michael Telatynski f1def8b0de delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 00:50:28 +01:00
Michael Telatynski 95eaf94cd8 Fix pills being broken by unescaped characters 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 00:40:38 +01:00
Travis Ralston b4b0c4c6df Add comments to highlight where we'll need m.widget support 
For https://github.com/vector-im/riot-web/issues/13111
 2020-04-09 15:14:07 -06:00
J. Ryan Stinnett 86f39ee0ee Fix read marker visibility for grouped events 
The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
 2020-04-03 01:14:31 +01:00
Travis Ralston c86d75693b Fix a number of minor code quality issues 
Most of these are complaints from my IDE. Discovered by going through nearly every file looking for React warnings.
 2020-03-31 14:05:56 -06:00
J. Ryan Stinnett 520b4c3e65 Add tests for was verified case 2020-03-30 16:33:22 +01:00
J. Ryan Stinnett b53b5cc45d Add wasCrossSigningVerified in test 2020-03-30 15:24:43 +01:00
Zoe 098df07c67 review feedback 2020-03-30 10:18:47 +01:00
Zoe 4f3d4426ea lint 2020-03-27 15:37:59 +00:00
Zoe fda533ab48 test for shield behaviour 2020-03-27 15:25:44 +00:00
Bruno Windels 5eaf03c3da update e2e tests to expand local aliases when adding one 2020-03-09 17:03:50 +01:00
Travis Ralston 866ed68615 Ensure DMs tagged outside of account data work in the invite dialog 
Fixes https://github.com/vector-im/riot-web/issues/12418

Includes a refactor so we don't need to litter the code with the same magic string for DM tags.
 2020-02-24 19:43:49 -07:00
Michael Telatynski 72e5313a5a
Merge pull request #4113 from matrix-org/t3chguy/fix_downloading 
Handle file downloading locally in electron rather than sending to browser
 2020-02-24 13:37:16 +00:00
Bruno Windels 13b08b5fcc
Revert "Fix escaped markdown passing backslashes through" 2020-02-24 11:27:22 +00:00
Michael Telatynski d783ce86c8 Use noreferrer in addition to noopener for edge case browsers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:14:29 +00:00
Zoe 164b355ffe abstract out the check for available target devices 2020-02-18 11:25:19 +00:00
Zoe 23596031db rip foldleft, died of lint issues 2020-02-17 16:00:25 +00:00
Zoe 28df1e28cf Start verification sessions in an E2E DM where possible 
Fixes https://github.com/vector-im/riot-web/issues/12187
 2020-02-17 15:08:22 +00:00
Hubert Chathi 4a204b715d
Merge pull request #4059 from matrix-org/uhoreg/refactor_event_grouping 
refactor event grouping into separate helper classes
 2020-02-14 10:35:34 -05:00
Bruno Windels 43f15ab47d
Merge pull request #4008 from BobVul/fix-markdown-escapes 
Fix escaped markdown passing backslashes through
 2020-02-14 09:18:53 +00:00
Hubert Chathi 908ca6b6ef add test for grouping room creation events 2020-02-13 17:25:54 -05:00
Marco Zehe 8004a35179 Update to use proper quotes and fix code styling. And fix test. 
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-12 10:54:08 +01:00
Zoe 9a5663056d lint 2020-02-11 12:06:40 +00:00
Zoe 6b6d612041 Fix error message rendering for key entry 
Relates to https://github.com/vector-im/riot-web/issues/12288
 2020-02-11 12:02:12 +00:00
Zoe 544479a6ee test code cleaned up slightly 2020-02-04 11:31:16 +00:00
Zoe 150fe7a45a Tests for MKeyVerificationConclusion 2020-02-04 11:25:19 +00:00
BobVul 1df6837649 Missing semicolon 2020-02-04 10:38:43 +11:00
BobVul fde30577e4 Fix escaped markdown passing backslashes through 
Fixes https://github.com/vector-im/riot-web/issues/11230

Signed-off-by: Bob Rao <bob+git@vulpin.com>
 2020-01-31 12:33:57 +11:00
J. Ryan Stinnett 5c4b91457e Fix tests 2020-01-30 22:28:56 +00:00
Travis Ralston 9722b34c35
Merge pull request #3906 from matrix-org/travis/user-lists-labs 
Remove user lists feature flag, making it the default
 2020-01-24 08:57:27 -07:00
Michael Telatynski d7a4698db8
Merge pull request #3891 from matrix-org/t3chguy/fix_multi_paragraph_formatting 
Fix paragraph-awareness of the composer formatting features
 2020-01-23 13:31:12 +00:00
Travis Ralston 65450e893c Try and fix e2e tests for new invite dialog 2020-01-22 22:40:02 -07:00
Michael Telatynski 97edb824bc
Merge pull request #3893 from matrix-org/t3chguy/double_slash 
Slash Command improvements around sending messages with leading slash
 2020-01-22 14:32:09 +00:00
Michael Telatynski 832da062cc Improve trailing spurious breaks + tests 2020-01-22 13:37:27 +00:00
Michael Telatynski e1e53f567f add more tests 2020-01-22 11:56:27 +00:00
Michael Telatynski fc724cfe70 fix tests some moar 2020-01-22 11:05:25 +00:00
Michael Telatynski 176605c302 update tests to match new rendering method 2020-01-22 10:49:58 +00:00
Michael Telatynski 9a530a72f6 delint 2020-01-21 15:36:25 +00:00
Michael Telatynski b2aba6db35 Initial attempt to make toggleInlineFormat paragraph-aware 2020-01-21 15:32:32 +00:00
Michael Telatynski 397e116efb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/roving 2020-01-20 20:48:11 +00:00
Michael Telatynski 9365a9cb30 Remove lolex where its not needed and move to dev-deps. Remove unused optimist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-18 01:39:14 +00:00
Michael Telatynski 8ba54f5f7d Don't use expect and jest-mock anymore as they're implicit from jest 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-18 01:38:22 +00:00
Michael Telatynski 4504d9b790 add tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-16 03:15:52 +00:00
Travis Ralston 1e70af00a3 Fix GroupView test 
It was counting the wrong number of updates for reasons I don't understand.
 2020-01-13 20:15:58 -07:00
Travis Ralston bf6798e109 Appease the linter 2020-01-13 13:28:33 -07:00
Travis Ralston e66f2a6c3f Revert ES6ification of end-to-end tests and add instructions for Windows 
Because the tests are run directly by node, we have to use the CommonJS module syntax. We could run the thing through babel, but then we just have another babel.

Windows instructions are from experience and may not be optimized.
 2020-01-10 10:13:41 -07:00
Travis Ralston aa38946166 Actually define some tests in TextualBody's test 
Jest really wants you to do things the right way.
 2020-01-09 17:24:13 -07:00
Travis Ralston 4bc5ada50e Fix test bootstrap for new skinning approach 2020-01-09 17:23:46 -07:00
Travis Ralston 54f3288dea Fix imports for tests 
This doesn't fix the fact that someone called it "peg".
 2020-01-09 17:23:27 -07:00
Travis Ralston a8c8406ac4 Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps 2020-01-09 16:06:46 -07:00
Travis Ralston dc914774fb Delete files that were conflicting in the merge and deleted on develop 2020-01-09 14:19:19 -07:00
Travis Ralston fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski 245a68b3ba Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody 
 Conflicts:
	yarn.lock
 2020-01-09 12:17:21 +00:00
Travis Ralston 59f608ffd6
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export 
Convert CommonJS exports to ES6 exports
 2020-01-08 09:09:11 -07:00
Michael Telatynski 7b91d2056b Attempt to fix e2e tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 23:50:42 +00:00
Michael Telatynski bdef54622b delint and add copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 14:52:08 +00:00
Michael Telatynski f1de6d060a Add a regression test for editing events and url previews 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 14:38:21 +00:00
Michael Telatynski c551f2983a Add TextualBody-test.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 13:28:29 +00:00
Michael Telatynski c802f9a302 remove unused stale Test Suite 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:23:19 +00:00
Michael Telatynski d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Michael Telatynski 06230e01e3 Fix End-to-End tests for RoomSettings interactivity 2019-12-26 19:36:16 +00:00
Travis Ralston 042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston 4aec432b30 Convert the more complicated CommonJS exports to ES6-style 2019-12-22 21:01:03 -07:00
Travis Ralston 344dac4fb9 Convert CommonJS exports to ES6-compatible exports 
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
 2019-12-22 21:01:02 -07:00
Michael Telatynski 513ec30ef1 Fix tests v2 2019-12-17 18:02:45 +00:00
Michael Telatynski f3ca4c0b7c fix tests 2019-12-17 17:54:19 +00:00
Michael Telatynski da4d72b3c4 delint 2019-12-17 17:34:03 +00:00
Michael Telatynski 937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Michael Telatynski b9e22f8141 add delay 2019-12-17 13:11:30 +00:00
Michael Telatynski 409a111b02 wait additional tick 2019-12-17 12:42:47 +00:00
Michael Telatynski c3415d2121 delint 2019-12-17 12:09:01 +00:00
Michael Telatynski 802092bf9a All tests passing locally. We no longer need Chrome in buildkite 2019-12-17 11:53:18 +00:00
Michael Telatynski e6d8487302 Fix more tests 2019-12-17 11:47:01 +00:00
Michael Telatynski ab3fb6581b Down to 7 test failures 2019-12-17 11:24:37 +00:00
Michael Telatynski 0041dae664 26 test failures to go :D 2019-12-16 11:55:01 +00:00
Michael Telatynski 6ad31fe023 30 test failures to go :D 2019-12-16 11:12:48 +00:00
Michael Telatynski ffa2ac172c delint 2019-12-15 14:09:41 +00:00
Michael Telatynski 18f81d80db Initial jest stuff. Blocked on Babel 7 2019-12-13 13:43:48 +00:00
Travis Ralston 7230d51cca
Merge pull request #3703 from matrix-org/travis/right-panel-v2 
Refactor RightPanel to match expected behaviour
 2019-12-11 10:50:45 -07:00
Travis Ralston 405b3f6be6 Fix member list not being open for end-to-end tests 2019-12-06 16:33:03 -07:00
Travis Ralston 185830e4f3 Fix end-to-end tests 
The right panel needs to be opened manually now.
 2019-12-06 14:22:27 -07:00
Michael Telatynski a63fbbf2db Add tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-05 00:11:10 +00:00
David Baker a2e3f64963 Change read markers to use CSS transitions 
Removes one of the two places we use Velocity, so we're one step
closer to getting rid of it for good.

Should therefore fix the fact that Velocity is leaking data entries
and therefore <hr> elements.

Hopefully also makes the logic in getEventTiles incrementally simpler,
if still somwewhat byzantine.
 2019-11-26 19:06:02 +00:00
Michael Telatynski d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Michael Telatynski b3760cdd6e Replace usages of Promise.delay(...) with own utils 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 14:25:54 +00:00
Michael Telatynski 41f4f3ef82 make end-to-end test failure more verbose 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 14:04:50 +00:00
Michael Telatynski 168b1b68bb Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions" 
This reverts commit 09a8fec2
 2019-11-12 11:56:21 +00:00
Michael Telatynski 09a8fec261 s/.done(/.then(/ since modern es6 track unhandled promise exceptions 2019-11-12 11:51:23 +00:00
Bruno Windels 616ff5ce76 adjust list item numbers in test that are now preserved 2019-10-22 15:43:40 +02:00
Bruno Windels fc175a971c
Merge pull request #3537 from matrix-org/bwindels/merge-e2e-tests 
Merge end-to-end tests
 2019-10-21 08:31:35 +00:00
Bruno Windels b03ebb964b split up installing static webserver and riot copy 
so we can just do the latter for the e2e tests on CI
 2019-10-18 17:18:18 +02:00
Bruno Windels dca968375d
Update test/end-to-end-tests/run.sh 2019-10-18 12:33:42 +00:00
Bruno Windels 3d15026da3
Update test/end-to-end-tests/run.sh 2019-10-18 12:33:32 +00:00
Bruno Windels 15a75737ff
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:29:09 +00:00
Bruno Windels 76c7f58235
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:58 +00:00
Bruno Windels 142a32b528
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:47 +00:00
Bruno Windels 06e69d114f
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:31 +00:00
Bruno Windels 5025a0ffea
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:12 +00:00
Bruno Windels 8a028029ee
Update test/end-to-end-tests/install.sh 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:28:04 +00:00
Bruno Windels 6236909d93
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:27:52 +00:00
Bruno Windels 683947e0b7
Update test/end-to-end-tests/README.md 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-10-18 12:27:43 +00:00
Bruno Windels 15bbf3a999 fix the lint fix 2019-10-10 12:12:13 +02:00
Bruno Windels 4b9a29cb60 put exec perms back on install script 2019-10-10 11:55:31 +02:00
Bruno Windels 6f9604992b copyright 2019-10-10 11:42:59 +02:00
Bruno Windels 645a9d836f install static webserver for server symlinked riot on CI 2019-10-10 11:40:04 +02:00
Bruno Windels 2d848bba29 fix lint 2019-10-09 17:57:55 +02:00
Bruno Windels ebc2bba0c3 warn if not installed yet when running e2e tests 2019-10-09 17:37:57 +02:00
Bruno Windels f8358fa4d0 make e2e test safe to run from anywhere 2019-10-09 17:37:41 +02:00
Bruno Windels 59cc36ca65 don't fetch riot/master by default when installing e2e tests 2019-10-09 17:34:40 +02:00
Bruno Windels de21cb24e0 Merge remote-tracking branch 'e2etests/bwindels/use-cider' into bwindels/merge-e2e-tests 2019-10-09 17:12:50 +02:00
Bruno Windels cad71913e9 only run riot static server if no riot url has been provided 2019-10-09 16:59:00 +02:00
Bruno Windels ae38e0b357 Merge remote-tracking branch 'e2etests/bwindels/bigmerge' into bwindels/merge-e2e-tests 2019-10-09 16:55:32 +02:00
Bruno Windels ca86969f92 move everything to subfolder to merge into react-sdk 2019-10-09 16:52:48 +02:00
Michael Telatynski aae5bb9f39 Use new React Shallow renderer with hooks support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 13:08:16 +02:00
Michael Telatynski 5c960dccb7 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 12:51:08 +02:00
Michael Telatynski efeb6e87c4 Use new React Shallow renderer with hooks support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 12:51:08 +02:00
Michael Telatynski 34530843f4 Factor out generic EventListSummary from MELS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 12:50:03 +02:00
Travis Ralston 0862ad029d Fix permalinks test 2019-09-30 21:15:31 -06:00
Travis Ralston fc66e69c02 Rename RoomPermalinkCreator -> Permalinks due to scope 
The file handles more than just a RoomPermalinkCreator, so we should name it accordingly.
 2019-09-30 20:39:58 -06:00
Travis Ralston 64aa6695f5 Move matrix-to.js to utils/permalinks/RoomPermalinkCreator 
Just a little bit of refactoring to make the feature of custom prefixes a bit easier.
 2019-09-30 12:16:46 -06:00
Bruno Windels 7f4e070807 fix deserialize unit tests 2019-09-23 15:34:01 +02:00
Michael Telatynski d5c96b86d4 fix test 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-19 10:31:34 +01:00
Michael Telatynski 02dfdffc4f Fix failing test due to newly added assumption 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-18 14:35:13 +01:00
Travis Ralston 99b8193ce7 Use the new ShallowRenderer over ReactTestUtils 
Mostly because the ReactTestUtils renderer doesn't exist anymore.
 2019-09-17 14:33:32 -06:00
Michael Telatynski bf30cfe699 Fix other test 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski 1c7d67e8b3 fix test 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski 70ff2bc9cd Switch to createReactClass: views/rooms and test/components. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 15:04:46 +01:00
Bruno Windels be79cdddb0 apply autocomplete changes to mock to fix editor unit tests 2019-08-29 18:00:38 +02:00
Bruno Windels c44fbb73d0 fix bug when replacing range starting at end of previous part 2019-08-28 15:52:39 +02:00
Bruno Windels 994bcb5c85 dont expect rendered to be called from `range.replace()` anymore 
as this is now called from the `transform` method, unused in this test
 2019-08-27 16:43:05 +02:00
Bruno Windels e0b99b5cc8
Merge pull request #3342 from matrix-org/bwindels/cider-replace-emoticons 
Auto-replace emoticons with emojis in new composer
 2019-08-27 14:40:53 +00:00
Michael Telatynski bcbd603874
Merge pull request #3345 from matrix-org/t3chguy/react16_3 
Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D
 2019-08-26 19:44:51 +01:00
Bruno Windels 0e65f71a37 support incrementing/decrementing doc positions with predicate 2019-08-26 16:16:27 +02:00
Bruno Windels 10291bafe0 add support for selecting ranges in the editor model, and replacing them 
this to support finding emoticons and replacing them with an emoji
 2019-08-26 16:16:27 +02:00