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

16184 commits

Author SHA1 Message Date
Zoe
54c69b4630 this is what we call fast iteration 2020-01-10 17:47:39 +00:00
Z. E. Cat
1b75909cad
Update src/components/views/rooms/RoomTile.js 
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-10 17:36:33 +00:00
Zoe
fbabe79647 use getContent() instead 2020-01-10 17:35:57 +00:00
Z. E. Cat
fb587cc62c
Update src/components/views/rooms/RoomTile.js 
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-10 17:33:37 +00:00
Zoe
bebfd60daf Very fastidiously check for null/undefined 2020-01-10 17:22:09 +00:00
Zoe
df1fd4db72 suppress private icon if the room is a DM 2020-01-10 16:49:07 +00:00
Zoe
808785c2f8 lint 2020-01-10 16:43:36 +00:00
Zoe
5551b207c1 Actually, this task was about join rules, not encryption ones. Oops. 2020-01-10 16:33:08 +00:00
Zoe
cb250c9b10 Use existing available props data to determine whether a room is encrypted, thereby allowing a state update to properly rerender the tile 2020-01-10 13:09:16 +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
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
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
David Baker
45ef57d86f Use a regex that actually works 2020-01-07 20:41:19 +00: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
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
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
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
6c410e6027 Fix comment style 2020-01-06 12:23:35 -07:00
Travis Ralston
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
Michael Telatynski
ffd09e42bd
Merge pull request #3806 from matrix-org/t3chguy/dedup_recent_emoji 
Deduplicate recent emoji
 2020-01-06 13:10:28 +00:00
Michael Telatynski
4c40266938
Merge pull request #3803 from matrix-org/t3chguy/fix_avatar_remove 
Fix ability to remove avatars
 2020-01-06 13:10:13 +00:00
Michael Telatynski
d5eb4ff310
Update src/components/views/settings/ProfileSettings.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-06 13:02:32 +00:00
David Baker
6b6d0dd866
Merge pull request #3810 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-01-06 11:34:47 +00:00
Michael Telatynski
6a1f4c41ce
Merge pull request #3788 from matrix-org/t3chguy/user_info_non-historical 
User Info fetch latest RoomMember instead of showing historical data
 2020-01-06 11:25:54 +00:00
Michael Telatynski
f371034ef8
Merge pull request #3808 from matrix-org/t3chguy/remove_slate 
Remove all usages of slate in favour of CIDER
 2020-01-06 11:15:24 +00:00
Szimszon
393c610b5a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-06 10:26:55 +00:00
Kévin C
d8a88387f3 Translated using Weblate (French) 
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-06 10:26:54 +00:00
Jeff Huang
51a1507f47 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-06 10:26:54 +00:00
Osoitz
3b91b31534 Translated using Weblate (Basque) 
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-01-06 10:26:53 +00:00
Besnik Bleta
2af4cdf532 Translated using Weblate (Albanian) 
Currently translated at 99.1% (1995 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-01-06 10:26:51 +00:00
Michael Telatynski
bd0a96f2b2 Merge branches 'develop' and 't3chguy/fix_react_complaining' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_react_complaining 
 Conflicts:
	src/components/views/elements/Pill.js
 2020-01-06 09:35:59 +00:00
Michael Telatynski
ac1d9b03bf undo one of the "fixes" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 09:35:14 +00:00
Weblate
2f257c2dc7 Merge branch 'origin/develop' into Weblate. 2020-01-06 05:18:26 +00:00
Aaron Raimist
98ede6437e Use display name when pinned messages are changed 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-01-05 23:04:46 -06:00
Michael Telatynski
64754a3f88 Add comment and delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:18:24 +00:00
Michael Telatynski
d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Weblate
0cad813071 Merge branch 'origin/develop' into Weblate. 2020-01-06 00:03:22 +00:00
Travis Ralston
781b69f4e3
Merge pull request #3693 from matrix-org/hs/bridge-info 
Bridge info settings tab
 2020-01-05 17:03:15 -07:00
Will Hunt
7f0ed05ee1
Update BridgeSettingsTab.js 2020-01-05 23:32:49 +00:00
Michael Telatynski
4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description 
 Conflicts:
	package.json
 2020-01-05 22:23:03 +00:00
Michael Telatynski
378a82e6fb Use html-entities instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:22:09 +00:00
Michael Telatynski
4a836349ab regenerate i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:01:59 +00:00
Michael Telatynski
b6098ddb47 Delegate all room alias validation to the RoomAliasField validator 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 21:58:36 +00:00
Weblate
95cc08e5d7 Merge branch 'origin/develop' into Weblate. 2020-01-05 21:46:48 +00:00
catborise
a231419a77 Translated using Weblate (Turkish) 
Currently translated at 53.2% (1067 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-05 21:46:48 +00:00
Szimszon
8128b97f35 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-05 21:46:45 +00:00
Kévin C
d1405233bd Translated using Weblate (French) 
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-05 21:46:45 +00:00