02dbdc5c0a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
07b9d6b30b
Fix styling of setting flag descriptions in preferences
...
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
2021-07-28 14:39:19 +01:00
776435f620
Switch all-rooms toggle for spaces to non-feature settings key
2021-07-27 21:17:24 +01:00
0a9d3302ba
Fix home vs all rooms requiring app reload and change default to home
...
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
12461a79e1
Move SettingsStore setting_updated dispatch to action enum
2021-07-27 17:19:45 +01:00
755007cbee
Conclude labs flags and write more tests
2021-07-27 14:39:14 +01:00
7ccc429bea
Change spaces beta feedback to not be so beta-centric
2021-07-23 15:47:11 +01:00
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
f4dfe9832b
change labs flag wording
2021-07-14 16:20:25 +02:00
09d08882e3
Standardise casing of identity server
...
Replace instances of 'Identity Server' with 'Identity server', when at start of
sentence, or 'identity server' when not.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com >
2021-07-13 16:28:43 +01:00
bd175c6f40
Improve and consolidate typing
2021-07-10 15:43:46 +01:00
10bdb3cefa
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-07 13:07:43 +02:00
e355bf0db1
Merge remote-tracking branch 'upstream/develop' into reorganize-preferences
2021-07-01 18:53:53 +02:00
3cc041a4ae
Change displayName of ctrlEnterToSend
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-01 18:53:38 +02:00
d9eec1c03b
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-06-30 08:58:20 +01:00
782e793925
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
2021-06-29 15:27:24 +01:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
6607294573
Deprecate Tinter and TintableSVG
2021-06-28 17:13:23 +01:00
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
4a66794236
update copy
2021-06-22 17:26:19 +01:00
3c9cd938d0
remove spurious full stop
2021-06-22 15:29:53 +01:00
77a4d345bd
Submitting abuse reports to moderators ( #6213 )
...
This patch is part of MSC3215. It implements `feature_report_to_moderator`
to let end-users send report to room moderators instead of homeserver
administrators.
This only works if the room has been setup for moderation, something that
does not have a UX yet.
Signed-off-by: David Teller <davidt@element.io >
2021-06-18 18:09:02 +02:00
7d90612371
Iterate PR
2021-06-17 16:22:40 +01:00
ae5cd9d7ac
Add new layout switcher UI
...
Co-authored-by: Quirin Götz <codeworks@supercable.onl >
2021-06-17 14:11:44 +01:00
b4fbc791bb
Add experimental options to the Spaces beta
2021-06-16 09:01:13 +01:00
40d2f8228f
Fix watching settings
...
An accidental variable shadowing was preventing setting watcher
callbacks from being fired.
Signed-off-by: Robin Townsend <robin@robin.town >
2021-06-05 01:16:52 -04:00
59f4c728c9
Initial cut of Pinned event card in the right panel
2021-05-25 16:10:44 +01:00
97c6ee39d0
Merge pull request #6063 from matrix-org/t3chguy/fix/17369
...
Move SettingsStore watchers/monitors over to ES6 maps for performance
2021-05-25 10:58:09 +01:00
7e165384fd
Merge branch 'develop' into reorganize-preferences
2021-05-22 17:25:04 +02:00
332412782e
Remove logo spinner
...
Removed since design wants to avoid associating slowness with the brand.
Signed-off-by: Robin Townsend <robin@robin.town >
2021-05-20 17:31:10 -04:00
018a75ea1e
Upgrade showChatEffects to room-level setting exposure
2021-05-20 09:10:21 -06:00
73b24ae225
move WatchManager over to an ES6 Map
2021-05-19 09:24:46 +01:00
cf501371fa
move Settings monitors over to an ES6 Map
2021-05-19 09:11:14 +01:00
cb2ee0451d
move Settings watchers over to an ES6 Map
2021-05-19 09:06:01 +01:00
607ca17971
Iterate beta feedback dialog
2021-05-12 16:11:38 +01:00
ea9be0dd4c
Merge pull request #6012 from matrix-org/t3chguy/fix/17238
...
Add feedback mechanism for beta features, namely Spaces
2021-05-11 17:46:21 +01:00
92e30f0607
Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev
2021-05-11 10:13:21 -06:00
bf4c8f048f
Add feedback mechanism for beta features
2021-05-11 15:58:19 +01:00
aac1f4330d
Remove "in development" flag from voice messages
2021-05-07 19:36:29 -06:00
cb13200c2d
last minute copy tweak
2021-05-07 11:56:41 +01:00
90538c95aa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
2021-05-06 08:05:14 +01:00
0fe6a389d4
Add a note about sharing your IP with P2P calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-05-04 12:36:22 +02:00
2435332d37
fix beta disabled behaviour
2021-04-30 12:42:16 +01:00
d2959e1acc
Add mechanism for disabling Betas
2021-04-30 12:30:05 +01:00
5f6895487f
Rename ctrl+f
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-04-30 11:09:35 +02:00
158a0f90cb
Further design iteration
2021-04-29 22:02:18 +01:00
279654cc9e
Design iterations based on PR feedback
2021-04-29 16:08:59 +01:00
1802adb4d2
Iterate styling and decoration for the beta prompts
2021-04-28 22:47:08 +01:00
Michael Telatynski