Michael Telatynski
1ca20dffc8
Merge pull request #5204 from matrix-org/t3chguy/fix/15164
...
Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT
2020-09-17 13:34:07 +01:00
Michael Telatynski
5bf6697e48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:31:00 +01:00
Michael Telatynski
eda2dee63f
UI Feature Flag: 3PIDs
2020-09-17 13:25:18 +01:00
Weblate
7d2c1474d1
Merge branch 'origin/develop' into Weblate.
2020-09-17 11:09:14 +00:00
Michael Telatynski
148a57c58e
Merge pull request #5217 from matrix-org/t3chguy/fix/15175
...
UI Feature Flag: Disable VoIP
2020-09-17 12:09:09 +01:00
Michael Telatynski
f52b267bd3
i18n
2020-09-17 12:07:17 +01:00
Michael Telatynski
4213a557f2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15175
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 11:58:26 +01:00
Michael Telatynski
d340dd58d1
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 11:55:10 +01:00
Weblate
e8c561dfa8
Merge branch 'origin/develop' into Weblate.
2020-09-16 21:47:37 +00:00
Travis Ralston
2ad08c8394
Merge pull request #5224 from matrix-org/travis/ft-sep1620/05-directory
...
Fix setState() usage in the constructor of RoomDirectory
2020-09-16 15:47:32 -06:00
Travis Ralston
815a1559ff
Fix setState() usage in the constructor of RoomDirectory
...
React doesn't like it when we setState() in the constructor
2020-09-16 15:05:14 -06:00
J. Ryan Stinnett
b5000b236f
Fix lint error
2020-09-16 17:12:51 +01:00
J. Ryan Stinnett
a18d0271c3
Adjust tests for Secure Backup toast
2020-09-16 16:51:10 +01:00
Weblate
de0a2b3b93
Merge branch 'origin/develop' into Weblate.
2020-09-16 15:35:00 +00:00
Michael Telatynski
4db9ac16b5
Merge pull request #5211 from matrix-org/t3chguy/fix/15173
...
Hide Analytics sections if piwik config is not provided
2020-09-16 16:34:55 +01:00
Weblate
189d49a6f3
Merge branch 'origin/develop' into Weblate.
2020-09-16 15:34:30 +00:00
Michael Telatynski
aeb30c08ca
Merge pull request #5213 from matrix-org/t3chguy/fix/15174
...
UI Feature Flag: Disable feedback button
2020-09-16 16:34:12 +01:00
Michael Telatynski
9be04f8a67
i18n
2020-09-16 16:10:43 +01:00
Michael Telatynski
93323febcb
undo change
2020-09-16 16:10:24 +01:00
Michael Telatynski
a784e29622
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15174
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-16 16:09:08 +01:00
Michael Telatynski
c11abb74e0
UI Feature Flag: Share dialog QR code and social icons
2020-09-16 16:06:17 +01:00
Weblate
5893b077a4
Merge branch 'origin/develop' into Weblate.
2020-09-16 15:04:25 +00:00
Michael Telatynski
4d15a44d61
Merge pull request #5220 from matrix-org/t3chguy/fix/15202
...
Clean up UserInfo to not show a blank Power Selector for users not in room
2020-09-16 16:04:15 +01:00
Weblate
ff362d9f94
Merge branch 'origin/develop' into Weblate.
2020-09-16 14:59:14 +00:00
Michael Telatynski
4e2b6c2a30
Merge pull request #5212 from matrix-org/t3chguy/fix/15172
...
Also hide bug reporting prompts from the Error Boundaries
2020-09-16 15:59:07 +01:00
Michael Telatynski
06c4abd65e
Clean up UserInfo to not show a blank Power Selector for users not in room
2020-09-16 15:23:08 +01:00
Michael Telatynski
feb37878d8
tidy
2020-09-16 15:04:13 +01:00
J. Ryan Stinnett
7a5b0a964f
Adjust main encryption toast to reference Secure Backup
...
This adjusts the main toast to focus on Secure Backup as suggested in designs.
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
550a53e49c
Check cross-signing cached keys when showing setup button
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
6130d9e882
Delay encryption setup toasts until encrypted rooms present
...
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
0d25f62a9a
Tweak diagnostics for session backup key
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
26b465f1fd
Remove room recovery reminder
...
The Secure Backup toast replaces this with better UX.
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
ada00a3535
Recheck security status on room encryption change
...
This ensures we are alerted when you first interact with an encrypted room.
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
46f37fb969
Create cross-signing keys during authentication
...
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7be27e70c9
Add component key to actions array
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
685878a101
Clarify diagnostic about keys in storage
...
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
3259ab1f25
Place cross-signing action buttons on a single row
...
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7bd5e3fa31
Move security-related dialogs to a common directory
2020-09-16 15:03:06 +01:00
Michael Telatynski
aa25bad689
tidy
2020-09-16 14:57:46 +01:00
Michael Telatynski
1c44f15d2d
i18n
2020-09-16 14:54:30 +01:00
Michael Telatynski
d3c84e25f5
UI Feature Flag: Identity server
2020-09-16 14:45:34 +01:00
Michael Telatynski
dfabe79335
tidy up event handler
2020-09-16 13:44:24 +01:00
Michael Telatynski
d1070c05dd
UI Feature Flag: Disable VoIP
2020-09-16 13:40:27 +01:00
Michael Telatynski
7a448be1dc
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-16 12:14:33 +01:00
Weblate
74c51c0caa
Merge branch 'origin/develop' into Weblate.
2020-09-16 10:39:00 +00:00
call_xz
c653e7c5a0
Translated using Weblate (Japanese)
...
Currently translated at 56.6% (1344 of 2374 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ja/
2020-09-16 10:39:00 +00:00
Mirza Arnaut
8cbd67d611
Translated using Weblate (Bosnian)
...
Currently translated at 0.2% (4 of 2374 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/bs/
2020-09-16 10:38:59 +00:00
Michael Telatynski
f4f94e31d1
UI Feature Flag: Disable integrations entry UI
2020-09-16 11:38:50 +01:00
Michael Telatynski
45420ff13b
i18n
2020-09-16 11:27:39 +01:00
Michael Telatynski
9cc789756b
UI Feature Flag: Hide flair
2020-09-16 11:26:15 +01:00