Šimon Brandner
5e4f9907cf
Added persistance
2020-11-28 19:39:09 +01:00
Šimon Brandner
aba5ef100f
Merge branch 'develop' into feature-multi-language-spell-check
2020-11-28 19:18:17 +01:00
Šimon Brandner
acd148d807
Remove nonsense lines
2020-11-26 16:58:34 +01:00
Šimon Brandner
2f988bc97f
Added UI
2020-11-26 13:51:03 +01:00
Šimon Brandner
15ffdcb652
Added trailing comma
2020-11-22 09:57:22 +01:00
Šimon Brandner
dbce418b63
Check if old password is empty
2020-11-22 09:26:51 +01:00
Šimon Brandner
cd197133aa
Button click validation
...
Check validity when clicking change password button
2020-11-22 08:49:20 +01:00
Šimon Brandner
651d6f4320
Merge branch 'develop' into feature-change-password-validation
2020-11-21 20:23:27 +01:00
Šimon Brandner
7e786e67a8
Added live validation
2020-11-21 20:10:38 +01:00
Clemens Zeidler
1346416d20
Merge branch 'develop' into ctrl-enter-send
2020-11-19 19:40:38 +13:00
J. Ryan Stinnett
14e64c10a3
Restore numeric count as well for better pluralisation
2020-11-18 15:16:35 +00:00
J. Ryan Stinnett
95a436cdaf
Use room(s) style in message
2020-11-18 14:57:31 +00:00
Michael Telatynski
979faf23e8
Fix poorly i18n'd string
2020-11-11 16:49:51 +00:00
David Baker
e0929298c6
Merge pull request #5394 from matrix-org/dbkr/log_profile_save_error_2
...
Log when saving profile
2020-11-04 13:52:53 +00:00
David Baker
28a64cd56c
Log when saving profile
...
We had a bug report with this failing but there's nothing useful because nothing is logged.
2020-11-04 11:33:14 +00:00
Michael Telatynski
2fccde0e8d
Hide prompt to add email for notifications if 3pid ui feature is off
2020-11-03 23:09:23 +00:00
David Baker
7ec1d5a881
Fix a bunch of silly lint errors
...
At some point the script to generate .eslintignore.errorfiles had
been run and added all these files to the ignore list, often because
they lacked a space before a brace or something equally mundane.
These are the easiest bunch.
2020-10-30 18:18:17 +00:00
Michael Telatynski
f80ee391bc
Merge pull request #5370 from matrix-org/t3chguy/countly
...
Fix CountlyAnalytics NPE on MatrixClientPeg
2020-10-30 14:28:48 +00:00
Michael Telatynski
171b3ede76
improve comments
2020-10-30 14:27:14 +00:00
Michael Telatynski
b6532f9b80
Merge pull request #5369 from matrix-org/t3chguy/countly
...
fix CountlyAnalytics canEnable on wrong target
2020-10-30 13:47:35 +00:00
Michael Telatynski
3f11259fa8
fix CountlyAnalytics canEnable on wrong target
2020-10-30 13:42:35 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly
...
Initial Countly work
2020-10-30 13:07:58 +00:00
Michael Telatynski
b01055f962
Tidy up and fix some edge cases
2020-10-30 10:26:15 +00:00
Michael Telatynski
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
Travis Ralston
a501d698aa
Add a UI Feature flag for room history settings
2020-10-28 09:00:36 -06:00
Michael Telatynski
999d83cb8d
Show Integrations error if iframe failed to load too
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-16 13:54:37 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration
...
Convert auth lifecycle to TS, remove dead ILAG code
2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
f2b72efe39
Remove various remaining bits of ILAG flows
...
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
2020-10-07 12:53:59 +01:00
Michael Telatynski
55a18b8c2d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255
...
Conflicts:
src/components/views/settings/ProfileSettings.js
2020-10-06 10:51:30 +01:00
Michael Telatynski
39c49125ce
Merge pull request #5273 from matrix-org/t3chguy/fix/15323
...
Update copy for `redact` permission
2020-10-06 10:24:26 +01:00
Michael Telatynski
d3cbb51ecb
Use Own Profile Store for the Profile Settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-02 15:39:34 +01:00
Michael Telatynski
c73ef57887
Update copy for redact
permission
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-01 15:51:35 +01:00
Michael Telatynski
4bd7ae5131
Show server errors from saving profile settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-01 15:49:22 +01:00
Michael Telatynski
76a9803c6c
Fix button label on the Set Password Dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:24:01 +01:00
Travis Ralston
a2860e698a
Clean up other unlinted lint issues
2020-09-24 08:26:59 -06:00
Travis Ralston
3e0cbd7bfe
Appease the linters
2020-09-21 21:09:46 -06:00
Travis Ralston
4f983ad9a1
Rework profile sections of user and room settings
...
Mostly by design request. Some is freehand, to be reviewed.
2020-09-21 21:00:51 -06:00
Travis Ralston
5630f35715
Add a UI feature to disable advanced encryption options
2020-09-18 11:33:02 -06:00
Travis Ralston
189233447b
Merge branch 'develop' into t3chguy/fix/15182
2020-09-18 11:06:32 -06:00
Michael Telatynski
5a6ab95f84
Merge pull request #5215 from matrix-org/t3chguy/fix/15179
...
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-18 12:34:38 +01:00
Michael Telatynski
9dbc1dbc85
Hide Advanced Appearance Settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 11:34:35 +01:00
Michael Telatynski
687a2e56b2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179
...
Conflicts:
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-18 11:29:38 +01:00
Michael Telatynski
598c982f02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-18 11:14:36 +01:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup
...
Defer encryption setup until first E2EE room
2020-09-18 10:28:33 +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
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
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
Michael Telatynski
d340dd58d1
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 11:55:10 +01: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