Commit Graph

1008 Commits (9a3dfe5235e8585265cd06008816c9498134fb3a)

Author SHA1 Message Date
RiotRobot 148cad6ea2 Reset matrix-js-sdk back to develop branch 2020-09-14 13:42:34 +01:00
RiotRobot 099f50b10e v3.4.0 2020-09-14 13:36:32 +01:00
RiotRobot ba73847296 Upgrade matrix-js-sdk to 8.3.0 2020-09-14 13:31:41 +01:00
RiotRobot c5e033d81a v3.4.0-rc.1 2020-09-09 15:53:04 +01:00
RiotRobot cc353dbe43 Upgrade matrix-js-sdk to 8.3.0-rc.1 2020-09-09 15:13:40 +01:00
Jason Robinson 75518254fb
Merge pull request #5173 from matrix-org/jaywink/jitsi-openidjwt-auth
Support creation of Jitsi widgets with "openidtoken-jwt" auth
2020-09-08 17:16:50 +03:00
Jason Robinson db2e1a9cd0 Add rfc4648 (base64/32/16) encoder to dependencies 2020-09-04 10:04:18 +03:00
Michael Telatynski e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1
Remove create-react-class
2020-09-03 17:21:58 +01:00
RiotRobot 0d290c9bd2 Reset matrix-js-sdk back to develop branch 2020-09-01 17:39:09 +01:00
RiotRobot 52691a1a42 Merge branch 'master' into develop 2020-09-01 17:38:21 +01:00
RiotRobot 9df5371dca Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2020-09-01 17:37:52 +01:00
RiotRobot d1d823dcc7 v3.3.0 2020-09-01 17:36:21 +01:00
RiotRobot bb248670a6 Upgrade matrix-js-sdk to 8.2.0 2020-09-01 17:02:49 +01:00
Michael Telatynski 72498df28f Remove create-react-class 2020-08-29 12:14:16 +01:00
Michael Telatynski 672d0fe97b Remove redundant components and devDependencies 2020-08-29 12:09:07 +01:00
RiotRobot d0358ab196 v3.3.0-rc.1 2020-08-26 12:02:11 +01:00
RiotRobot b142d72e97 Upgrade matrix-js-sdk to 8.2.0-rc.1 2020-08-26 11:52:28 +01:00
Michael Telatynski 8cff59f123 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-18 17:36:04 +01:00
RiotRobot c91fc99d4b Reset matrix-js-sdk back to develop branch 2020-08-17 13:08:45 +01:00
RiotRobot ea337465ae v3.2.0 2020-08-17 12:59:51 +01:00
RiotRobot 32ca810809 Upgrade matrix-js-sdk to 8.1.0 2020-08-17 12:53:33 +01:00
RiotRobot 8e8a2e602b v3.2.0-rc.1 2020-08-13 12:17:59 +01:00
RiotRobot 47bb6d0b25 Upgrade matrix-js-sdk to 8.1.0-rc.1 2020-08-13 12:12:10 +01:00
Michael Telatynski df980dbf92 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-12 22:48:03 +01:00
RiotRobot 45b79a0b7c Reset matrix-js-sdk back to develop branch 2020-08-05 16:11:28 +01:00
RiotRobot f8cdd51fe3 Merge branch 'master' into develop 2020-08-05 16:10:29 +01:00
RiotRobot f8ed635fbf v3.1.0 2020-08-05 16:05:30 +01:00
RiotRobot 57814a40c1 Upgrade matrix-js-sdk to 8.0.1 2020-08-05 15:50:03 +01:00
Michael Telatynski cbcac9dd49 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
 Conflicts:
	package.json
2020-08-03 12:54:06 +01:00
Travis Ralston fed20d46c5 Replace i18n generation script with something matching our project
We've been relying on flow being close enough to TypeScript for so long that it is starting to run into issues. Here we switch to babel's parser given we already use babel in the project.

Babel's parser is also *slightly* faster, allowing us to generate strings 0.1s faster.
2020-07-31 13:33:33 -06:00
RiotRobot d08a08daeb v3.1.0-rc.1 2020-07-31 13:30:45 +01:00
RiotRobot 31c66a1128 Upgrade matrix-js-sdk to 8.0.1-rc.1 2020-07-31 13:24:17 +01:00
J. Ryan Stinnett 50bc7fc62f Remove redundant lint dependencies
These are no longer needed with the new standard lint repo.
2020-07-29 12:00:42 +01:00
RiotRobot 96ba645cbd Reset matrix-js-sdk back to develop branch 2020-07-27 21:29:22 +01:00
RiotRobot f7444a13b4 v3.0.0 2020-07-27 21:18:15 +01:00
RiotRobot ebb4d2ff87 Upgrade matrix-js-sdk to 8.0.0 2020-07-27 21:05:55 +01:00
Travis Ralston 66eb069651 Pin flow-parser for i18n 2020-07-23 15:43:53 -06:00
Travis Ralston 9d091e5e02 Update packages to modern versions 2020-07-23 15:27:10 -06:00
Michael Telatynski c4fc70b9be Post-merge fix
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 22:28:36 +01:00
Michael Telatynski 70c81cc377 Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs
 Conflicts:
	src/i18n/strings/en_EN.json
	src/rageshake/submit-rageshake.ts
2020-07-21 22:22:28 +01:00
Jorik Schellekens 6219e67a8a add dep eslint-config-matrix-org 2020-07-20 21:19:49 +01:00
Jorik Schellekens b3fa855bd8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config 2020-07-20 16:22:32 +01:00
RiotRobot 2f9bfdbb69 Reset matrix-js-sdk back to develop branch 2020-07-16 16:11:59 +01:00
RiotRobot 0c89b8d267 v2.10.1 2020-07-16 16:09:41 +01:00
RiotRobot bc97f731fc Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:03:00 +01:00
RiotRobot 7098cbfce1 Reset matrix-js-sdk back to develop branch 2020-07-15 12:01:14 +01:00
RiotRobot a842e0936e v2.10.0 2020-07-15 11:49:38 +01:00
RiotRobot c339e5cbf9 Upgrade matrix-js-sdk to 7.1.0 2020-07-15 11:40:31 +01:00
Travis Ralston 3912f2d21c Merge remote-tracking branch 'origin/develop' into travis/room-list/resizable 2020-07-08 07:55:10 -06:00
Michael Telatynski c5e8a0b5af Convert HtmlUtils to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-08 08:40:58 +01:00