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
Travis Ralston
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
David Baker
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
Germain
9be9e75c13
Merge pull request #6720 from matrix-org/gsouquet/replies-fix-18717
2021-09-02 08:42:54 +01:00
Germain Souquet
95d1b06abb
Make composer able to reply in thread or in room timeline
2021-09-01 12:12:40 +01:00
Michael Telatynski
bbd420096b
don't bother awaiting SpaceStore::setActiveSpace as it is no longer async
2021-08-31 17:03:43 +01:00
Šimon Brandner
9c107ae615
Add tests for formatSeconds()
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-27 16:20:29 +02:00
Michael Telatynski
8e7ef39db7
delint
2021-08-13 15:51:02 +01:00
Michael Telatynski
9d909dcdf8
tweaks
2021-08-13 15:44:43 +01:00
Michael Telatynski
2509c864e0
tweak order of e2e tests
2021-08-13 13:46:08 +01:00
Michael Telatynski
6ce518cb8f
add more delay
2021-08-13 13:38:11 +01:00
Michael Telatynski
5e38b8b3b3
try fix tests s'more
2021-08-13 13:29:25 +01:00
Michael Telatynski
f2becd9698
Fix e2e test
2021-08-12 15:59:24 +01:00
Michael Telatynski
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
Michael Telatynski
8216a35a56
remove spurious mxclient stub
2021-08-11 21:02:30 +01:00
Michael Telatynski
29e5a69b7a
delint e2e test
2021-08-11 16:24:32 +01:00
Michael Telatynski
d602dac7ef
Add basic spaces tests to the e2e suite
2021-08-11 16:20:50 +01:00
Michael Telatynski
6b9dc40ad6
delint test
2021-08-11 16:12:08 +01:00
Michael Telatynski
da110855f0
delint and remove groups-specific tests and setups
2021-08-11 15:36:35 +01:00
Paulo Pinto
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
Paulo Pinto
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
Paulo Pinto
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
Paulo Pinto
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
Paulo Pinto
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
Šimon Brandner
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
James Salter
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
Andrew Morgan
c9c8177f58
Start a call immediately after creating a room via the dial pad ( #6529 )
2021-08-04 09:46:39 +01:00
David Baker
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
Šimon Brandner
a18f41ceed
Fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:43:56 +02:00
Šimon Brandner
2a378f30b7
Attempt to fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:38:12 +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
Michael Telatynski
3c436c9617
update setting naming to match style
2021-07-30 12:20:02 +01:00
Michael Telatynski
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
Michael Telatynski
d459dbe700
Refactor Space Hierarchy stuff in preparation for pagination
2021-07-29 17:35:15 +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
Michael Telatynski
6f37e8b223
Use getChildren instead of getSpaceSummary as MSC2946 has moved on
2021-07-29 12:16:59 +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
James Salter
ecbc536a3e
Add copyright header
2021-07-28 14:15:27 +01:00
James Salter
a09e046c18
Update test/PosthogAnalytics-test.ts
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-28 14:11:55 +01:00
James Salter
df7ebb2e7c
Remove commented out block
2021-07-28 14:00:37 +01:00
James Salter
3ff7de3c96
Mock SHA-256 to avoid problems loading crypto on Node 14
2021-07-28 13:44:06 +01:00
James Salter
7cf28de9c9
take 2 at fixing import
2021-07-28 11:32:17 +01:00
James Salter
7c62386915
lint
2021-07-28 11:28:19 +01:00
James Salter
c697079eb4
Fix import
2021-07-28 11:22:40 +01:00
James Salter
bd7e2dee3d
Merge remote-tracking branch 'origin' into posthog-analytics
2021-07-28 11:13:22 +01:00
James Salter
a6df687196
Tidy up interface and add some comments
2021-07-28 09:54:37 +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