7 Commits (6cdfdc0471554aaa38264e3d08239102961e0c94)

Author	SHA1	Message	Date
David Langley	69ee8fd96a	Change License: AGPL + Element Commercial (#28856) ... * Add commercial licence and update config files * Update license in headers * Revert "Update license in headers" This reverts commit 7ed7949485. * Update only spdx id * Remove LicenseRef- from package.json LicenseRef- no longer allowed in npm v3 package.json This fixes the warning in the logs and failing build check.	2025-01-06 11:18:54 +00:00
Michael Telatynski	be181d2c79	Use mapped types around account data events (#28752) ... * Use mapped types around account data events --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-12-19 22:53:51 +00:00
Michael Telatynski	3dbcb5efa3	Merge branch 'develop' of https://github.com/vector-im/element-web into dbkr/stateafter ... # Conflicts: # test/unit-tests/components/structures/RoomView-test.tsx # test/unit-tests/components/structures/TimelinePanel-test.tsx	2024-11-27 10:47:35 +00:00
Tulir Asokan	72a2773629	Start sending stable `m.marked_unread` events (#28478) ... * Start sending stable `m.marked_unread` events * Update tests	2024-11-18 10:25:36 +00:00
Michael Telatynski	044eaf7eb5	Update calls to addEventToTimeline and addLiveEvents for new signature ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-11-06 14:55:21 +00:00
Michael Telatynski	f0ee7f7905	Merge matrix-react-sdk into element-web ... Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-10-15 15:32:09 +01:00
Michael Telatynski	b084ff2313	Prepare for repo merge ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2024-10-15 11:35:21 +01:00