fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
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
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
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
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
4e4871c281
Move lang import to the top of the file
2020-01-09 13:56:25 -07:00
2caebef7a1
Make the SVG smaller
2020-01-09 13:40:35 -07:00
cb9e4376b8
Fix flow comment
2020-01-09 13:39:50 -07:00
94e9c6ac9f
Make the SVG smaller
2020-01-09 13:38:47 -07:00
f452ea225a
FlowJS is not Flow
2020-01-09 12:31:16 -07:00
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
f3f929207c
Update yarn.lock
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-01-09 12:18:14 +00:00
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
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
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
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
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
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
6e5de1893b
Bind handlers to this
2020-01-08 21:01:53 -07:00
ab5d82b5ac
Appease the linter
2020-01-08 20:53:20 -07:00
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
36b7be920b
Merge branch 'travis/sourcemaps' into travis/babel7-wp-es6-fixes
2020-01-08 14:42:01 -07:00
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
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
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
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
9213f88180
Re-add docs
2020-01-07 15:13:42 -07:00
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
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
45ef57d86f
Use a regex that actually works
2020-01-07 20:41:19 +00:00
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
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
e7d48e00d2
Appease the scss linter too
2020-01-07 12:25:22 -07:00
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
45a44b9102
Appease the linter
2020-01-07 12:20:02 -07:00
091bfdeaa0
Add checkmarks to selected individuals
2020-01-07 12:13:40 -07:00
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
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
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
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
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
7b91d2056b
Attempt to fix e2e tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-01-06 23:50:42 +00:00
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
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
b44e4ab45c
Merge pull request #3802 from matrix-org/travis/ftue/user-lists/3-filtering
...
Support filtering and searching for users to invite in DMs
2020-01-06 13:38:32 -07:00
fb867fc05b
Merge pull request #3801 from matrix-org/travis/ftue/user-lists/2-suggestions
...
Add suggestions for which users to invite to chat
2020-01-06 12:32:27 -07:00
6c410e6027
Fix comment style
2020-01-06 12:23:35 -07:00
bef824e84e
Remove harmful html entities encoding and other style nits
...
React will take care of this for us. It's harmful because simple characters get converted to something illegible.
2020-01-06 12:22:17 -07:00
bdef54622b
delint and add copyright
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-01-06 14:52:08 +00:00
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
