mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 12:16:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
28406 commits 206 branches 547 tags 603 MiB
Commit graph

28406 commits

This branch
This branch
All branches
Author SHA1 Message Date
Priit Jõerüüt
72d40b604e Translated using Weblate (Estonian) 
Currently translated at 100.0% (2376 of 2376 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-09-18 09:28:40 +00:00
Jeff Huang
3707359ec3 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2376 of 2376 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-09-18 09:28:39 +00:00
Weblate
6811576c0b Merge branch 'origin/develop' into Weblate. 2020-09-17 14:06:21 +00:00
Michael Telatynski
d59a1fbd80
Merge pull request #5179 from matrix-org/t3chguy/tidy-dev-deps 
Tidy devDeps, all the webpack stuff lives in the layer above
 2020-09-17 15:06:16 +01:00
Weblate
d75af1d826 Merge branch 'origin/develop' into Weblate. 2020-09-17 13:43:41 +00:00
Michael Telatynski
c6d76f2b55
Merge pull request #5214 from matrix-org/t3chguy/fix/15178 
UI Feature Flag: Hide flair
 2020-09-17 14:43:36 +01:00
Michael Telatynski
c904b4f416 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 14:10:51 +01:00
Weblate
0587e72841 Merge branch 'origin/develop' into Weblate. 2020-09-17 13:08:02 +00:00
Michael Telatynski
53ee5d82c7
Merge pull request #5218 from matrix-org/t3chguy/fix/15181 
UI Feature Flag: Identity server
 2020-09-17 14:07:56 +01:00
Michael Telatynski
25171347a0 i18n 2020-09-17 13:57:47 +01:00
Michael Telatynski
c1cf8db78f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181 
 Conflicts:
	src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
	src/i18n/strings/en_EN.json
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:55:11 +01:00
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
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
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
feb37878d8 tidy 2020-09-16 15:04:13 +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
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