Šimon Brandner
bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check
2021-02-18 18:16:16 +01:00
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling
2021-02-15 16:12:08 +01:00
Šimon Brandner
65ef4f2f22
Removed the commented out code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-15 16:05:14 +01:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock
2021-02-08 15:26:50 +01:00
J. Ryan Stinnett
15a4032be0
Merge pull request #5530 from aaronraimist/option-hide-stickers
...
Add option to hide the stickers button in the composer
2021-02-04 17:01:23 +00:00
Šimon Brandner
972c947049
More generic layout setting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 10:35:35 +01:00
Šimon Brandner
0c09158f2a
Comment out unused code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-22 08:41:39 +01:00
Šimon Brandner
da09362f99
Added option to hide line numbers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:08:55 +01:00
Šimon Brandner
7f727be4f6
Added expand code block option
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-18 17:44:32 +01: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
Aaron Raimist
b8334bfd4a
Add option to hide the stickers button in the composer
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-01-02 15:31:54 -06: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
Šimon Brandner
19d9ea3477
Merge branch 'develop' into feature-multi-language-spell-check
2020-12-03 12:06:43 +01:00
Šimon Brandner
fa19adcfe0
Simplifie
2020-12-03 11:50:08 +01:00
Šimon Brandner
bab541a652
Hide spell-check settings if not using Electron
2020-12-02 20:14:58 +01:00
Šimon Brandner
db5bc0cb7a
Fix formatting
2020-12-01 20:36:25 +01:00
Šimon Brandner
3c2bb6e4f6
Cleanup
2020-12-01 20:17:24 +01:00
Šimon Brandner
b207a877eb
Change label
2020-12-01 16:59:02 +01: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
Šimon Brandner
ead00dcded
Set spell-check languages without reloading
2020-11-29 14:46:09 +01:00
Šimon Brandner
8f40cd39fd
Added styling
2020-11-29 12:29:05 +01:00
Šimon Brandner
f0bbed0c44
Allow default value
2020-11-29 12:17:07 +01:00
Šimon Brandner
5e4f9907cf
Added persistance
2020-11-28 19:39:09 +01:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676
2020-11-26 18:21:28 +01:00
Šimon Brandner
2f988bc97f
Added UI
2020-11-26 13:51:03 +01:00
Clemens Zeidler
1346416d20
Merge branch 'develop' into ctrl-enter-send
2020-11-19 19:40:38 +13:00
Michael Telatynski
171b3ede76
improve comments
2020-10-30 14:27:14 +00:00
Michael Telatynski
3f11259fa8
fix CountlyAnalytics canEnable on wrong target
2020-10-30 13:42:35 +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
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
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
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
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
J. Ryan Stinnett
7bd5e3fa31
Move security-related dialogs to a common directory
2020-09-16 15:03:06 +01:00
Michael Telatynski
d3c84e25f5
UI Feature Flag: Identity server
2020-09-16 14:45:34 +01:00
Michael Telatynski
2bea8457e9
UI Feature Flag: Communities
2020-09-16 12:56:40 +01:00
Michael Telatynski
7a448be1dc
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-16 12:14:33 +01:00
Michael Telatynski
f4f94e31d1
UI Feature Flag: Disable integrations entry UI
2020-09-16 11:38:50 +01:00