20306 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Travis Ralston	284a69f0b2	Merge pull request #3763 from matrix-org/travis/babel7-wp-es6-js-sdk ... Use the new js-sdk imports and import from src	2020-01-07 14:27:19 -07:00
Travis Ralston	f11f8dbc59	Merge pull request #3762 from matrix-org/travis/babel7-wp-es6-imports ... Convert many imports to handle ES6 exports	2020-01-07 14:26:52 -07:00
David Baker	45ef57d86f	Use a regex that actually works	2020-01-07 20:41:19 +00:00
Travis Ralston	67a67e3cb2	Merge branch 'travis/ftue/user-lists/4-composer' into travis/ftue/user-lists/4.5-paste-and-3pids	2020-01-07 13:04:36 -07:00
David Baker	2d410c91ac	Use a regex because it's simpler and works ... and my loop did not because I meant 'or', not 'and'	2020-01-07 19:57:17 +00:00
Travis Ralston	e7d48e00d2	Appease the scss linter too	2020-01-07 12:25:22 -07:00
Travis Ralston	4936e16a15	Remove unused ThreepidMember class for now ... It's going to be used for future work in this area, but for this particular PR it isn't needed.	2020-01-07 12:21:14 -07:00
Travis Ralston	45a44b9102	Appease the linter	2020-01-07 12:20:02 -07:00
Travis Ralston	091bfdeaa0	Add checkmarks to selected individuals	2020-01-07 12:13:40 -07:00
Travis Ralston	ffd40c2c40	Initial editor for user list selection ... For https://github.com/vector-im/riot-web/issues/11199	2020-01-07 12:13:40 -07:00
David Baker	40b23d6aa4	Strip all variation selectors on emoji ... ...when inserting into or looking up in the unicode to emoji map. This broke with emojibase 4.2.0 which changed the type of a whole load of emojis to 'text' when previously they were 'emoji'. This caused them to get the 'text' variant of the unicode string which has the text variation selector (15) appended instead of the emoji variation selector (16). We were only stripping the emoji selector, so upgrading to 4.2.0 caused riot to fail to find the heart in the unicode map, which therefore prevented the app from starting.	2020-01-07 18:48:55 +00:00
Michael Telatynski	87a6791eb8	Merge pull request #3812 from matrix-org/t3chguy/fix_UserInfo ... Fix userinfo for users not in the room	2020-01-07 16:50:10 +00:00
Michael Telatynski	a62c260f79	Fix userinfo for users not in the room ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-01-07 12:58:24 +00:00
Michael Telatynski	6ba5dc61e2	Merge pull request #3811 from matrix-org/t3chguy/fix_e2e_tests ... Attempt to fix e2e tests	2020-01-06 23:58:51 +00: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	653f31b22d	Merge pull request #3752 from matrix-org/t3chguy/fix_react_complaining ... Add bunch of null-guards and similar to fix React Errors/complaints	2020-01-06 21:42:27 +00:00
Michael Telatynski	163df614f3	Merge pull request #3807 from matrix-org/t3chguy/fix_AliasSettings ... Delegate all room alias validation to the RoomAliasField validator	2020-01-06 21:26:00 +00:00