mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 16:21:36 +03:00
Code Issues Projects Releases Packages Wiki Activity
36270 commits 219 branches 562 tags 474 MiB
Commit graph

617 commits

Author SHA1 Message Date
Germain Souquet
7d4698da49 Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-10 11:41:15 +02:00
Travis Ralston
6a9ebc6902
Merge pull request #6390 from SimonBrandner/feature/hidden-rrs 
Support for MSC2285 (hidden read receipts)
 2021-08-06 09:27:14 -06:00
Šimon Brandner
44acded0a0
Use snake case 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:55:08 +02:00
Šimon Brandner
015e0b6d77
Make into a labs feature 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:51:57 +02:00
Šimon Brandner
b99e39e011
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 2021-08-04 18:14:38 +02:00
Šimon Brandner
ee500ad684
Update copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 18:14:32 +02:00
James Salter
dc7aad1abf Revert "Revert "Add support for Posthog Analytics under a labs flag"" 
This reverts commit c5ea253181.
 2021-08-03 11:55:02 +01:00
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag" 2021-08-03 07:30:02 +01:00
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics 
Add support for Posthog Analytics under a labs flag
 2021-08-02 14:46:17 +01:00
Travis Ralston
711210d16e
Merge pull request #6437 from matrix-org/travis/voice-messages/delabs 
Remove voice messages labs flag
 2021-08-02 02:02:36 -06:00
Michael Telatynski
3c436c9617 update setting naming to match style 2021-07-30 12:20:02 +01:00
Michael Telatynski
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
James Salter
a1ffd240e1 Use .instance pattern 2021-07-29 14:40:18 +01:00
Michael Telatynski
6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Michael Telatynski
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
James Salter
d5bef53f8b Use snake case for feature name 2021-07-28 14:03:17 +01:00
James Salter
bd7e2dee3d Merge remote-tracking branch 'origin' into posthog-analytics 2021-07-28 11:13:22 +01:00
James Salter
1d81bdc6f9 Interface changes and anonymity fixes 2021-07-28 09:37:08 +01:00
Michael Telatynski
776435f620 Switch all-rooms toggle for spaces to non-feature settings key 2021-07-27 21:17:24 +01:00
Michael Telatynski
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
Šimon Brandner
9761c38f3d
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 18:39:22 +02:00
Michael Telatynski
12461a79e1 Move SettingsStore setting_updated dispatch to action enum 2021-07-27 17:19:45 +01:00
Michael Telatynski
755007cbee Conclude labs flags and write more tests 2021-07-27 14:39:14 +01:00
Germain Souquet
92394daa62 Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-07-27 14:37:50 +02:00
Michael Telatynski
7ccc429bea Change spaces beta feedback to not be so beta-centric 2021-07-23 15:47:11 +01:00
Travis Ralston
0e3cc6b8f4 Remove voice messages labs flag 
Fixes https://github.com/vector-im/element-web/issues/17151
 2021-07-21 18:09:35 -06:00
Šimon Brandner
621aee6f9a
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:21:52 +02:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Šimon Brandner
651f19fb9b
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs 2021-07-16 10:21:30 +02:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming 2021-07-15 08:07:03 +01:00
Germain Souquet
f4dfe9832b change labs flag wording 2021-07-14 16:20:25 +02:00
Šimon Brandner
226224b039
Allow sending hidden RRs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 15:12:35 +02:00
Paulo Pinto
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
Michael Telatynski
bd175c6f40 Improve and consolidate typing 2021-07-10 15:43:46 +01:00
Germain Souquet
6868478044 Add threaded messaging feature flag 2021-07-08 11:30:56 +02:00
Germain Souquet
10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Š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
Germain Souquet
d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01: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
Šimon Brandner
686e7d18c3
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-20 08:14:12 +02: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
Germain Souquet
ae5cd9d7ac Add new layout switcher UI 
Co-authored-by: Quirin Götz <codeworks@supercable.onl>
 2021-06-17 14:11:44 +01:00
Michael Telatynski
b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00