Commit Graph

3275 Commits

Author SHA1 Message Date
RiotRobot ec49f4555b Upgrade matrix-react-sdk to 2.8.1 2020-06-29 16:15:21 +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 2000f420bd Reset matrix-react-sdk back to develop branch 2020-06-23 15:31:49 +01:00
RiotRobot 979ce51208 Reset matrix-js-sdk back to develop branch 2020-06-23 15:31:35 +01:00
RiotRobot b1c106e8b2 Upgrade matrix-react-sdk to 2.8.0 2020-06-23 15:20:43 +01:00
RiotRobot ae7f354811 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 15:20:24 +01:00
RiotRobot f3af603102 Reset matrix-js-sdk back to develop branch 2020-06-23 15:19:55 +01:00
RiotRobot 54ba75afd7 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 14:48:23 +01:00
RiotRobot d587a8e910 Upgrade matrix-react-sdk to 2.8.0-rc.1 2020-06-17 21:49:25 +01:00
RiotRobot 2c227f68d4 Upgrade matrix-js-sdk to 7.0.0-rc.1 2020-06-17 21:49:00 +01:00
RiotRobot dd23a50a3c Upgrade matrix-js-sdk to 7.0.0-rc.1 2020-06-17 21:40:30 +01:00
RiotRobot 59d37ec94b Reset matrix-react-sdk back to develop branch 2020-06-16 12:01:07 +01:00
RiotRobot 6558d6d828 Reset matrix-js-sdk back to develop branch 2020-06-16 12:00:53 +01:00
RiotRobot 754d849055 Merge branch 'master' into develop 2020-06-16 12:00:14 +01:00
RiotRobot 9ed7c96df6 Upgrade matrix-react-sdk to 2.7.2 2020-06-16 11:51:28 +01:00
RiotRobot 93da1f192b Upgrade matrix-js-sdk to 6.2.2 2020-06-16 11:51:11 +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 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
J. Ryan Stinnett 7d800f9f38 Upgrade deps 2020-06-08 10:16:33 +01:00
J. Ryan Stinnett 1315ed503b Upgrade deps 2020-06-08 10:12:11 +01:00
dependabot[bot] e8ebf886e4 Bump websocket-extensions from 0.1.3 to 0.1.4
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-06 13:56:59 +00: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 6875ffe0d5 Reset matrix-react-sdk back to develop branch 2020-06-05 16:03:24 +01:00
RiotRobot befc7589cd Reset matrix-js-sdk back to develop branch 2020-06-05 16:03:09 +01:00
RiotRobot 21dd4c99f3 Upgrade matrix-react-sdk to 2.7.1 2020-06-05 15:53:38 +01:00
RiotRobot 45fb8adc5d Upgrade matrix-js-sdk to 6.2.1 2020-06-05 15:52:31 +01:00
RiotRobot d54308a8c6 Reset matrix-js-sdk back to develop branch 2020-06-05 15:48:06 +01:00
RiotRobot 1d6141cf73 Merge branch 'master' into develop 2020-06-05 15:47:23 +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 451138617b Upgrade matrix-react-sdk to 2.7.0 2020-06-04 15:23:38 +01:00
RiotRobot a0ea1bfda8 Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:23:02 +01: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 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 f8dad68958 Add flux types as a dev dependency
This is not the right thing to do, since we don't directly use Flux at this
layer, but for the moment we need it to get distribution builds working.
2020-06-02 15:53:11 +01:00
RiotRobot e37680b6c1 Upgrade matrix-react-sdk to 2.7.0-rc.2 2020-06-02 14:41:44 +01:00
RiotRobot 94fee233a8 Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 14:40:00 +01:00
RiotRobot 98a6dd88e3 Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 13:53:13 +01:00
Matthew Hodgson aab8f6755f bump yarn lock 2020-05-31 16:06:33 +01:00
Matthew Hodgson c3ad15e479 upgrade to twemoji 13.0.0 2020-05-31 14:09:44 +01:00
Travis Ralston b9794ea6e4 Remove webpack-build-notifier from lockfile 2020-05-26 13:50:31 -06: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 43c0148123 Fix @types/react conflict in matrix-react-sdk 2020-05-25 18:37:30 +01:00