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

33663 commits

This branch
This branch
All branches
Author SHA1 Message Date
Šimon Brandner
97b976b171
Adjust for sidebar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-12 08:15:26 +02:00
Šimon Brandner
5608e92885
Add styling for CallViewSidebar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-12 08:09:51 +02:00
Šimon Brandner
619231883f
Add CallViewSidebar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-12 08:09:16 +02:00
Šimon Brandner
befcbf8e75
Add spaces into curly braces 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:32:30 +02:00
Šimon Brandner
641c902408
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:24:20 +02:00
Šimon Brandner
6cd76086a7
Improve wording 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:23:32 +02:00
Šimon Brandner
1d3bf91e83
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:19:29 +02:00
Travis Ralston
12e013508d
Merge pull request #6132 from matrix-org/travis/ts-mtxcli 
Adapt for js-sdk MatrixClient conversion to TS
 2021-06-04 00:07:22 -06:00
Michael Telatynski
f22fd7aa3b
Merge pull request #6096 from matrix-org/t3chguy/fix/6606 2021-06-04 00:00:31 +01:00
Michael Telatynski
5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
David Baker
7421efe8f9
Merge pull request #6136 from matrix-org/dbkr/map_phone_number_lookup_to_native 
Map phone number lookup results to their native rooms
 2021-06-03 19:01:46 +01:00
Germain
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event 
Fix mx_Event containment rules and empty read avatar row
 2021-06-03 16:38:55 +01:00
Germain Souquet
5ef78f43a4 fix containment rule to keep height when resizing vertically 2021-06-03 16:26:20 +01:00
David Baker
8ef95a6237 Interface dispatcher payload 
& use constant in test
 2021-06-03 14:38:13 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Michael Telatynski
83d223475b delint imports 2021-06-03 08:41:22 +01:00
Germain Souquet
a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski
4765216280 Merge branch 't3chguy/fix/6606' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 2021-06-03 08:36:04 +01:00
Michael Telatynski
42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Germain
430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment 
Add CSS containment rules for shorter reflow operations
 2021-06-03 08:10:29 +01:00
Michael Telatynski
53fc475539
Update src/components/views/rooms/PinnedEventTile.tsx 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-06-03 08:03:31 +01:00
David Baker
58652152c1 Strings are now in a different place... 2021-06-02 17:52:26 +01:00
David Baker
0aeddea30f Only do native lookup if it's supported 
Also fix as bug where we were checking the wrong field to check
for native/virtual support: oops.
 2021-06-02 17:47:29 +01:00
David Baker
2c4fa73a45 Map phone number lookup results to their native rooms 
When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user.
 2021-06-02 17:39:13 +01:00
Michael Telatynski
4290237bdf
Merge pull request #6135 from matrix-org/t3chguy/fix/17494 
ignore hash/fragment when de-duplicating links for url previews
 2021-06-02 15:08:41 +01:00
Germain
70e309f0de
Merge pull request #5823 from matrix-org/gsouquet-scroll-to-live-reset-hash 2021-06-02 14:10:16 +01:00
Germain Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Michael Telatynski
bc89cf14dd ignore hash/fragment when de-duplicating links for url previews 2021-06-02 11:53:47 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
Germain
96f5d3af05
Merge pull request #6130 from matrix-org/gsouquet/member-list-sort 2021-06-02 11:40:52 +01:00
J. Ryan Stinnett
2d50325836
Merge pull request #6133 from matrix-org/jryans/event-tile-radius 
Tweak event border radius to match action bar
 2021-06-02 11:39:54 +01:00
Germain Souquet
f3431feaff Remove unused memoize import 2021-06-02 11:25:32 +01:00
David Baker
bc2f068e1e
Merge pull request #6131 from matrix-org/dbkr/log_when_already_a_call 
Log when we ignore a second call in a room
 2021-06-02 11:13:46 +01:00
Germain Souquet
82fe9a5c7b remove unused import 2021-06-02 10:48:18 +01:00
Germain Souquet
d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance 2021-06-02 10:42:17 +01:00
J. Ryan Stinnett
234c65b331 Tweak event border radius to match action bar 
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066).
 2021-06-02 10:25:29 +01:00
Travis Ralston
3dc6cfbf34 Undo olmVersion handling 2021-06-01 22:31:08 -06:00
Travis Ralston
c9883f346c Build pass 1 2021-06-01 22:21:04 -06:00
Travis Ralston
5b2dacd99e Adapt for js-sdk MatrixClient conversion to TS 
For https://github.com/matrix-org/matrix-js-sdk/pull/1718
 2021-06-01 21:36:28 -06:00
David Baker
f0f8210790 Log when we ignore a second call in a room 
What's more useful than a comment? A log line.
 2021-06-01 19:04:52 +01:00
J. Ryan Stinnett
50994735d9
Merge pull request #6128 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2021-06-01 15:52:53 +01:00
c-cal
dfa8d1a8ac Translated using Weblate (French) 
Currently translated at 99.7% (2973 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-06-01 14:52:14 +00:00
Weblate
390c1d2ffd Merge branch 'origin/develop' into Weblate. 2021-06-01 14:44:36 +00:00
Percy
31163df863 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-06-01 14:44:33 +00:00
random
e69c57ae94 Translated using Weblate (Italian) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-06-01 14:43:54 +00:00
Percy
352ca1d270 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-06-01 14:43:51 +00:00
iaiz
40619b83e0 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-06-01 14:43:49 +00:00
Trendyne
be55864c5e Translated using Weblate (Icelandic) 
Currently translated at 22.1% (660 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
 2021-06-01 14:43:46 +00:00