20339 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	9f04f94c65	Enable e2e and Riot tests, removing Karma	2020-01-09 17:55:57 -07:00
Travis Ralston	3591f802a8	Merge pull request #3824 from matrix-org/travis/sm-misc ... Regenerate i18n for sourcemaps branch	2020-01-09 17:47:32 -07:00
Travis Ralston	4b65cdf3f2	Regenerate i18n ... Apparently we need to do this.	2020-01-09 17:40:57 -07:00
Travis Ralston	4c3703a5ea	Merge pull request #3823 from matrix-org/travis/sm-fix-tests ... Fix tests for sourcemaps branch	2020-01-09 17:38:21 -07:00
Travis Ralston	d7dd67f69e	Remove subtly irrelevant package	2020-01-09 17:28:32 -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	4dfbce3108	Fix languageHandler's use of $webapp languages.json for Jest	2020-01-09 17:22:50 -07:00
Travis Ralston	ffd037dfa8	Fix resolution of files for Jest	2020-01-09 17:22:21 -07:00
Travis Ralston	0e8af15b9c	Add webcrypto dep back ... Probably accidentally merge-conflicted out	2020-01-09 17:15:13 -07:00
Travis Ralston	5f51432987	Convert babel config to a different babel config ... This is needed because of https://github.com/facebook/jest/issues/6229	2020-01-09 17:14:50 -07:00
Travis Ralston	23eb6cbeb3	Upgrade Jest and babel-jest to match js-sdk ... This also magically gets rid of a ton of errors	2020-01-09 16:17: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	a27f2d8379	Merge pull request #3817 from matrix-org/travis/sourcemaps-develop ... Sourcemaps: develop -> feature branch	2020-01-09 14:59:22 -07:00
Travis Ralston	135c84251c	Fix more imports post-merge	2020-01-09 14:19:19 -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	a6376461d0	Use yarn's updated lockfile ... Didn't manually handle this conflict, just let yarn do its thing.	2020-01-09 14:19:19 -07:00
Travis Ralston	19f78d4d97	Fix class construction in MemberList	2020-01-09 14:17:33 -07:00
Travis Ralston	727ce892de	Fix remaining RoomView conflict ... RoomContext was pulled out to its own file.	2020-01-09 14:17:33 -07:00
Travis Ralston	3e5cc9550b	Fix import merge conflicts, removing any that aren't needed anymore ... Many imports were removed as part of refactoring work, so here we are.	2020-01-09 14:17:33 -07:00
Travis Ralston	a0da13200f	Fix conflicts in package.json ... We removed the emojistrip script	2020-01-09 14:15:16 -07:00
Travis Ralston	fde32f13a5	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
Travis Ralston	d40091afc5	Merge pull request #3820 from matrix-org/travis/ftue/user-lists/4.5.5-paste ... Support pasting a bunch of identifiers into the invite dialog	2020-01-09 14:13:55 -07:00
Travis Ralston	ad33a2322e	Merge pull request #3819 from matrix-org/travis/ftue/user-lists/4.5-3pids ... Support 3PIDs (email addresses) in the invite dialog	2020-01-09 14:13:32 -07:00
Travis Ralston	6ca9a7c998	Merge pull request #3766 from matrix-org/travis/babel7-wp-es6-fixes ... Misc fixes for ES6 imports/exports	2020-01-09 14:00:59 -07:00
Travis Ralston	ba73600cf0	Merge pull request #3815 from matrix-org/travis/ftue/user-lists/4-composer ... Wire up the invite targets dialog to a real composer and show selections	2020-01-09 13:57:22 -07:00
Travis Ralston	4e4871c281	Move lang import to the top of the file	2020-01-09 13:56:25 -07:00
Travis Ralston	2caebef7a1	Make the SVG smaller	2020-01-09 13:40:35 -07:00
Travis Ralston	cb9e4376b8	Fix flow comment	2020-01-09 13:39:50 -07:00
Travis Ralston	94e9c6ac9f	Make the SVG smaller	2020-01-09 13:38:47 -07:00
Travis Ralston	f452ea225a	FlowJS is not Flow	2020-01-09 12:31:16 -07:00
Michael Telatynski	71b3005f1d	Merge pull request #3711 from matrix-org/t3chguy/clean_up_TextualBody ... Change ref handling in TextualBody to prevent it parsing generated nodes	2020-01-09 12:26:15 +00:00
Michael Telatynski	f3f929207c	Update yarn.lock ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-01-09 12:18:14 +00: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
Michael Telatynski	8116ac74ce	Update src/components/views/context_menus/MessageContextMenu.js ... Co-Authored-By: Travis Ralston <travpc@gmail.com>	2020-01-09 12:10:44 +00:00
Travis Ralston	1d9d706b9c	Merge pull request #3789 from matrix-org/t3chguy/render_html_entities_in_og-description ... Render encoded html entities in og:description	2020-01-08 21:38:31 -07:00
Travis Ralston	4ad4437f33	Support pasting a bunch of identifiers into the invite dialog ... Part of https://github.com/vector-im/riot-web/issues/11199	2020-01-08 21:21:08 -07:00
Travis Ralston	35b27bd231	Merge branch 'travis/ftue/user-lists/4.5-3pids' into travis/ftue/user-lists/4.5.5-paste	2020-01-08 21:21:03 -07:00
Travis Ralston	94e7587db7	Merge branch 'travis/ftue/user-lists/4-composer' into travis/ftue/user-lists/4.5.5-paste	2020-01-08 21:20:57 -07:00
Travis Ralston	6e5de1893b	Bind handlers to this	2020-01-08 21:01:53 -07:00
Travis Ralston	ab5d82b5ac	Appease the linter	2020-01-08 20:53:20 -07:00
Travis Ralston	79ab69353c	Support searching for 3PIDs from the invite dialog ... Part of https://github.com/vector-im/riot-web/issues/11199	2020-01-08 20:49:29 -07:00
Travis Ralston	36b7be920b	Merge branch 'travis/sourcemaps' into travis/babel7-wp-es6-fixes	2020-01-08 14:42:01 -07:00
Travis Ralston	85c4c72bf3	Merge pull request #3767 from matrix-org/travis/babel7-wp-package ... Update package.json for new build process + cosmetics	2020-01-08 11:10:05 -07: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
Travis Ralston	9aab1503a5	Merge pull request #3764 from matrix-org/travis/babel7-wp-es6-imports-2 ... Round 2 of CommonJS to ES6 imports	2020-01-08 09:08:36 -07:00
David Baker	4e6bf3079a	Merge pull request #3814 from matrix-org/dbkr/heal_a_broken_heart ... Strip all variation selectors on emoji	2020-01-08 10:29:54 +00:00
Travis Ralston	9213f88180	Re-add docs	2020-01-07 15:13:42 -07:00