nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
64,248 Commits 258 Branches 582 Tags
f8ec6b6f9b956324326e62568de6d39cd8ad2291
Commit Graph

5428 Commits

Author SHA1 Message Date
RiotRobot
3609ab8003 Reset matrix-react-sdk back to develop branch 2023-06-20 10:31:42 +01:00
RiotRobot
41aa36e6b4 Reset matrix-js-sdk back to develop branch 2023-06-20 10:31:26 +01:00
RiotRobot
2cacd89408 v1.11.34 2023-06-20 10:27:20 +01:00
RiotRobot
b73a01abd4 Upgrade matrix-react-sdk to 3.74.0 2023-06-20 10:25:37 +01:00
RiotRobot
104dcad7dd Upgrade matrix-js-sdk to 26.1.0 2023-06-20 10:25:18 +01:00
RiotRobot
f81115e57e Reset matrix-js-sdk back to develop branch 2023-06-20 10:20:09 +01:00
RiotRobot
41864bce4e Resetting package fields for development 2023-06-20 10:19:56 +01:00
RiotRobot
8cf1eb8cb6 Merge branch 'master' into develop 2023-06-20 10:19:49 +01:00
RiotRobot
21ab205f35 v3.74.0 2023-06-20 10:19:28 +01:00
RiotRobot
ef56fcf263 Upgrade matrix-js-sdk to 26.1.0 2023-06-20 10:18:01 +01:00
alunturner
fa31ed55d2 Update rich text editor dependency and associated changes (#11098) 
* fix logic error

* update types

* extract message content to variable

* use the new messageContent property

* sort out mention types to make them a  map

* update getMentionAttributes to use AllowedMentionAttributes

* add plain text handling

* change type and handling for attributes when creating a mention in plain text

* tidy, add comment

* revert TS config change

* fix broken types in test

* update tests

* bump rte

* fix import and ts errors

* fix broken tests
 2023-06-19 08:00:11 +00:00
Germain
4243847f4f Integrate compound design tokens (#11091) 
* Integrate compound design tokens

The icons should not be included in this repo, and should live in the compound design token repo, but for simplicity sake at this phase of the integration they will be added here

* lintfix

* Use correct SpyInstance import

* Using npm build of design tokens
 2023-06-14 15:49:14 +00:00
RiotRobot
15192b976e v1.11.34-rc1 2023-06-13 12:54:02 +01:00
RiotRobot
5ba75a32f7 Upgrade matrix-react-sdk to 3.74.0-rc1 2023-06-13 12:52:04 +01:00
RiotRobot
1a0a15a671 Upgrade matrix-js-sdk to 26.1.0-rc1 2023-06-13 12:48:16 +01:00
RiotRobot
c534bde698 v3.74.0-rc1 2023-06-13 12:39:48 +01:00
RiotRobot
e30e7229c3 Upgrade matrix-js-sdk to 26.1.0-rc1 2023-06-13 12:32:59 +01:00
alunturner
53415bfdfe Allow image pasting in rich text mode in RTE (#11049) 
* add comments to rough first solution

* allow eventRelation prop to pass to both composers

* use eventRelation in image paste

* add image pasting to rich text mode of rich text editor

* extract error handling to function

* type the error handler

* add tests

* make behaviour mimic SendMessage

* add sad path tests

* refactor to use catch throughout

* update comments

* tidy up tests

* add special case and change function signature

* add comment

* bump rte to 2.2.2
 2023-06-09 09:11:38 +00:00
RiotRobot
b5b584d616 Merge branch 'master' into develop 2023-06-09 09:59:26 +01:00
RiotRobot
322dab0b58 v1.11.33 2023-06-09 09:53:51 +01:00
RiotRobot
9358c41aad Upgrade matrix-react-sdk to 3.73.1 2023-06-09 09:50:01 +01:00
RiotRobot
fa21a0ee17 Upgrade matrix-js-sdk to 26.0.1 2023-06-09 09:48:49 +01:00
RiotRobot
7a7e1fb43b Merge branch 'master' into develop 2023-06-09 09:42:59 +01:00
RiotRobot
da23fcea5e v3.73.1 2023-06-09 09:40:58 +01:00
RiotRobot
a0fbc766a3 Upgrade matrix-js-sdk to 26.0.1 2023-06-09 09:34:35 +01:00
renovate[bot]
b15b74c689 Update all non-major dependencies (#11032) 
* Update all non-major dependencies

* Hold back typescript

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-06-08 07:41:15 +00:00
RiotRobot
0504c8260e Reset matrix-react-sdk back to develop branch 2023-06-06 14:44:37 +01:00
RiotRobot
a7208cc07b Reset matrix-js-sdk back to develop branch 2023-06-06 14:44:23 +01:00
RiotRobot
69ad6c3993 Merge branch 'master' into develop 2023-06-06 14:44:05 +01:00
RiotRobot
e918170dc3 v1.11.32 2023-06-06 14:40:11 +01:00
RiotRobot
c1273590f3 Upgrade matrix-react-sdk to 3.73.0 2023-06-06 14:35:37 +01:00
RiotRobot
bd8fabc70b Upgrade matrix-js-sdk to 26.0.0 2023-06-06 14:35:01 +01:00
RiotRobot
fb8da4bdc5 v3.73.0 2023-06-06 14:25:56 +01:00
RiotRobot
56b7bdc486 Upgrade matrix-js-sdk to 26.0.0 2023-06-06 14:24:05 +01:00
RiotRobot
d0c1a8e69c Reset matrix-js-sdk back to develop branch 2023-06-06 14:26:37 +01:00
RiotRobot
c00a877514 Resetting package fields for development 2023-06-06 14:26:21 +01:00
RiotRobot
bf1dd36d67 Merge branch 'master' into develop 2023-06-06 14:26:15 +01:00
renovate[bot]
6a46061732 Update dependency axe-core to v4.7.2 (#11030) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-06-06 10:58:03 +00:00
Michael Telatynski
c47b587225 Switch from grapheme-splitter to graphemer (#11037) 2023-06-05 14:39:46 +00:00
renovate[bot]
945c0793b9 Update dependency @sentry/webpack-plugin to v2 (#25507) 
* Update dependency @sentry/webpack-plugin to v2

* Follow migration guide

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-06-02 14:21:49 +01:00
renovate[bot]
f965f2064e Update dependency jest-canvas-mock to v2.5.1 (#25506) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-01 17:20:48 +00:00
renovate[bot]
82f231d7b1 Update all non-major dependencies (#25504) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-01 17:20:40 +00:00
ElementRobot
df6423b2b8 v1.11.32-rc.3 2023-06-01 17:08:09 +01:00
ElementRobot
86eaa5787b Upgrade matrix-js-sdk to 26.0.0-rc.1 2023-06-01 17:04:33 +01:00
ElementRobot
5b904c08c8 Upgrade matrix-react-sdk to 3.73.0-rc.3 2023-06-01 17:03:44 +01:00
ElementRobot
bcf5b9013e v3.73.0-rc.3 2023-06-01 17:00:20 +01:00
ElementRobot
40a66ec745 Upgrade matrix-js-sdk to 26.0.0-rc.1 2023-06-01 16:58:33 +01:00
ElementRobot
c494e3c049 Merge branch 'develop' into staging 
# Conflicts:
#	package.json
#	src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
 2023-06-01 16:50:29 +01:00
ElementRobot
faf626e5a6 Merge branch 'develop' into staging 2023-06-01 16:45:48 +01:00
Michael Telatynski
f4a265b2c7 Use grapheme-splitter instead of lodash for saving emoji from being ripped apart (#10976) 
* Use grapheme-splitter instead of lodash for saving emoji from being ripped apart

* Move to a more appropriate place

* Add tests and improve types
 2023-05-25 08:32:20 +00:00