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

20562 commits

This branch
This branch
All branches
Author SHA1 Message Date
Will Hunt
fb94be4abd
No trailing space 2019-12-30 16:11:59 +00:00
Will Hunt
0a8cc416bf
Merge branch 'develop' into hs/bridge-info 2019-12-30 17:09:05 +01:00
Will Hunt
b1c2887087
line length 2019-12-30 16:08:24 +00:00
j
9eed423994 support channel names with slash in name/alias 
Signed-off-by: Jan Gerber <j@mailb.org>
 2019-12-29 12:10:31 +01:00
Justin Sleep
d0b8565f54 Fix inverted diff line highlighting in dark theme 
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
 2019-12-28 23:56:44 -06:00
Michael Telatynski
4489b5a21a Escape HTML in og:description and render any html &-encoded entities 2019-12-28 20:05:55 +00:00
Michael Telatynski
705bfcd20d fix RoomViewStore import in UserInfo 2019-12-28 17:54:46 +00:00
Michael Telatynski
a0cb6ce302 User Info fetch latest RoomMember instead of showing historical data 2019-12-28 17:51:38 +00:00
Travis Ralston
3a7c5dc241
Merge pull request #3760 from matrix-org/travis/babel7-wp-flex 
Use `flex-start` instead of `start` for postcss
 2019-12-27 12:05:50 -07:00
Weblate
dc607fbda9 Merge branch 'origin/develop' into Weblate. 2019-12-27 18:37:44 +00:00
Travis Ralston
6ef6b5909f
Merge pull request #3787 from matrix-org/travis/membership-tile 
Fix NPE when filtering the room list
 2019-12-27 11:37:38 -07:00
Travis Ralston
98571d706f Fix NPE when searching for rooms 
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751
 2019-12-27 11:31:15 -07:00
Weblate
737e049af2 Merge branch 'origin/develop' into Weblate. 2019-12-27 17:19:31 +00:00
Michael Telatynski
e9658a9e9e
Merge pull request #3782 from matrix-org/t3chguy/room_settings_alias_input 
Turn RoomAliasField into properly controlled and use in RoomSettings
 2019-12-27 17:19:26 +00:00
Weblate
bab89fbfaf Merge branch 'origin/develop' into Weblate. 2019-12-27 17:19:25 +00:00
random
957b1efc00 Translated using Weblate (Italian) 
Currently translated at 99.9% (2000 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-12-27 17:19:25 +00:00
Michael Telatynski
eac66f020f
Merge pull request #3783 from matrix-org/t3chguy/fuzzy_sort_memberlist 
fuzzy-sort MemberList
 2019-12-27 17:19:19 +00:00
Michael Telatynski
aa990462ce delint 2019-12-27 17:05:51 +00:00
Michael Telatynski
f9e386adaa Improve SORT_REGEX 2019-12-27 17:04:14 +00:00
Weblate
85159c3651 Merge branch 'origin/develop' into Weblate. 2019-12-27 16:58:47 +00:00
Michael Telatynski
c79bd791d6
Merge pull request #3786 from matrix-org/t3chguy/serialize_file_uploads 
Serialize file uploads into room to match confirmation dialog order
 2019-12-27 16:58:42 +00:00
Weblate
b19cb2df10 Merge branch 'origin/develop' into Weblate. 2019-12-27 16:53:01 +00:00
Michael Telatynski
05911881c2
Merge pull request #3785 from matrix-org/t3chguy/search_unread_messages 
Do not show Top Unread Messages Bar and Jump to bottom button if searching
 2019-12-27 16:52:56 +00:00
Weblate
008a394af2 Merge branch 'origin/develop' into Weblate. 2019-12-27 16:52:51 +00:00
Michael Telatynski
2b39f3bdf1
Merge pull request #3784 from matrix-org/t3chguy/fix_stickerPickerChevronOffset 
Fix sticker picker chevron offset calculation
 2019-12-27 16:52:46 +00:00
Weblate
7f2a13d47b Merge branch 'origin/develop' into Weblate. 2019-12-27 16:52:29 +00:00
Michael Telatynski
4984dd6f92
Merge pull request #3781 from matrix-org/t3chguy/user_info 
Fix not being able to promote others to the same power level as your own
 2019-12-27 16:52:23 +00:00
Weblate
a2104972a3 Merge branch 'origin/develop' into Weblate. 2019-12-27 16:50:32 +00:00
strix aluco
145741d168 Translated using Weblate (Ukrainian) 
Currently translated at 27.1% (542 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2019-12-27 16:50:31 +00:00
Stanislav Lukeš
6f7ddc3713 Translated using Weblate (Czech) 
Currently translated at 98.8% (1976 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2019-12-27 16:50:31 +00:00
Michael Telatynski
9bdadd2103
Merge pull request #3751 from matrix-org/t3chguy/react16_contexts_online_dot 
Room Tile DMs online/active green dot
 2019-12-27 16:50:21 +00:00
Michael Telatynski
9f948b5da3 Serialize file uploads into room to match confirmation dialog order 2019-12-27 13:59:57 +00:00
Michael Telatynski
e9ebfa100f Do not show Top Unread Messages Bar and Jump to bottom button if searching 2019-12-26 20:32:25 +00:00
Michael Telatynski
ed24f19a3f Fix stick picker chevron offset calculation 2019-12-26 20:12:50 +00:00
Michael Telatynski
06230e01e3 Fix End-to-End tests for RoomSettings interactivity 2019-12-26 19:36:16 +00:00
Michael Telatynski
ab12288979 Add more punctuation to regex 2019-12-26 19:29:25 +00:00
Michael Telatynski
e320f64ba1 fuzzy-sort MemberList 2019-12-26 19:27:04 +00:00
Michael Telatynski
ebf7eb698d Turn RoomAliasField into properly controlled and use in RoomSettings 2019-12-26 18:52:57 +00:00
Michael Telatynski
e95b67e101 Only show it if exactly 2 members, until we get Canonical DMs 2019-12-26 18:15:08 +00:00
Michael Telatynski
22fe0add3c Make UserOnlineDot more generic 2019-12-26 18:14:46 +00:00
Weblate
187e755799 Merge branch 'origin/develop' into Weblate. 2019-12-26 18:05:53 +00:00
ferhad.necef
c1c0c36008 Translated using Weblate (Azerbaijani) 
Currently translated at 22.4% (448 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
 2019-12-26 18:05:53 +00:00
Michael Telatynski
115e773317
Merge pull request #3780 from ps0305/ps0305-patch-1 
Fix spelling and grammar in README
 2019-12-26 18:05:47 +00:00
Michael Telatynski
73800c9a92 Fix UserInfo promote user inverted buttons 2019-12-26 18:04:58 +00:00
Pankaj Kumar Singh
a9cae90a52 Signed-off-by Pankaj Singh <singh.pankaj@live.com 2019-12-26 23:11:17 +05:30
Weblate
2a36bdf1eb Merge branch 'origin/develop' into Weblate. 2019-12-25 22:16:28 +00:00
catborise
7043453d3e Translated using Weblate (Turkish) 
Currently translated at 44.7% (894 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2019-12-25 22:16:27 +00:00
ferhad.necef
a0e816d134 Translated using Weblate (Russian) 
Currently translated at 90.8% (1816 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-12-25 22:16:19 +00:00
Szimszon
5e4f341cd8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-12-25 22:16:18 +00:00
Samu Voutilainen
b8dbd32363 Translated using Weblate (Finnish) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-12-25 22:16:18 +00:00