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

7284 commits

Author SHA1 Message Date
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
David Baker
b10f7a47fd
Merge pull request #5324 from matrix-org/dbkr/hang_up_your_hangups 
Support rejecting calls
 2020-10-19 09:57:13 +01:00
Michael Telatynski
da7a02b545 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-16 12:23:10 +01:00
Travis Ralston
5c79f35cc5
Merge pull request #5316 from matrix-org/travis/less-acl-noise 
Make the ACL update message less noisy
 2020-10-15 09:49:03 -06:00
Michael Telatynski
efbce309d0 improve paddings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:42:08 +01:00
David Baker
7ad366603a Support rejecting calls 
Use the 'reject' method when we want to reject an incoming call
rather than end one that's in progress. Also get our error messages
right for the other side rejecting the call (albeit still with
placeholder dialog-box UX).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1510
 2020-10-15 14:54:03 +01:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Arsh Sharma
7e4b32c0d2 fixing i18 error 2020-10-14 16:44:58 +05:30
Travis Ralston
161dc0b6c6 Add i18n 2020-10-13 15:11:48 -06:00
Michael Telatynski
a1d25efceb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/structures/RoomView.tsx
 2020-10-13 13:45:22 +01:00
Michael Telatynski
37558f1f0d Improve the context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 09:51:49 +01:00
David Baker
55f77b04ae Rewrite call state machine 
* Remove the two separate enumerations of call state: now everything
   uses the js-sdk version of call state. Stop adding a separate
   'call_state' field onto the call object(!)
 * Better reflection of the actual state of the call in the call bar,
   so when it's connecting, it says connecting, and only says 'active call'
   when the call is actually active.
 * More typey goodness
 2020-10-09 18:56:07 +01:00
Michael Telatynski
b2dc5542b3 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 09:00:38 +01:00
Michael Telatynski
ada6d1aa46 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:42:21 +01:00
Michael Telatynski
b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration 
Convert auth lifecycle to TS, remove dead ILAG code
 2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
4dd6e96bfd Regenerate strings 2020-10-07 13:00:27 +01:00
LinAGKar
70632e8153 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
 2020-10-07 10:08:51 +00:00
Szimszon
b37f6db909 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
 2020-10-07 10:08:50 +00:00
Xose M
8004b21e5e Translated using Weblate (Galician) 
Currently translated at 99.9% (2373 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-10-07 10:08:49 +00:00
Jeff Huang
88824c02d3 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-07 10:08:49 +00:00
Michael Telatynski
29e3881fb3 Iterate design and fix post-merge conflict 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:36:45 +01:00
Michael Telatynski
c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/right_panel/WidgetCard.tsx
	src/stores/WidgetStore.ts
 2020-10-07 10:04:45 +01:00
@a2sc:matrix.org
a8ec588247 Translated using Weblate (German) 
Currently translated at 99.9% (2371 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-10-06 20:36:20 +00:00
Nikita Epifanov
6994247aa5 Translated using Weblate (Russian) 
Currently translated at 99.9% (2371 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-10-06 13:57:52 +00:00
Priit Jõerüüt
e53d314828 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-06 13:57:51 +00:00
Weblate
316fe0ad03 Merge branch 'origin/develop' into Weblate. 2020-10-06 11:36:02 +00:00
Priit Jõerüüt
a575268ebd Translated using Weblate (Estonian) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-06 11:36:02 +00:00
Besnik Bleta
8507480bdb Translated using Weblate (Albanian) 
Currently translated at 99.8% (2367 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sq/
 2020-10-06 11:36:02 +00:00
Michael Telatynski
55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 
 Conflicts:
	src/components/views/settings/ProfileSettings.js
 2020-10-06 10:51:30 +01:00
Weblate
cb090f4743 Merge branch 'origin/develop' into Weblate. 2020-10-06 09:24:30 +00:00
Michael Telatynski
39c49125ce
Merge pull request #5273 from matrix-org/t3chguy/fix/15323 
Update copy for `redact` permission
 2020-10-06 10:24:26 +01:00
Szimszon
9a448e3974 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
 2020-10-06 07:25:32 +00:00
Priit Jõerüüt
d8443628e4 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-06 07:25:32 +00:00
Jeff Huang
6306524805 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-06 07:25:31 +00:00
Weblate
da7c0258c2 Merge branch 'origin/develop' into Weblate. 2020-10-05 21:40:55 +00:00
Hubert Chathi
f5f0686586
Merge pull request #5239 from uhoreg/dehydration 
Add support for dehydrated devices
 2020-10-05 17:40:49 -04:00
random
882648a918 Translated using Weblate (Italian) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
 2020-10-05 13:46:19 +00:00
Jeff Huang
d149548d13 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-05 11:31:08 +00:00
sagu
c791330145 Translated using Weblate (Slovenian) 
Currently translated at 0.9% (22 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sl/
 2020-10-04 17:05:09 +00:00
@a2sc:matrix.org
dcb4771d61 Translated using Weblate (German) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-10-04 17:05:09 +00:00
Xose M
46266cb739 Translated using Weblate (Galician) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-10-04 17:05:09 +00:00
Priit Jõerüüt
73a2c18e87 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-04 17:05:08 +00:00
Hubert Chathi
49cc62ca43 Oh right. Run i18n again. 2020-10-02 17:48:13 -04:00
Nikita Epifanov
f5a3915046 Translated using Weblate (Russian) 
Currently translated at 99.9% (2370 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-10-02 21:15:52 +00:00
Weblate
aeba605816 Merge branch 'origin/develop' into Weblate. 2020-10-02 17:19:10 +00:00
Michael Telatynski
7d11c3092d Decorate failed e2ee downgrade attempts better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 16:38:02 +01:00
@a2sc:matrix.org
62a62b0289 Translated using Weblate (German) 
Currently translated at 100.0% (2370 of 2370 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-10-02 13:30:30 +00:00
FeralMeow
b50fcd98f6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.3% (2307 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hans/
 2020-10-02 13:30:30 +00:00
Hubert Chathi
bd9cebe35d oh right, I need to run the i18n script too 2020-10-01 21:52:28 -04:00