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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Travis Ralston
|
60c6e23b94
|
Match intended case for settings
|
2020-09-15 08:55:03 -06: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 |
|
Travis Ralston
|
d11ce5fade
|
Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons
Remove defunct "always show encryption icons" setting
|
2020-09-15 08:52:19 -06:00 |
|
Michael Telatynski
|
6c166f0560
|
If no bug_report_endpoint_url, hide rageshaking from the App
|
2020-09-15 15:49:25 +01:00 |
|
Michael Telatynski
|
9a3c30b1f1
|
Merge pull request #5203 from matrix-org/t3chguy/fix/15150
Don't show Notifications Prompt Toast if user has master rule enabled
|
2020-09-15 14:09:38 +01:00 |
|
Michael Telatynski
|
6b5426bddd
|
Rename toolbar Notifier methods to prompt
|
2020-09-15 13:58:29 +01:00 |
|
Travis Ralston
|
0cac6874d4
|
Update i18n
|
2020-09-14 22:31:45 -06:00 |
|