imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
37699 commits 222 branches 563 tags 470 MiB
Commit graph

735 commits

Author SHA1 Message Date
Michael Telatynski
e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Michael Telatynski
ca0d8116ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908 2021-09-10 18:02:48 +01:00
Michael Telatynski
d15ea932f6 fix unrelated issues 2021-09-10 15:35:35 +01:00
Michael Telatynski
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +01:00
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski
558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Travis Ralston
a6d2bb5e6c
Merge pull request #6693 from SimonBrandner/fix/guest/18776 
Render guest settings only in public rooms/spaces
 2021-09-09 10:42:38 -06:00
Michael Telatynski
630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-09-09 11:01:11 +01:00
Michael Telatynski
600375cafe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-09-08 15:38:13 +01:00
Michael Telatynski
911ca07da4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-08 15:28:58 +01:00
Michael Telatynski
83912daced Improve the upgrade for restricted user experience 2021-09-08 13:16:31 +01:00
Michael Telatynski
93af6aafce fix typing of olmVersion in settings 2021-09-07 13:28:51 +01:00
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
 2021-09-06 11:41:09 +01:00
Dariusz Niemczyk
99a0bd935b
Merge pull request #6726 from SimonBrandner/feature/autoplay-split 
Split autoplay GIFs and videos into different settings
 2021-09-02 18:40:42 +02:00
Šimon Brandner
9b2c380b64
Split autoplay gifs and videos in to different settings 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-01 17:28:15 +02:00
Michael Telatynski
979bc71609 Deduplicate join rule management between rooms and spaces 2021-09-01 15:52:56 +01:00
Steffen Kolmer
21cf3592cf Update props and state interfaces 2021-08-27 19:32:38 +02:00
Steffen Kolmer
6e30673164 Show spinner if user id is missing in event tile preview 2021-08-27 19:23:26 +02:00
Šimon Brandner
c353b6daad
Render guest settings only in public rooms 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-26 17:39:48 +02:00
J. Ryan Stinnett
d013ae79b7 Fix changelog link colour back to blue 
https://github.com/matrix-org/matrix-react-sdk/pull/5698 changed all dialog
links to green, which is not expected. In general, we use blue links for
information and green links for actions.

This resolves the regression by removing the general change and adjusting the
new links added by the above PR to be green as desired there.

Fixes https://github.com/vector-im/element-web/issues/18726
 2021-08-26 13:59:12 +01:00
Travis Ralston
4790b4fc17 Remove advanced room logging setting 
Fixes https://github.com/vector-im/element-web/issues/14602

This has proven to be less useful month over month, so it's time for it to go. The initial goal for keeping it was to track stability in the ~6 months post-release, which means it should have left around the start of 2021. At the time, Spaces was on the horizon with room list corruption issues though, so it was put on hold. These days, it's rock solid and doesn't appear to be causing issues. As such, the logging can leave in favour of more specific/targeted logging when we need it.

This might even speed things up as it's not hitting the SettingsStore every 0.2 seconds.
 2021-08-24 13:17:12 -06:00
Travis Ralston
32343f3382
Merge pull request #5698 from SimonBrandner/public-e2ee-warn 
Add a warning on E2EE rooms if you try to make them public
 2021-08-23 16:45:47 -06:00
James Salter
23f70836b6 Update copy to indicate debug logs contain which UI elements you last interacted with 2021-08-18 17:05:15 +01:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski
0ef9ea76e1 delint unused imports 2021-08-11 23:38:48 +01:00
Michael Telatynski
4f47907abf Show disabled spaces section in preferences regardless 2021-08-11 23:33:10 +01:00
Michael Telatynski
5f54abc7e5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-08-11 20:51:47 +01:00
Michael Telatynski
be85dcd1bf Delabs Spaces, keeping it as a default-on preference for the time being 2021-08-11 14:52:40 +01:00
Šimon Brandner
833a5ee182
Don't set hidden RRs labs setting at account level 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-11 14:37:35 +02:00
Michael Telatynski
195b8714fc Iterate PR based on feedback 2021-08-10 09:55:51 +01:00
Michael Telatynski
db951b43a3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-10 09:48:22 +01: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
Germain
3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout 2021-08-06 14:45:54 +01:00
Michael Telatynski
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603 2021-08-06 12:56:38 +01:00
Michael Telatynski
64995dfae7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-06 11:39:24 +01:00
Šimon Brandner
6afd75ac3c
Update/fix licenses 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:40:26 +02:00
Šimon Brandner
85f5ec3a94
Move LayoutSwitcher into a separate component 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:27:18 +02: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
6e688b3c3a
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn 2021-08-06 07:53:07 +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
3abc419266
Remove spaces and use correct character 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:41:56 +02:00
Šimon Brandner
1e9437db7b
Use correct character 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:41:37 +02:00
Šimon Brandner
94f915a436
Remove spaces 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:41:23 +02:00
Šimon Brandner
67062dab88
Remove spaces 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:40:35 +02:00
Šimon Brandner
717691ef2f
Remove spaces 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:40:25 +02:00
Šimon Brandner
b99e39e011
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 2021-08-04 18:14:38 +02:00
Michael Telatynski
2d3211ccf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-04 12:14:29 +01:00
Michael Telatynski
a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01: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