7c1ac7aaff
fix unrelated tautology
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-07 10:02:40 +01:00
f0085a9feb
Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign
2020-05-07 09:56:21 +01:00
9ae812c346
Add a loading state for email addresses/phone numbers in settings
...
Fixes https://github.com/vector-im/riot-web/issues/13432
2020-05-06 15:17:55 -06:00
19bb678dd6
Merge pull request #4554 from nimbleape/pwa-taskbar-colour-follow-theme
...
set the meta tag for theme-color to the same theme css background
2020-05-06 11:27:01 -06:00
62bbf15efe
Merge pull request #4497 from matrix-org/t3chguy/invite_copy
...
Update Invite Dialog copy to include email addresses
2020-05-06 18:16:36 +01:00
1767a611a6
set the meta tag for theme-color to the same theme css background
2020-05-06 16:23:06 +01:00
14516d3e7e
Merge pull request #4552 from matrix-org/foldleft/fix-sublist-crash
...
Fix a crash where a name could unexpectedly be an empty list
2020-05-06 13:52:50 +01:00
854d27baf5
Merge pull request #4492 from ihatetothink/comunities-drag-from-context
...
Solves communities can be dragged from context menu
2020-05-06 13:06:30 +01:00
93f6737982
Merge pull request #4553 from matrix-org/bwindels/fixdefaultcomposeravatar
...
Remove prefixes for composer avatar urls
2020-05-06 10:40:48 +00:00
0c5c2501e6
remove prefixes as we're using data urls now
2020-05-06 12:23:03 +02:00
781cbea744
Fix a crash where a name could unexpectedly be an empty list
2020-05-05 15:39:37 +01:00
ed455a966d
Merge pull request #4549 from matrix-org/bwindels/unverif-session-copy-self
...
Differentiate copy for own untrusted device dialog
2020-05-05 09:30:13 +00:00
b04bb423f8
differentiate copy for own untrusted device dialog
2020-05-05 10:23:39 +02:00
c9ac726629
EventIndex: Remove an unused variable.
2020-05-05 10:21:18 +02:00
f2df698e3b
EventIndex: Reduce the logging the event index is producing.
2020-05-05 10:10:21 +02:00
d9639c5412
increare rage shake size limit to 5mb
2020-05-04 13:40:52 +02:00
8a794fafc6
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2302 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-05-04 09:08:56 +00:00
b9ce10af19
Translated using Weblate (Bulgarian)
...
Currently translated at 91.9% (2115 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-05-04 09:08:55 +00:00
dd6a938d53
Translated using Weblate (Estonian)
...
Currently translated at 35.3% (812 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-03 23:24:05 +00:00
677475ed06
Translated using Weblate (Estonian)
...
Currently translated at 34.8% (800 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-03 22:47:26 +00:00
0b99e25222
Translated using Weblate (Estonian)
...
Currently translated at 33.9% (781 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-02 22:48:38 +00:00
6e99faefde
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into comunities-drag-from-context
2020-05-02 13:40:57 +02:00
baa9cd8078
formatted files
2020-05-02 13:25:18 +02:00
a84a3c4780
hide badge when context menu is open
2020-05-02 13:12:31 +02:00
fc5a5c411f
provided.placeholder has no effect
2020-05-02 13:09:04 +02:00
01131a4036
removed unnecessary divs
2020-05-02 12:55:56 +02:00
f6185c29f1
Translated using Weblate (Estonian)
...
Currently translated at 31.3% (721 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-01 21:53:34 +00:00
0b4a3d36cd
Translated using Weblate (Estonian)
...
Currently translated at 30.6% (704 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-01 21:44:40 +00:00
8aebf02dc4
Merge branch 'origin/develop' into Weblate.
2020-05-01 10:37:31 +00:00
a89d3f986d
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2302 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-05-01 10:37:31 +00:00
d4005b6238
Translated using Weblate (Bulgarian)
...
Currently translated at 86.3% (1987 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-05-01 10:37:31 +00:00
bc6aeef824
Guard against race when waiting for cross-signing to be ready
...
Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
2020-05-01 10:58:00 +01:00
e9a36daa52
Merge branch 'origin/develop' into Weblate.
2020-05-01 09:41:29 +00:00
36cf07c975
Translated using Weblate (French)
...
Currently translated at 100.0% (2302 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-01 09:41:29 +00:00
6ca9630a3a
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2302 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-01 09:41:28 +00:00
064d90c4b5
Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_user_verified
2020-04-30 22:27:39 +01:00
d241ceea56
Clear more state in DeviceListener
...
Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out.
2020-04-30 22:21:48 +01:00
124740a63c
Wait for user to be verified in e2e setup
...
Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.
Fixes part of https://github.com/vector-im/riot-web/issues/13464
2020-04-30 22:08:00 +01:00
3b52c05e1f
Merge branch 'origin/develop' into Weblate.
2020-04-30 16:48:47 +00:00
c19338b1d3
Merge pull request #4462 from matrix-org/t3chguy/app_load4
...
Convert MatrixChat to a TypeScript class
2020-04-30 17:48:42 +01:00
9c916cc544
Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4
...
Conflicts:
src/components/structures/MatrixChat.tsx
2020-04-30 17:41:14 +01:00
04d73fcec9
Merge branch 'origin/develop' into Weblate.
2020-04-30 16:40:56 +00:00
7b775a8d93
Merge pull request #4271 from aaronraimist/esc-mark-as-read
...
Mark room as read when escape is pressed
2020-04-30 10:40:50 -06:00
d583bd7614
Merge branch 'origin/develop' into Weblate.
2020-04-30 16:21:19 +00:00
834be6f796
Translated using Weblate (German)
...
Currently translated at 77.8% (1792 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-30 16:21:19 +00:00
e56ce8d885
Merge pull request #4534 from matrix-org/jryans/key-backup-network-fail
...
Only show key backup reminder when confirmed by server to be missing
2020-04-30 17:21:13 +01:00
5d6b88e40b
Merge branch 'origin/develop' into Weblate.
2020-04-30 15:37:11 +00:00
fced07682e
Translated using Weblate (German)
...
Currently translated at 77.8% (1791 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-30 15:37:10 +00:00
fb2b37f0fe
Translated using Weblate (German)
...
Currently translated at 77.8% (1791 of 2302 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-30 15:37:10 +00:00
3240b3bd60
Add device name to unverified session toast
2020-04-30 16:09:38 +01:00
Michael Telatynski