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

23303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
ffecf03b2a Update margins to improve grouping 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 14:48:50 +01:00
Michael Telatynski
4041c030a5 Apply changes from Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a Update styling and copy to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 13:47:15 +01:00
Damir Jelić
a26a3f5862 Merge branch 'poljar/eventindex-log-improvement' into develop 2020-04-08 14:23:54 +02:00
J. Ryan Stinnett
5d65da12c2
Merge pull request #4364 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-04-08 13:15:01 +01:00
Weblate
b0d2c3fd98 Merge branch 'origin/develop' into Weblate. 2020-04-08 11:20:01 +00:00
Besnik Bleta
3a05d74ae8 Translated using Weblate (Albanian) 
Currently translated at 99.6% (2268 of 2276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-04-08 11:20:01 +00:00
J. Ryan Stinnett
8ffc206358
Merge pull request #4356 from matrix-org/travis/deactivate-sso 
Support deactivating your account with SSO
 2020-04-08 12:19:53 +01:00
Weblate
a0ecfdd786 Merge branch 'origin/develop' into Weblate. 2020-04-08 10:32:16 +00:00
J. Ryan Stinnett
a5f6a07ed6
Merge pull request #4359 from matrix-org/jryans/backup-key-cache-format 
Add debug status for cached backup key format
 2020-04-08 11:32:11 +01:00
Michael Telatynski
ada860f163 Add toggle for e2ee when creating private room in x-signing world 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 10:50:22 +01:00
Weblate
0310e5ec93 Merge branch 'origin/develop' into Weblate. 2020-04-08 09:45:42 +00:00
Michael Telatynski
4d7f3ba109
Merge pull request #4361 from matrix-org/t3chguy/fix_composer_placeholder1 
Fix composer placeholder not updating
 2020-04-08 10:45:35 +01:00
Michael Telatynski
4447370764 Fix composer placeholder not updating 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 10:19:52 +01:00
Damir Jelić
c6fcaf86ff EventIndex: Log if we had all events in a checkpoint but are continuing. 2020-04-08 11:15:13 +02:00
Weblate
23e1e6f27a Merge branch 'origin/develop' into Weblate. 2020-04-08 09:00:45 +00:00
Michael Telatynski
f61c888f0c
Merge pull request #4358 from matrix-org/t3chguy/fix_complete_security 
Fix sas verification buttons to match figma
 2020-04-08 10:00:39 +01:00
Weblate
f2ddb96c1b Merge branch 'origin/develop' into Weblate. 2020-04-08 08:47:08 +00:00
MamasLT
7553747433 Translated using Weblate (Lithuanian) 
Currently translated at 46.3% (1052 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-04-08 08:47:08 +00:00
Kévin C
b9d28f09c8 Translated using Weblate (French) 
Currently translated at 100.0% (2273 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-08 08:47:03 +00:00
Jeff Huang
23ccd6de1c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2273 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-04-08 08:47:03 +00:00
Zoe
17f3b92726
Merge pull request #4345 from matrix-org/foldleft/12982-notifications 
Don't show fallback text for verification requests
 2020-04-08 09:46:56 +01:00
Weblate
aeb3e55a10 Merge branch 'origin/develop' into Weblate. 2020-04-07 21:34:38 +00:00
Travis Ralston
fc28492a2a
Merge pull request #4360 from matrix-org/travis/fix-share-dialog 
Fix share dialog correctly
 2020-04-07 15:34:33 -06:00
Travis Ralston
900a05366e Fix share dialog correctly 
componentDidMount fires too late for this dialog, so we need to set ourselves up in the constructor.

Fixes https://github.com/vector-im/riot-web/issues/13068
 2020-04-07 15:22:38 -06:00
J. Ryan Stinnett
3196c1a031 Update i18n 2020-04-07 19:24:07 +01:00
Weblate
e91f51af3b Merge branch 'origin/develop' into Weblate. 2020-04-07 18:13:44 +00:00
Travis Ralston
7044eed82f
Merge pull request #4357 from matrix-org/travis/sso-devices 
Use singular copy when only deleting one device
 2020-04-07 12:13:38 -06:00
J. Ryan Stinnett
c21dccc397 Add debug status for cached backup key format 
Check backup key format to ease tracking such issues

Debug helper for https://github.com/vector-im/riot-web/issues/13057
 2020-04-07 19:11:06 +01:00
Michael Telatynski
712e6e8c49 Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 19:03:12 +01:00
Travis Ralston
3ab9634249 Pluralize more differently 2020-04-07 11:46:53 -06:00
Travis Ralston
3be197cf86 Use singular copy when only deleting one device 2020-04-07 11:19:56 -06:00
Weblate
b58f197b54 Merge branch 'origin/develop' into Weblate. 2020-04-07 16:10:47 +00:00
Michael Telatynski
24a5d8355f
Merge pull request #4288 from matrix-org/t3chguy/react_stickers 
Deem m.sticker events as actionable for reacting
 2020-04-07 17:10:42 +01:00
Weblate
f950d3b365 Merge branch 'origin/develop' into Weblate. 2020-04-07 16:08:43 +00:00
David Baker
112e198a54
Merge pull request #4354 from matrix-org/dbkr/dont_block_dialogs_with_spinner 
Don't show spinner over encryption setup dialogs
 2020-04-07 17:08:38 +01:00
Weblate
927bf21902 Merge branch 'origin/develop' into Weblate. 2020-04-07 16:03:10 +00:00
rkfg
13545abb20 Translated using Weblate (Russian) 
Currently translated at 83.4% (1894 of 2271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-07 16:03:10 +00:00
Travis Ralston
234f3ee772
Merge pull request #4348 from matrix-org/travis/jitsi/wellknown 
Support Jitsi information from client .well-known
 2020-04-07 10:03:05 -06:00
Weblate
0b1a97fb81 Merge branch 'origin/develop' into Weblate. 2020-04-07 13:46:28 +00:00
Michael Telatynski
5c5c095737
Merge pull request #4350 from matrix-org/t3chguy/default_home 
Add new default home page fallback
 2020-04-07 14:46:23 +01:00
Michael Telatynski
3e4e7953ed word-break: break-word; 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 13:40:25 +01:00
Michael Telatynski
b5e6f8b8c1 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 13:34:10 +01:00
David Baker
bce22c620f Don't show spinner over encryption setup dialogs 
Fixes https://github.com/vector-im/riot-web/issues/13051
 2020-04-07 13:08:18 +01:00
Weblate
b5d77d2774 Merge branch 'origin/develop' into Weblate. 2020-04-07 11:48:03 +00:00
J. Ryan Stinnett
b8a57aa6f2
Merge pull request #4351 from matrix-org/jryans/check-more-account-data 
Check more account data in toast listener
 2020-04-07 12:47:57 +01:00
Weblate
c2eeaee219 Merge branch 'origin/develop' into Weblate. 2020-04-07 11:31:10 +00:00
David Baker
5b263f1905
Merge pull request #4353 from matrix-org/dbkr/start_presence_after_client_init 
Don't try to send presence updates until the client is started
 2020-04-07 12:31:04 +01:00
David Baker
8d68a4ab52 Don't try to send presence updates until the client is started 
Otherwise we can start making API reqiests which can fail which
can trigger things like the soft logout code.

Fixes https://github.com/vector-im/riot-web/issues/12943
 2020-04-07 12:07:41 +01:00
Weblate
aea8c3248c Merge branch 'origin/develop' into Weblate. 2020-04-07 10:55:31 +00:00