PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
20828 commits 1 branch 0 tags 338 MiB
Commit graph

20828 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
57dd462807 Merge branch 'origin/develop' into Weblate. 2020-01-09 20:57:32 +00:00
catborise
5b1246324e Translated using Weblate (Turkish) 
Currently translated at 58.2% (1162 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-09 20:57:32 +00:00
Osoitz
8a2efd77ed Translated using Weblate (Basque) 
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/eu/
 2020-01-09 20:57:29 +00: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
David Baker
5019eff1e3 Don't allow upgrade from untrusted key backup. 
If we trust the key backup at upgrade time then we can sign it so
key backup will work automatically when cross-signing is trusted.
If we don't sign it at this point we'll end up with cross-signing
and key backup set up but key backup untrusted by the cross-signing
key which is a bit of a broken situation.

With https://github.com/matrix-org/matrix-js-sdk/pull/1144 fixes
https://github.com/vector-im/riot-web/issues/11747
 2020-01-09 20:49:37 +00: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
Zoe
e9032a9f61 Move the lock icon within the feather-customised directory 2020-01-09 16:00:36 +00:00
Michael Telatynski
0a9d7f43c6 pass the correct phase params for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-09 15:51:19 +00:00
Michael Telatynski
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
Zoe
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
Weblate
3f5663071a Merge branch 'origin/develop' into Weblate. 2020-01-09 12:26:22 +00:00
Kenneth Larsson
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
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
Weblate
9b8ce0de52 Merge branch 'origin/develop' into Weblate. 2020-01-09 04:38:44 +00:00
Kenneth Larsson
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
Slavi Pantaleev
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
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
RiotRobot
a3fe5bbd8c v1.7.6-rc.2 2020-01-08 11:20:29 +00:00
RiotRobot
f03d55cfe1 Prepare changelog for v1.7.6-rc.2 2020-01-08 11:20:29 +00:00
David Baker
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
David Baker
96cb1ddff5 Use a regex that actually works 2020-01-08 10:52:03 +00:00
David Baker
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
David Baker
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
Weblate
9b5d774bf0 Merge branch 'origin/develop' into Weblate. 2020-01-08 10:30:05 +00:00
catborise
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
Hucki
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
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