f452ea225a
FlowJS is not Flow
2020-01-09 12:31:16 -07:00
e9032a9f61
Move the lock icon within the feather-customised directory
2020-01-09 16:00:36 +00:00
0a9d7f43c6
pass the correct phase params for consistency
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-09 15:51:19 +00:00
7dfc392a2b
Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel
2020-01-09 15:48:06 +00:00
5d22561815
Display a padlock icon beside encrypted rooms in the room list
...
https://github.com/vector-im/riot-web/issues/11226
2020-01-09 15:42:31 +00:00
3f5663071a
Merge branch 'origin/develop' into Weblate.
2020-01-09 12:26:22 +00:00
e0d80fb8b2
Translated using Weblate (Swedish)
...
Currently translated at 76.8% (1535 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2020-01-09 12:26:22 +00: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
9b8ce0de52
Merge branch 'origin/develop' into Weblate.
2020-01-09 04:38:44 +00:00
9cd364b0e2
Translated using Weblate (Swedish)
...
Currently translated at 76.3% (1525 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2020-01-09 04:38:44 +00:00
27468a4abc
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (1998 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-01-09 04:38:38 +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
a3fe5bbd8c
v1.7.6-rc.2
2020-01-08 11:20:29 +00:00
f03d55cfe1
Prepare changelog for v1.7.6-rc.2
2020-01-08 11:20:29 +00:00
f65e2c8f7a
Merge pull request #3818 from matrix-org/dbkr/heal_a_broken_heart_2
...
Strip all variation selectors on emoji
2020-01-08 11:04:31 +00:00
96cb1ddff5
Use a regex that actually works
2020-01-08 10:52:03 +00:00
bd336b0710
Use a regex because it's simpler and works
...
and my loop did not because I meant 'or', not 'and'
2020-01-08 10:51:58 +00:00
f31cc7dfee
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-08 10:51:52 +00:00
9b5d774bf0
Merge branch 'origin/develop' into Weblate.
2020-01-08 10:30:05 +00:00
36e11c7581
Translated using Weblate (Turkish)
...
Currently translated at 55.7% (1113 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-08 10:30:04 +00:00
56152e4c60
Translated using Weblate (German)
...
Currently translated at 76.1% (1521 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-01-08 10:30:00 +00: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
a94dbd6231
Merge branch 'origin/develop' into Weblate.
2020-01-07 16:50:17 +00:00
8606bb9fba
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1997 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-07 16:50:17 +00:00
0381334f45
Translated using Weblate (French)
...
Currently translated at 100.0% (1998 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-07 16:50:16 +00:00
Travis Ralston