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

28388 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
70fa390cc0 Merge branch 'origin/develop' into Weblate. 2020-09-17 12:51:24 +00:00
Michael Telatynski
5f324b19f0
Merge pull request #5221 from matrix-org/t3chguy/fix/15180 
UI Feature Flag: Share dialog QR code and social icons
 2020-09-17 13:51:19 +01:00
Michael Telatynski
ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:42:27 +01:00
Weblate
198720af36 Merge branch 'origin/develop' into Weblate. 2020-09-17 12:40:11 +00:00
Michael Telatynski
1e9e0dee87
Merge pull request #5227 from matrix-org/t3chguy/fix/15188 
UI Feature Flag: Registration, Password Reset, Deactivate
 2020-09-17 13:40:06 +01:00
Weblate
4c37fdaea0 Merge branch 'origin/develop' into Weblate. 2020-09-17 12:34:12 +00:00
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
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
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
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
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
04d7aebad0 UI Feature Flag: Disable feedback button 2020-09-16 10:59:14 +01:00
Michael Telatynski
dbd3245e02 i18n 2020-09-16 10:53:30 +01:00
Michael Telatynski
caef9b27a0 Also hide bug reporting prompts from the Error Boundaries 2020-09-16 10:50:53 +01:00
Michael Telatynski
d990986407 Also hide Privacy heading in settings and fix React Key warning 2020-09-16 10:37:15 +01:00
Michael Telatynski
771ab82598 Hide Analytics sections if piwik config is not provided 2020-09-16 10:29:21 +01:00
Weblate
1dc9f6e103 Merge branch 'origin/develop' into Weblate. 2020-09-15 16:43:01 +00:00
Travis Ralston
3d9c520af8
Merge pull request #5201 from matrix-org/travis/3pid-invites 
Tactical improvements to 3PID invites
 2020-09-15 10:42:55 -06:00
Weblate
33af708d64 Merge branch 'origin/develop' into Weblate. 2020-09-15 15:23:53 +00:00
Michael Telatynski
6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172 
If no bug_report_endpoint_url, hide rageshaking from the App
 2020-09-15 16:23:48 +01:00
Michael Telatynski
16d8ea184d i18n 2020-09-15 15:58:23 +01:00
Weblate
dacdacd70d Merge branch 'origin/develop' into Weblate. 2020-09-15 14:55:15 +00:00
Travis Ralston
60c6e23b94 Match intended case for settings 2020-09-15 08:55:03 -06:00
Weblate
c80c0f31cf Merge branch 'origin/develop' into Weblate. 2020-09-15 14:53:53 +00:00
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base 
Introduce a concept of UI features, using it for URL previews at first
 2020-09-15 08:53:48 -06:00
Travis Ralston
246b802206 Merge branch 'develop' into travis/3pid-invites 2020-09-15 08:53:32 -06:00