Commit Graph

576 Commits (c6dd9bc5261f35563c2a8c493a1042e26ad85c20)

Author SHA1 Message Date
Šimon Brandner e355bf0db1
Merge remote-tracking branch 'upstream/develop' into reorganize-preferences 2021-07-01 18:53:53 +02:00
Šimon Brandner 3cc041a4ae
Change displayName of ctrlEnterToSend
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-01 18:53:38 +02:00
J. Ryan Stinnett 782e793925 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:27:24 +01:00
J. Ryan Stinnett ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Germain Souquet 6607294573 Deprecate Tinter and TintableSVG 2021-06-28 17:13:23 +01:00
Michael Telatynski 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
Michael Telatynski 4a66794236 update copy 2021-06-22 17:26:19 +01:00
Michael Telatynski 3c9cd938d0 remove spurious full stop 2021-06-22 15:29:53 +01:00
David Teller 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
Michael Telatynski 7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Michael Telatynski b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Robin Townsend 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
Michael Telatynski 59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Michael Telatynski 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
Šimon Brandner 7e165384fd
Merge branch 'develop' into reorganize-preferences 2021-05-22 17:25:04 +02:00
Robin Townsend 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
Travis Ralston 018a75ea1e
Upgrade showChatEffects to room-level setting exposure 2021-05-20 09:10:21 -06:00
Michael Telatynski 73b24ae225 move WatchManager over to an ES6 Map 2021-05-19 09:24:46 +01:00
Michael Telatynski cf501371fa move Settings monitors over to an ES6 Map 2021-05-19 09:11:14 +01:00
Michael Telatynski cb2ee0451d move Settings watchers over to an ES6 Map 2021-05-19 09:06:01 +01:00
Michael Telatynski 607ca17971 Iterate beta feedback dialog 2021-05-12 16:11:38 +01:00
Michael Telatynski 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
Travis Ralston 92e30f0607 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev 2021-05-11 10:13:21 -06:00
Michael Telatynski bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Travis Ralston aac1f4330d Remove "in development" flag from voice messages 2021-05-07 19:36:29 -06:00
Michael Telatynski cb13200c2d last minute copy tweak 2021-05-07 11:56:41 +01:00
Michael Telatynski 90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Šimon Brandner 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
Michael Telatynski 2435332d37 fix beta disabled behaviour 2021-04-30 12:42:16 +01:00
Michael Telatynski d2959e1acc Add mechanism for disabling Betas 2021-04-30 12:30:05 +01:00
Šimon Brandner 5f6895487f
Rename ctrl+f
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-30 11:09:35 +02:00
Michael Telatynski 158a0f90cb Further design iteration 2021-04-29 22:02:18 +01:00
Michael Telatynski 279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski 1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Michael Telatynski c5f653245a Show Spaces beta card in Labs & My Communities view
the image is temporary
2021-04-27 16:29:42 +01:00
Travis Ralston eed5efdbe1 Labs: Add quick/cheap "do not disturb" flag
This just disables audio notifications and the popup, which is the easiest way to do "do not disturb" for a device. This needs spec changes to be done properly, as it's a shame that mobile devices for the user will still go off.

Disabling all of push doesn't sound ideal as it would potentially mean missing highlights for when leaving DND mode.
2021-04-15 00:47:09 -06:00
J. Ryan Stinnett bef5c6593e Remove key sharing feature flag 2021-04-09 17:05:55 +01:00
J. Ryan Stinnett 7b0ab4a059 Enable sharing historical keys on invite
After discussion with Product, we're ready to enable this key sharing work from
https://github.com/matrix-org/matrix-react-sdk/pull/5763 (based on
https://github.com/matrix-org/matrix-doc/pull/3061).
2021-04-09 12:51:23 +01:00
Hubert Chathi db2f573410 Merge branch 'develop' into room-history-key-sharing2 2021-03-25 19:28:50 -04:00
Travis Ralston 69f90ee97e Label labs flag as in development 2021-03-16 23:55:07 -06:00
Travis Ralston 097c2d8be0 Add labs flag for voice messages 2021-03-16 22:58:44 -06:00
Hubert Chathi 7f141276ff initial work on room history key sharing, take 2 2021-03-15 22:56:56 -04:00
Travis Ralston c7d4dfa4f5
Merge pull request #5692 from SimonBrandner/scroll-to-bottom-setting
Add a scroll to bottom on message sent setting
2021-03-02 17:41:15 -07:00
Travis Ralston 4e27b00cf3 Move call buttons to the room header
This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.
2021-02-26 13:46:39 -07:00
Šimon Brandner a0200de7b4
Add scrollToBottomOnMessageSent setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 18:34:54 +01:00
Michael Telatynski 0f0e6c335f
Merge pull request #5668 from matrix-org/t3chguy/spaces2
Initial Spaces feature flag
2021-02-25 15:38:30 +00:00
Michael Telatynski 864a9974b1 Tweak spaces labs flag copy 2021-02-25 12:20:10 +00:00
Michael Telatynski 0f0edbfb14 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces1
 Conflicts:
	src/utils/objects.ts
2021-02-25 10:50:56 +00:00
Michael Telatynski 148764aa8a Create Labs flag for Spaces 2021-02-19 13:50:49 +00:00
Michael Telatynski a823572394 delint 2021-02-19 13:38:43 +00:00