OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
35,215 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

1252 Commits (fee69884a65837114abac1bdd1337bb72dc94eb8)

Author SHA1 Message Date
J. Ryan Stinnett ca08475498 Apply all simple major version upgrades 2021-01-27 12:31:37 +00:00
J. Ryan Stinnett f8816e0bda Pin React types to 16.x for now 
This avoids type conflicts from other deps that depends on just `*`. Type deps
needs to be de-duplicated down to a single version to avoid errors (unlike code
deps).
 2021-01-27 12:31:37 +00:00
J. Ryan Stinnett 12c671045d Upgrade to latest minor versions of deps 2021-01-27 12:31:37 +00:00
RiotRobot 4dbdeb46ad Reset matrix-js-sdk back to develop branch 2021-01-26 12:11:47 +00:00
RiotRobot e21514cea0 Merge branch 'master' into develop 2021-01-26 12:08:24 +00:00
RiotRobot 982c3ceca1 v3.12.1 2021-01-26 12:04:37 +00:00
RiotRobot 709fc2e004 Upgrade matrix-js-sdk to 9.5.1 2021-01-26 11:57:46 +00:00
Travis Ralston 83fb698bbc
Merge pull request #5527 from matrix-org/travis/widget-nav 
Wire up MSC2931 widget navigation
 2021-01-18 09:09:32 -07:00
RiotRobot 6c8e6096da Reset matrix-js-sdk back to develop branch 2021-01-18 15:16:31 +00:00
RiotRobot 5455b90c98 Resetting package fields for development 2021-01-18 15:16:18 +00:00
RiotRobot 5a54bb0e7f v3.12.0 2021-01-18 15:14:53 +00:00
RiotRobot c4570cdaee Upgrade matrix-js-sdk to 9.5.0 2021-01-18 15:09:22 +00:00
Travis Ralston f6a328a55b Update widget api 2021-01-16 23:34:16 -07:00
RiotRobot 97af6a8fd8 v3.12.0-rc.1 2021-01-13 13:06:44 +00:00
RiotRobot 30dd24a59c Upgrade matrix-js-sdk to 9.5.0-rc.1 2021-01-13 12:59:37 +00:00
David Baker 328d64ac23 Run TypeScript tests 
There aren't any yet, but I'm about to write a test and it's going
to be in TypeScript and I don't want to lump this change in with
a bunch of other stuff.
 2021-01-12 17:37:24 +00:00
J. Ryan Stinnett 7c7ed7a2e4
Merge pull request #5503 from matrix-org/jryans/prepublish-only 
Use TypeScript source for development, swap to build during release
 2020-12-22 13:48:22 +00:00
RiotRobot c4f7269321 Reset matrix-js-sdk back to develop branch 2020-12-21 17:52:30 +00:00
RiotRobot 5fd39954a1 v3.11.1 2020-12-21 17:37:29 +00:00
RiotRobot cc0bef7f8d Upgrade matrix-js-sdk to 9.4.1 2020-12-21 17:36:46 +00:00
RiotRobot d23d0b2b42 v3.11.0 2020-12-21 17:06:40 +00:00
RiotRobot 78e6fb9121 Upgrade matrix-js-sdk to 9.4.0 2020-12-21 17:00:39 +00:00
J. Ryan Stinnett b22c28eac9 Use TypeScript source for development, swap to build during release 
This changes the JS SDK to point `main` to TypeScript source and remove any
indication of `typings`. For local development and CI workflows, it means many
steps can run without building first, which saves lots of time.

During release, we still build for Node and browsers as before. The release
script adjusts the `main` and `typings` fields before publishing and
distribution to point to the built output for those that use them.
 2020-12-18 14:49:28 +00:00
J. Ryan Stinnett ad32f90beb Stop building at local install time 
This speeds up local development and CI runs by skipping build steps by default.
They will now only run when just before publishing.

Related to https://github.com/matrix-org/matrix-js-sdk/pull/1552
 2020-12-18 11:59:30 +00:00
RiotRobot caf795e5c2 v3.11.0-rc.2 2020-12-16 16:27:16 +00:00
RiotRobot d2ee89fa74 Upgrade matrix-js-sdk to 9.4.0-rc.2 2020-12-16 15:57:56 +00:00
RiotRobot 68b7538fca v3.11.0-rc.1 2020-12-16 14:34:25 +00:00
RiotRobot 9f8a5f5107 Upgrade matrix-js-sdk to 9.4.0-rc.1 2020-12-16 14:22:44 +00:00
J. Ryan Stinnett 49bd7887d2 Add Olm as a dev dependency for types 
Fixes https://github.com/vector-im/element-web/issues/15803
 2020-12-08 16:18:12 +00:00
RiotRobot 7d41604569 Reset matrix-js-sdk back to develop branch 2020-12-07 12:33:18 +00:00
RiotRobot 6360bc7a01 Merge branch 'master' into develop 2020-12-07 12:32:20 +00:00
RiotRobot fefe84d101 v3.10.0 2020-12-07 12:31:08 +00:00
RiotRobot 1241b7c335 Upgrade matrix-js-sdk to 9.3.0 2020-12-07 12:13:04 +00:00
J. Ryan Stinnett 1fda735222 Rebrand various CI scripts and modules 
This replaces Riot with Element in various CI scripts, modules, parameters, etc.
This _should_ be the last major rebranding pass (hopefully).

Fixes https://github.com/vector-im/element-web/issues/14894
 2020-12-03 13:56:27 +00:00
RiotRobot db354ff888 v3.10.0-rc.1 2020-12-02 14:38:28 +00:00
RiotRobot ed59b50448 Upgrade matrix-js-sdk to 9.3.0-rc.1 2020-12-02 14:25:55 +00:00
J. Ryan Stinnett 826466179a
Merge pull request #5244 from akissinger/katex 
LaTeX rendering in element-web using KaTeX
 2020-11-27 11:55:26 +00:00
Travis Ralston 67a0f1ef4c Update widget API 2020-11-24 09:43:21 -07:00
RiotRobot ddc3f275a8 Reset matrix-js-sdk back to develop branch 2020-11-23 16:41:50 +00:00
RiotRobot 8239649a45 Merge branch 'master' into develop 2020-11-23 16:40:45 +00:00
RiotRobot 5ca18590af v3.9.0 2020-11-23 16:35:16 +00:00
RiotRobot be25a0e432 Upgrade matrix-js-sdk to 9.2.0 2020-11-23 16:29:44 +00:00
Travis Ralston 2446fb151a Update widget-api 2020-11-20 09:05:09 -07:00
RiotRobot e85ca92904 v3.9.0-rc.1 2020-11-18 16:27:04 +00:00
RiotRobot 2880083cbb Upgrade matrix-js-sdk to 9.2.0-rc.1 2020-11-18 15:59:28 +00:00
Travis Ralston 1b6e47c01b Update widget-api again 2020-11-12 11:52:47 -07:00
Travis Ralston 4bcb932355 Update widget-api 2020-11-12 11:33:44 -07:00
Aleks Kissinger 5f3af7863a Merge branch 'develop' into katex 2020-11-10 18:19:20 +00:00
RiotRobot 46e01196f0 Reset matrix-js-sdk back to develop branch 2020-11-09 16:33:48 +00:00
RiotRobot 8edbc7c654 v3.8.0 2020-11-09 16:31:48 +00:00
RiotRobot 6f3cdadcdb Upgrade matrix-js-sdk to 9.1.0 2020-11-09 16:26:36 +00:00
RiotRobot 8257470383 v3.8.0-rc.1 2020-11-04 14:16:13 +00:00
RiotRobot 1b55eb5f44 Upgrade matrix-js-sdk to 9.1.0-rc.1 2020-11-04 14:10:56 +00:00
RiotRobot a708dbf6e9 Reset matrix-js-sdk back to develop branch 2020-10-28 14:32:26 +00:00
RiotRobot bdfac1d858 v3.7.1 2020-10-28 14:25:35 +00:00
RiotRobot de6589705c Upgrade matrix-js-sdk to 9.0.1 2020-10-28 14:17:48 +00:00
RiotRobot 492f85da00 v3.7.0 2020-10-26 16:55:16 +00:00
RiotRobot 5446184e6e Upgrade matrix-js-sdk to 9.0.0 2020-10-26 16:49:16 +00:00
Aleks Kissinger 4536f51ec0 Merge branch 'develop' into katex 2020-10-25 12:28:17 +00:00
Aleks Kissinger 173d798865 added cheerio as explicit dep in package.json 2020-10-23 18:41:24 +01:00
RiotRobot 5c7e9e8a46 v3.7.0-rc.2 2020-10-21 15:21:44 +01:00
RiotRobot b585cf76bd Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 15:16:46 +01:00
RiotRobot 2f3eb0cd01 v3.7.0-rc.1 2020-10-21 14:44:21 +01:00
RiotRobot 65d7b9c0f2 Upgrade matrix-js-sdk to 8.5.0 2020-10-21 14:38:51 +01:00
RiotRobot bd1276c56b Reset matrix-js-sdk back to develop branch 2020-10-20 11:27:33 +01:00
RiotRobot 2d5528fccd Merge branch 'master' into develop 2020-10-20 11:26:23 +01:00
RiotRobot 3b90ed0664 v3.6.1 2020-10-20 11:23:48 +01:00
J. Ryan Stinnett 2219419f52 Upgrade widget API 2020-10-19 17:41:04 +01:00
J. Ryan Stinnett d6a166d3bf Upgrade widget API 2020-10-19 16:56:36 +01:00
RiotRobot d007b06d7c Reset matrix-js-sdk back to develop branch 2020-10-12 13:40:23 +01:00
RiotRobot ddd3d97b71 Merge branch 'master' into develop 2020-10-12 13:39:18 +01:00
RiotRobot 2242e6b8c6 v3.6.0 2020-10-12 13:36:52 +01:00
RiotRobot 0ac4f21652 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:24:53 +01:00
Aleks Kissinger aafaf34233 Merge branch 'develop' into katex 2020-10-10 19:31:46 +01:00
Travis Ralston 2caf679024 Update widget-api 2020-10-08 21:22:17 -06:00
Travis Ralston 25db3e9efa Update widget-api 2020-10-08 21:21:11 -06:00
RiotRobot 4abaa107ab v3.6.0-rc.1 2020-10-07 14:30:51 +01:00
RiotRobot 2fd9b9b3b9 Upgrade matrix-js-sdk to 8.5.0-rc.1 2020-10-07 14:23:52 +01:00
Michael Telatynski 0d6edab708 Workaround Jest bug with ArrayBuffers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 01:22:29 +01:00
Michael Telatynski 13afb8d4f1 Update Jest and JSDOM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:08:40 +01:00
Travis Ralston 08c5e9e039 Use the beta release of the widget-api 2020-09-30 20:42:37 -06:00
RiotRobot 524b2dbd22 Reset matrix-js-sdk back to develop branch 2020-09-28 16:20:07 +01:00
RiotRobot ceb2975c91 v3.5.0 2020-09-28 16:18:15 +01:00
RiotRobot a16ca8226c Upgrade matrix-js-sdk to 8.4.1 2020-09-28 16:12:05 +01:00
RiotRobot fe5e1f4543 Upgrade matrix-js-sdk to 8.4.0 2020-09-28 14:25:51 +01:00
RiotRobot 9ac3af4176 v3.5.0-rc.1 2020-09-23 15:32:47 +01:00
RiotRobot ca4b11ec6a Upgrade matrix-js-sdk to 8.4.0-rc.1 2020-09-23 15:27:40 +01:00
J. Ryan Stinnett 064ae187e2 Upgrade sanitize-html, set nesting limit 
This uses the recently added option to allow specifying a nesting limit.

Fixes https://github.com/vector-im/element-web/issues/15122
 2020-09-22 18:06:10 +01:00
Aleks Kissinger 0604c86779 added katex package and import 2020-09-19 15:45:35 +01:00
Michael Telatynski d59a1fbd80
Merge pull request #5179 from matrix-org/t3chguy/tidy-dev-deps 
Tidy devDeps, all the webpack stuff lives in the layer above
 2020-09-17 15:06:16 +01:00
RiotRobot 747126950b Merge branch 'master' into develop 2020-09-14 16:07:54 +01:00
RiotRobot 4f930ac50c v3.4.1 2020-09-14 15:49:09 +01:00
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
Michael Telatynski b878c27741 Tidy devDeps, all the webpack stuff lives in the layer above 2020-09-08 16:56:22 +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
Travis Ralston 53db386731 Add support for blurhash (MSC2448) 
MSC: https://github.com/matrix-org/matrix-doc/pull/2448

While the image loads, we can show a blurred version of it (calculated at upload time) so we don't have a blank space in the timeline.
 2020-08-10 22:07:19 -06: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
Travis Ralston 15b6a273c9 Swap out the resizer lib for something more stable 
react-resizer appears to be okay at tracking state, but it often desyncs from reality. re-resizer is more maintained and more broadly used (160k downloads vs 110k), and appears to generally do a better job of tracking the cursor.

The new library has some oddities though, such as deltas, touch support (hence the polyfill), and calling handles "Enable".

For https://github.com/vector-im/riot-web/issues/14022
 2020-07-07 22:21:00 -06:00
Michael Telatynski 2c1eb07768
Merge pull request #4883 from matrix-org/t3chguy/ts123 
Convert things to Typescript, including languageHandler
 2020-07-06 18:54:19 +01:00
RiotRobot 5c56a55cf0 Reset matrix-js-sdk back to develop branch 2020-07-03 13:29:56 +01:00
RiotRobot 21b7b88fde v2.9.0 2020-07-03 13:27:48 +01:00
RiotRobot 452bb73dcf Upgrade matrix-js-sdk to 7.1.0 2020-07-03 13:22:03 +01:00
Michael Telatynski 48ce294a49 Transition languageHandler to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 23:15:08 +01:00
RiotRobot f9cb0b9cab v2.9.0-rc.1 2020-07-01 14:32:20 +01:00
RiotRobot 161c37d93c Upgrade matrix-js-sdk to 7.1.0-rc.1 2020-07-01 14:21:35 +01:00
Jorik Schellekens b110639c76 Merge remote-tracking branch 'origin' into joriks/eslint-config 2020-06-29 16:49:33 +01:00
RiotRobot 0059d44e15 Merge branch 'master' into develop 2020-06-29 16:10:32 +01:00
RiotRobot e43311c0f4 v2.8.1 2020-06-29 15:59:37 +01:00
Jorik Schellekens 0a2934203f Remove tslint 2020-06-23 17:01:40 +01:00
Jorik Schellekens 7699aafcaf Use new eslint package- fix lint issues in ts and js 2020-06-23 17:01:19 +01:00
RiotRobot f3af603102 Reset matrix-js-sdk back to develop branch 2020-06-23 15:19:55 +01:00
RiotRobot 5256a86545 v2.8.0 2020-06-23 15:06:53 +01:00
RiotRobot 54ba75afd7 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 14:48:23 +01:00
RiotRobot b5aa66015c v2.8.0-rc.1 2020-06-17 21:46:34 +01:00
RiotRobot dd23a50a3c Upgrade matrix-js-sdk to 7.0.0-rc.1 2020-06-17 21:40:30 +01:00
RiotRobot 6f6793bc85 Reset matrix-js-sdk back to develop branch 2020-06-16 11:45:28 +01:00
RiotRobot 8047bace91 Merge branch 'master' into develop 2020-06-16 11:44:27 +01:00
RiotRobot 0f6a0bb3ae v2.7.2 2020-06-16 11:35:29 +01:00
RiotRobot 1374d2020a Upgrade matrix-js-sdk to 6.2.2 2020-06-16 11:26:12 +01:00
Travis Ralston 1467191a5d Update the CSS transition for breadcrumbs 
The actual transition length might need adjusting, but this is fairly close to what was requested.
 2020-06-09 15:06:54 -06:00
Michael Telatynski 69ea635398 Allow searching the emoji picker using other emoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-05 23:19:00 +01:00
Travis Ralston ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize 
New room list scrolling and resizing
 2020-06-05 13:17:59 -06:00
RiotRobot d54308a8c6 Reset matrix-js-sdk back to develop branch 2020-06-05 15:48:06 +01:00
RiotRobot c8366b7a47 v2.7.1 2020-06-05 15:43:24 +01:00
RiotRobot e78fa602c0 Upgrade matrix-js-sdk to 6.2.1 2020-06-05 15:13:55 +01:00
Travis Ralston cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize 2020-06-04 09:19:54 -06:00
RiotRobot 3c73930e9a Reset matrix-js-sdk back to develop branch 2020-06-04 15:14:34 +01:00
RiotRobot 260d448db6 Merge branch 'master' into develop 2020-06-04 15:13:41 +01:00
RiotRobot 65e59fd708 v2.7.0 2020-06-04 15:12:24 +01:00
RiotRobot 07a12a73ee Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:06:40 +01:00
Travis Ralston dbf996439b Wedge t3chguy's resizer prototype into the sublist 2020-06-03 21:17:51 -06:00
RiotRobot ec35445bf0 v2.7.0-rc.2 2020-06-02 14:37:47 +01:00
RiotRobot 039c42dc09 v2.7.0-rc.1 2020-06-02 13:59:10 +01:00
RiotRobot 98a6dd88e3 Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 13:53:13 +01:00
Matthew Hodgson 9cdc1788b2 rebuild with emojibase-data 5 2020-05-31 16:04:15 +01:00
Matthew Hodgson c3ad15e479 upgrade to twemoji 13.0.0 2020-05-31 14:09:44 +01:00
Jorik Schellekens 076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts 
Move Field to Typescript
 2020-05-26 16:13:03 +01:00
Michael Telatynski c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
 2020-05-26 13:38:17 +01:00
Jorik Schellekens b4624baf2f
Merge branch 'develop' into joriks/field-ts 2020-05-25 17:29:25 +01:00
Jorik Schellekens 30e2b01022 unlock react types 2020-05-25 17:08:37 +01:00
Jorik Schellekens 63f78b0808 Move tooltip to ts 2020-05-25 13:40:05 +01:00
Michael Telatynski 880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks 
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
	test/components/views/messages/TextualBody-test.js
 2020-05-23 11:12:58 +01:00
Michael Telatynski efeb8a8487 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 2020-05-23 11:01:36 +01:00
RiotRobot 5ec8459468 Merge branch 'master' into develop 2020-05-22 14:13:01 +01:00
RiotRobot 5a4da13e86 v2.6.1 2020-05-22 14:00:29 +01:00
Michael Telatynski dc37469808 Convert ToastContainer and ToastStore to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 12:47:40 +01:00
Travis Ralston 7ff850deea
Merge pull request #4253 from matrix-org/travis/room-list-2 
Rewrite the room list store
 2020-05-21 13:30:32 -06:00
RiotRobot 833eccf5cd Reset matrix-js-sdk back to develop branch 2020-05-19 11:25:07 +01:00
RiotRobot 19e496cacc Merge branch 'master' into develop 2020-05-19 11:23:16 +01:00
RiotRobot 26e6447be5 v2.6.0 2020-05-19 11:22:00 +01:00
RiotRobot 406839e89a Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:13:57 +01:00
Travis Ralston 38920e7f30 Merge branch 'develop' into travis/room-list-2 2020-05-18 23:23:59 -06:00
Travis Ralston 9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types 
Convert the dispatcher to TypeScript
 2020-05-18 23:22:32 -06:00