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
|
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 |
|
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 |
|
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 |
|
Šimon Brandner
|
44258fd278
|
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
|
2021-08-02 11:32:57 +02:00 |
|
Michael Telatynski
|
3c436c9617
|
update setting naming to match style
|
2021-07-30 12:20:02 +01:00 |
|
James Salter
|
a1ffd240e1
|
Use .instance pattern
|
2021-07-29 14:40:18 +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
|
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 |
|
Šimon Brandner
|
5f6a1e336e
|
Remove unnecessary curly braces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 18:46:19 +02: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
|
5ccd02dd6e
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/messages/MImageBody.tsx
|
2021-07-23 10:42:46 +01:00 |
|
Michael Telatynski
|
f5630acea7
|
Adhere to better eslint rules
|
2021-07-23 10:35:10 +01:00 |
|
Michael Telatynski
|
18bb4bce35
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/stores/SpaceStore.tsx
|
2021-07-22 12:44:27 +01:00 |
|
James Salter
|
34f8c60b34
|
Hook analytics into the SDK
|
2021-07-21 16:15:18 +01:00 |
|
Germain Souquet
|
c155382445
|
Improve new layout switcher UI
|
2021-07-21 14:55:30 +02:00 |
|
Michael Telatynski
|
d147aaa984
|
delint and fix min-height issue
|
2021-07-21 11:27:36 +01:00 |
|
Michael Telatynski
|
fd64d37305
|
Add iconography to Create Room Dialog dropdown
Remove unused old stale feather-customised/globe.svg
|
2021-07-21 11:20:41 +01:00 |
|
Michael Telatynski
|
390b05617c
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
|
2021-07-21 10:46:41 +01:00 |
|
Michael Telatynski
|
a58edcb241
|
tweak copy
|
2021-07-21 10:43:12 +01: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 |
|
Šimon Brandner
|
c16827272d
|
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 13:19:31 +02:00 |
|
Michael Telatynski
|
b94886a291
|
i18n irc and fix lint from merge conflict
|
2021-07-20 11:18:27 +01:00 |
|
Michael Telatynski
|
d3934ff7da
|
Merge branch 'develop' into t3chguy/eslint
|
2021-07-20 11:08:13 +01:00 |
|
Germain Souquet
|
06c9a060b4
|
Merge branch 'develop' into gsouquet/message-bubbles-4635
|
2021-07-20 10:16:21 +02:00 |
|
Michael Telatynski
|
ce78cdf4ad
|
Conform to new react and typescript eslint rules
|
2021-07-19 22:43:11 +01:00 |
|
Michael Telatynski
|
de42a00ca4
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
|
2021-07-19 16:47:31 +01:00 |
|
Travis Ralston
|
942cadc8a3
|
Merge branch 'develop' into travis/notifications-2
|
2021-07-16 16:20:23 -06:00 |
|
Šimon Brandner
|
651f19fb9b
|
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
|
2021-07-16 10:21:30 +02:00 |
|
Michael Telatynski
|
7c3c04d340
|
Fix instances of setState calls after unmount
|
2021-07-15 12:10:54 +01:00 |
|
Michael Telatynski
|
dcb9b9b777
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
|
2021-07-15 10:04:48 +01:00 |
|
Šimon Brandner
|
18343d839c
|
Show MSC2285 only if supported by server
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-15 09:23:15 +02:00 |
|
Germain
|
c7c29f2119
|
Merge pull request #6365 from psrpinto/fix/naming
|
2021-07-15 08:07:03 +01:00 |
|
Michael Telatynski
|
57f9b819b5
|
Merge pull request #6345 from matrix-org/t3chguy/ts/c1
|
2021-07-14 17:19:07 +01:00 |
|
Germain Souquet
|
789d078814
|
Merge branch 'develop' into gsouquet/message-bubbles-4635
|
2021-07-14 16:26:22 +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 |
|
Robin Townsend
|
0117d513ea
|
Consolidate disabling of history options
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-13 23:08:43 -04:00 |
|