c915288044
Respect m.space.parent relations if they hold valid permissions
2021-09-06 14:34:06 +01:00
60e2d61d25
Merge pull request #6489 from psrpinto/better-pinned-messages
...
When pinning or unpinning messages, link to the specific message
2021-09-03 13:27:49 -06:00
de01dcfd26
Merge pull request #6700 from SimonBrandner/feature/call-timer/18566
...
Show call length during a call
2021-09-03 17:17:36 +01:00
9be9e75c13
Merge pull request #6720 from matrix-org/gsouquet/replies-fix-18717
2021-09-02 08:42:54 +01:00
95d1b06abb
Make composer able to reply in thread or in room timeline
2021-09-01 12:12:40 +01:00
bbd420096b
don't bother awaiting SpaceStore::setActiveSpace as it is no longer async
2021-08-31 17:03:43 +01:00
9c107ae615
Add tests for formatSeconds()
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-27 16:20:29 +02:00
0a209afdc2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
res/css/structures/_SpaceHierarchy.scss
src/components/structures/SpaceHierarchy.tsx
src/i18n/strings/en_EN.json
2021-08-12 11:41:03 +01:00
8216a35a56
remove spurious mxclient stub
2021-08-11 21:02:30 +01:00
aaeb9969a4
Handle case where one message is pinned, and another unpinned
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 14:56:59 +01:00
a51b114171
Change order of test cases
...
Just moving test cases so that "generic message" ones are grouped at the bottom.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 14:51:37 +01:00
ca8832f6fa
Fix test case
...
The test case is:
"mentions message when a single message was pinned, with multiple previously pinned messages"
However, the test case was also unpinning messages. That is now fixed.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 14:47:50 +01:00
79cf69bedb
Refactor tests so that snapshots aren't used
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 11:40:33 +01:00
45fd3d83b0
Refactor tests
...
So that there's one top level `describe('TextForEvent')`, followed by a nested
`describe('textForPinnedEvent')`, containting all the `it()`s.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-10 16:06:34 +01:00
881cac0d21
Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:30:03 +02:00
57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
...
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
c9c8177f58
Start a call immediately after creating a room via the dial pad ( #6529 )
2021-08-04 09:46:39 +01:00
28f5dc483b
Update eslint plugin & fix silly indenting
...
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00
a18f41ceed
Fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:43:56 +02:00
2a378f30b7
Attempt to fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:38:12 +02:00
dc7aad1abf
Revert "Revert "Add support for Posthog Analytics under a labs flag""
...
This reverts commit c5ea253181
2021-08-03 11:55:02 +01:00
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag"
2021-08-03 07:30:02 +01:00
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
3c436c9617
update setting naming to match style
2021-07-30 12:20:02 +01:00
9eb0986353
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
d459dbe700
Refactor Space Hierarchy stuff in preparation for pagination
2021-07-29 17:35:15 +01:00
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
6f37e8b223
Use getChildren instead of getSpaceSummary as MSC2946 has moved on
2021-07-29 12:16:59 +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
ecbc536a3e
Add copyright header
2021-07-28 14:15:27 +01:00
a09e046c18
Update test/PosthogAnalytics-test.ts
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-28 14:11:55 +01:00
df7ebb2e7c
Remove commented out block
2021-07-28 14:00:37 +01:00
3ff7de3c96
Mock SHA-256 to avoid problems loading crypto on Node 14
2021-07-28 13:44:06 +01:00
7cf28de9c9
take 2 at fixing import
2021-07-28 11:32:17 +01:00
7c62386915
lint
2021-07-28 11:28:19 +01:00
c697079eb4
Fix import
2021-07-28 11:22:40 +01:00
bd7e2dee3d
Merge remote-tracking branch 'origin' into posthog-analytics
2021-07-28 11:13:22 +01:00
a6df687196
Tidy up interface and add some comments
2021-07-28 09:54:37 +01:00
1d81bdc6f9
Interface changes and anonymity fixes
2021-07-28 09:37:08 +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
ec173e74e6
Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload
2021-07-27 20:15:40 +01:00
400e772594
Fix formatting
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:53:33 +01:00
3f2dadf0fe
When a single message is unpinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
8fe7df9171
When a single message is pinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
40ead34c08
Add test for textForPinnedEvent
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
755007cbee
Conclude labs flags and write more tests
2021-07-27 14:39:14 +01:00
474561600e
Fix hash == ""
2021-07-27 13:31:56 +01:00
c8d9294350
Discard unused utility now that we use Object.fromEntries
2021-07-23 18:40:22 +01:00
95f4275807
Add Disabled anonymity, improve tests
2021-07-23 16:47:02 +01:00
Michael Telatynski