OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
38,554 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

866 Commits (4c1e2e3f3dbfcf804714ddebf7446b205ff445f8)

Author SHA1 Message Date
Dariusz Niemczyk 1331e960fa
Add ability to properly edit messages in Threads. (#6877) 
* Fix infinite rerender loop when editing message

* Refactor "edit_event" to Action.EditEvent

* Make up-arrow edit working in Threads

* Properly handle timeline events edit state

* Properly traverse messages to be edited

* Add MatrixClientContextHOC

* Refactor RoomContext to use AppRenderingContext

* Typescriptify test

Co-authored-by: Germain <germains@element.io>
 2021-10-01 15:35:54 +02:00
Jaiwanth 94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
Eric Eastwood 9c3439a1aa
Show updated relation reply from edited message - v2 (#6817) 
Part of https://github.com/vector-im/element-web/issues/10391

When `m.relates_to` -> `m.in_reply_to` is provided in `m.new_content`
for an edited message, use the updated reply.

ex.

```json
{
  "type": "m.room.message",
  "content": {
    "body": " * foo bar",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo bar",
      "msgtype": "m.text",
      "m.relates_to": {
        "m.in_reply_to": {
          "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
        }
      }
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$lX9MRe9ZTFOOvnU8PRVbvr1wqGtYvNQ1rSot-iUTN5k"
    }
  }
}
```
 2021-09-17 15:18:52 -05:00
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
James Salter 839fdbca62 fix tests 2021-09-15 13:55:34 +01:00
James Salter 76c782c64c Remove all room data from tracking 
Always redact room fragments entirely; remove room utils
 2021-09-15 12:58:26 +01:00
James Salter 79f03dfec3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pseudonymous-analytics-id 2021-09-15 09:52:15 +01:00
James Salter c2192a78bc More lint 2021-09-14 18:16:48 +01:00
James Salter 7344a177e3 Fix tests, swallow errors 2021-09-14 17:35:32 +01:00
Michael Telatynski 554c8ba74e delint 2021-09-10 11:01:01 +01:00
Michael Telatynski 456de355f9 fix e2e test 2021-09-10 10:48:47 +01:00
Michael Telatynski 41118b418f fix expected number of radios 2021-09-10 09:52:54 +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 c915288044 Respect m.space.parent relations if they hold valid permissions 2021-09-06 14:34:06 +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
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
Jaiwanth 7207329c15 Apply review suggestions 2021-08-13 23:44:07 +05:30
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
Jaiwanth 9cbdc4a613 Use throw error instead of try-catch 2021-08-13 08:34:54 +05:30
Jaiwanth edfc8af6cf Apply PR Suggestions 2021-08-13 08:30:50 +05:30
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
Jaiwanth e396dcfb10 Remove @types/streamsaver 2021-08-10 13:22:40 +05:30
Jaiwanth ecf0aba97c Test for different types of events 2021-08-10 12:25:51 +05:30
Jaiwanth 900accd823 Add test for renderToString 2021-08-09 13:25:32 +05:30
Jaiwanth 850b5452a0 Add tests for reply regex 2021-08-09 12:36:06 +05:30
Jaiwanth 45ce352d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:44:13 +05:30
Š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
Jaiwanth c74d6c6fff Assign replacements 2021-08-04 12:48:32 +05:30