Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 05:04:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,036 Commits 206 Branches 552 Tags 518 MiB
a4c9a67325
Commit Graph

25036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
69f4e8e68e Merge branch 'origin/develop' into Weblate. 2020-05-27 02:06:23 +00:00
Travis Ralston
515304d32e
Merge pull request #4654 from matrix-org/travis/roomlist/badge-updates 
Update badge counts in new room list as needed
 2020-05-26 20:06:17 -06:00
Travis Ralston
8370fa8bb4 Event.decrypted from the client 2020-05-26 19:56:56 -06:00
Travis Ralston
bf8a3d4419 Bind to the room instead of the client 
Also add the other missing deregister handlers
 2020-05-26 16:20:51 -06:00
Travis Ralston
a9c54153ee Update badge counts in new room list as needed 2020-05-26 14:16:33 -06:00
Weblate
9b46787dd3 Merge branch 'origin/develop' into Weblate. 2020-05-26 19:49:55 +00:00
Imre Kristoffer Eilertsen
bca58bed02 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 56.5% (1304 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-05-26 19:49:55 +00:00
poljar
6c10cbc903
EventIndex: Use a warning when redactions don't have an event id. 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-05-26 21:48:10 +02:00
Damir Jelić
58f0814530 EventIndex: Handle invalid m.room.redaction events correctly. 
Clients might send invalid redaction events, such events will not have a
valid redacts field containing the event id of the associated event that
was redacted.

Skip such events instead of ending up looping over the checkpoint
forever.
 2020-05-26 21:27:45 +02:00
Weblate
cc1de6124b Merge branch 'origin/develop' into Weblate. 2020-05-26 19:04:56 +00:00
MamasLT
906da4eb1c Translated using Weblate (Lithuanian) 
Currently translated at 64.5% (1488 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-26 19:04:55 +00:00
Damir Jelić
403a64bcc6 EventIndex: Print out the checkpoint if there was an error during a crawl. 2020-05-26 20:48:22 +02:00
Jorik Schellekens
73213422a9 fix encryption icon missalignment 2020-05-26 18:15:06 +01:00
Jorik Schellekens
792859b939 Fix lines overflowing room list width 2020-05-26 17:39:39 +01:00
Jorik Schellekens
d8836f0f4b Fir sublist sizing regression 2020-05-26 17:09:42 +01:00
David Baker
a496dafd41 Remove the keyshare dialog 
Fixes https://github.com/vector-im/riot-web/issues/11908
 2020-05-26 16:51:20 +01:00
Weblate
354d8d6fef Merge branch 'origin/develop' into Weblate. 2020-05-26 15:13:08 +00:00
Jorik Schellekens
076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts 
Move Field to Typescript
 2020-05-26 16:13:03 +01:00
Jorik Schellekens
fcbd197e7d Fix file list regression 2020-05-26 15:56:16 +01:00
Weblate
8f5c0c7c81 Merge branch 'origin/develop' into Weblate. 2020-05-26 14:18:13 +00:00
Stanislav Lukeš
f51c93ba68 Translated using Weblate (Czech) 
Currently translated at 94.4% (2177 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-05-26 14:18:12 +00:00
Bruno Windels
3fc060c754
Merge pull request #4646 from matrix-org/bwindels/detectnetworkfailureforjoin 
Use connection error to detect network problem
 2020-05-26 14:18:06 +00:00
Weblate
1e21c043cf Merge branch 'origin/develop' into Weblate. 2020-05-26 13:26:09 +00:00
Stanislav Lukeš
c2ccac0d76 Translated using Weblate (Czech) 
Currently translated at 93.8% (2163 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-05-26 13:26:09 +00:00
Bruno Windels
f3ac96fa56
Merge pull request #4641 from matrix-org/bwindels/defaultfontsize 
Revert default font size to 15px
 2020-05-26 13:26:03 +00:00
Bruno Windels
cfe5173235 use connection error to detect network problem 2020-05-26 15:23:12 +02:00
Weblate
0cf2e2452e Merge branch 'origin/develop' into Weblate. 2020-05-26 13:22:27 +00:00
Bruno Windels
d45a597528
Merge pull request #4645 from matrix-org/bwindels/addloggingforfailtojoinroom 
Add logging when room join fails
 2020-05-26 13:22:22 +00:00
Bruno Windels
f1282179fb add logging when we fail to join a room 2020-05-26 14:58:09 +02:00
Weblate
076d3ab00f Merge branch 'origin/develop' into Weblate. 2020-05-26 12:55:07 +00:00
David Baker
e5c4d6fdcd
Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog 
Remove EncryptedEventDialog
 2020-05-26 13:55:02 +01:00
Michael Telatynski
fb73bac4cf Update UpdateToast's priority to 30 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-26 13:53:28 +01:00
Weblate
2f5eedd996 Merge branch 'origin/develop' into Weblate. 2020-05-26 12:48:53 +00:00
Michael Telatynski
b7428fcf35
Merge pull request #4618 from matrix-org/t3chguy/toasts3 
Migrate Toasts to Typescript and to granular priority system
 2020-05-26 13:48:47 +01:00
David Baker
d2fe4bcecd Unused imports 2020-05-26 13:46:47 +01:00
Weblate
9c56f30dae Merge branch 'origin/develop' into Weblate. 2020-05-26 12:45:44 +00:00
Michael Telatynski
0cec16d3b1
Merge pull request #4632 from matrix-org/t3chguy/confusing_copy 
Update Crypto Store Too New copy
 2020-05-26 13:45:40 +01:00
David Baker
563a36e0a1 Remove unused CSS too 2020-05-26 13:42:00 +01:00
Weblate
4ebf5d66a7 Merge branch 'origin/develop' into Weblate. 2020-05-26 12:41:21 +00:00
MamasLT
6017481566 Translated using Weblate (Lithuanian) 
Currently translated at 64.4% (1495 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-26 12:41:21 +00:00
Michael Telatynski
d1084afb92
Merge pull request #4643 from matrix-org/t3chguy/fix-memberavatar 
MemberAvatar should not have its own letter fallback, it should use BaseAvatar
 2020-05-26 13:41:15 +01:00
David Baker
352727906e i18n 2020-05-26 13:40:36 +01:00
Michael Telatynski
c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
 2020-05-26 13:38:17 +01:00
David Baker
7e45a71a8a Remove EncryptedEventDialog 
https://github.com/matrix-org/matrix-react-sdk/pull/4412 disabled it
when cross signing was enabled so it is essentially gone now anyway.

Fixes https://github.com/vector-im/riot-web/issues/11752
 2020-05-26 13:37:57 +01:00
Michael Telatynski
0713139dc5 Merge branches 'develop' and 't3chguy/confusing_copy' of github.com:matrix-org/matrix-react-sdk into t3chguy/confusing_copy 2020-05-26 13:35:18 +01:00
Michael Telatynski
f8d2124aa3 MemberAvatar should not have its own letter fallback, it should use BaseAvatar's 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-26 13:33:47 +01:00
Bruno Windels
cce53d8ab9 revert default font size to 15px 2020-05-26 14:11:36 +02:00
Weblate
6993e7d193 Merge branch 'origin/develop' into Weblate. 2020-05-26 11:17:53 +00:00
Szimszon
1b8a7a33a4 Translated using Weblate (Hungarian) 
Currently translated at 99.2% (2304 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-05-26 11:17:52 +00:00
Michael Telatynski
29347d0c6a
Merge pull request #4630 from matrix-org/t3chguy/fix_upload_abort 
Fix media upload issues with abort and status bar
 2020-05-26 12:17:46 +01:00