Commit graph

980 commits

Author SHA1 Message Date
J. Ryan Stinnett
5431dc7331
Merge pull request #5548 from SimonBrandner/add-search-shortcut
Add optional search shortcut
2021-01-28 12:33:32 +00:00
J. Ryan Stinnett
35bee5c5ea
Merge pull request #5522 from SimonBrandner/room-dialog-fixes
Fixes for the general tab in the room dialog
2021-01-22 10:34:37 +00:00
J. Ryan Stinnett
e49a931588
Merge pull request #5533 from aaronraimist/security-key
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
2021-01-21 17:46:02 +00:00
Šimon Brandner
e7384f829a
Made search shortcut optional
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-17 16:44:29 +01:00
Will Hunt
448a5ea42d Remove replaceableComponentTs from BridgeTile 2021-01-08 18:07:48 +00:00
Aaron Raimist
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-01-04 19:17:17 -06:00
Šimon Brandner
48cfd3f9da Fixed some avatar stuff
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-22 09:29:35 +01:00
Will Hunt
c5e578a502 linting 2020-12-14 12:59:59 +00:00
Will Hunt
da86bc0b0a Allow sender for backwards compat 2020-12-14 12:59:59 +00:00
Will Hunt
48018615f8 Add support for linking to the remote network page 2020-12-14 12:59:59 +00:00
Will Hunt
d6312606e6 Use correct key for avatar 2020-12-14 12:59:59 +00:00
Will Hunt
e448da0bcd Add interface for event content, and validate 2020-12-14 12:59:59 +00:00
Will Hunt
8d203043d4 Remove hide/show behaviour 2020-12-14 12:59:59 +00:00
Will Hunt
8e6061b37a Ts tweaks 2020-12-14 12:59:59 +00:00
Will Hunt
86200e5519 Convert BridgeTile to Typescript 2020-12-14 12:59:59 +00:00
Travis Ralston
27df6ae6e1 Remove impossible labs feature: sending hidden read receipts
This claims it requires a compatible homeserver, but that does not exist and hasn't for years. Let's just remove the option to stop giving people false hope.

Once notifications are decoupled from read receipts, this sort of thing should be more possible.
2020-12-09 18:36:48 -07:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
anonym
b1b0e93d5e
Update i18n for Appearance User Settings
The variable has to be added to the i18n files as well (I don't know how to do that)
2020-11-30 21:33:52 +01:00
Steffen Kolmer
d9c7148182 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-11-27 16:20:35 +01:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00
Šimon Brandner
acd148d807 Remove nonsense lines 2020-11-26 16:58:34 +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
Steffen Kolmer
607e33feba Extensibility, TypeScript and lazy loading 2020-10-19 21:25:01 +02:00
Steffen Kolmer
c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02: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