Commit Graph

253 Commits

Author SHA1 Message Date
RiotRobot fb33b6082d Reset matrix-react-sdk back to develop branch 2020-05-05 11:41:33 +01:00
RiotRobot 99af02eecd Reset matrix-js-sdk back to develop branch 2020-05-05 11:41:11 +01:00
RiotRobot d5d4b95fee Merge branch 'master' into develop 2020-05-05 11:39:12 +01:00
RiotRobot 3e13de3069 Upgrade matrix-react-sdk to 2.5.0 2020-05-05 11:31:28 +01:00
RiotRobot cc192ab882 Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:30:41 +01:00
RiotRobot 1edfde3932 Upgrade matrix-react-sdk to 2.5.0-rc.6 2020-05-01 16:33:00 +01:00
RiotRobot 43879c410c Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:32:34 +01:00
RiotRobot 3c7de2c08f Upgrade matrix-react-sdk to 2.5.0-rc.5 2020-04-30 11:34:11 +01:00
RiotRobot ecc73905c1 Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:33:23 +01:00
RiotRobot e7cb2e4022 Upgrade matrix-react-sdk to 2.5.0-rc.4 2020-04-23 15:58:10 +01:00
RiotRobot 7600571cf5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:57:32 +01:00
Travis Ralston 3eadf35819 Manually undo emojibase changes in lockfile 2020-04-20 09:49:09 -06:00
RiotRobot 393d701ee9 Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:58:52 +01:00
RiotRobot ef5d1f421d Upgrade matrix-react-sdk to 2.5.0-rc.3 2020-04-17 17:57:33 +01:00
RiotRobot 6ca2f4c87d Upgrade matrix-react-sdk to 2.5.0-rc.2 2020-04-16 20:06:01 +01:00
RiotRobot 0c12630b89 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 20:04:19 +01:00
Travis Ralston 005269e2ad Make Jitsi download script a JS script
It's awful but means that we create the directory on all platforms in-process.

Fixes https://github.com/vector-im/riot-web/issues/13215
2020-04-16 12:37:41 -06:00
RiotRobot 2cd585cd6c Upgrade matrix-react-sdk to 2.5.0-rc.1 2020-04-15 19:24:18 +01:00
RiotRobot 0b32f7c87f Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:22:38 +01:00
RiotRobot 08ef4ff3b1 Merge branch 'release-v1.5.16' into release-v1.6.0 2020-04-15 19:08:28 +01:00
J. Ryan Stinnett a1ef707065 yarn upgrade 2020-04-08 14:55:46 +01:00
RiotRobot 48018b33cc Upgrade matrix-react-sdk to 2.4.0-rc.1 2020-04-08 14:06:02 +01:00
RiotRobot 83af795358 Upgrade matrix-js-sdk to 5.3.0-rc.1 2020-04-08 14:03:43 +01:00
Michael Telatynski b647e35c48
Merge pull request #13049 from vector-im/t3chguy/default_home
Add new default home page fallback
2020-04-07 14:47:01 +01:00
Michael Telatynski e58cd1f73a Add new default home page fallback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:48:56 +01:00
Michael Telatynski b1575524aa Switch things to typescript, use @types/modernizr, fix global.d.ts. Move mobile_guide redirect to index.ts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-05 00:55:36 +01:00
RiotRobot cb8319ea2d Reset matrix-react-sdk back to develop branch 2020-04-01 15:35:13 +01:00
RiotRobot af35696db9 Reset matrix-js-sdk back to develop branch 2020-04-01 15:35:02 +01:00
RiotRobot ccd998d709 Merge branch 'master' into develop 2020-04-01 15:34:02 +01:00
RiotRobot 5f5d46eb11 Upgrade matrix-react-sdk to 2.3.1 2020-04-01 15:08:57 +01:00
RiotRobot d4f75e4e1b Reset matrix-react-sdk back to develop branch 2020-03-30 13:54:09 +01:00
RiotRobot 4a4df94339 Reset matrix-js-sdk back to develop branch 2020-03-30 13:53:58 +01:00
RiotRobot 51f4327ce1 Upgrade matrix-react-sdk to 2.3.0 2020-03-30 13:45:21 +01:00
RiotRobot 37cebf38cc Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:44:42 +01:00
RiotRobot 5b35d6e570 Upgrade matrix-react-sdk to 2.3.0-rc.1 2020-03-26 13:28:04 +00:00
RiotRobot 9269d9b669 Upgrade matrix-js-sdk to 5.2.0-rc.1 2020-03-26 13:27:40 +00:00
Michael Telatynski 7296b704a8
Merge pull request #12756 from vector-im/t3chguy/gemini
Remove remainders of gemini-scrollbar and react-gemini-scrollbar
2020-03-18 14:03:59 +00:00
RiotRobot a9fbf2f968 Reset matrix-react-sdk back to develop branch 2020-03-17 14:39:09 +00:00
RiotRobot 25a3449ad2 Reset matrix-js-sdk back to develop branch 2020-03-17 14:38:58 +00:00
RiotRobot b01c6e67fd Merge branch 'master' into develop 2020-03-17 14:37:28 +00:00
RiotRobot 8002bc66d7 Upgrade matrix-react-sdk to 2.2.3 2020-03-17 14:29:06 +00:00
RiotRobot c3553a2649 Upgrade matrix-js-sdk to 5.1.1 2020-03-17 14:28:23 +00:00
Michael Telatynski 368d26af34 update yarn lock a little more forcibly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:36:26 +00:00
Travis Ralston e110c8ed9b Remove stuff that yarn install doesn't think we need 2020-03-12 10:47:34 -06:00
David Baker ce9a964956
Merge pull request #12691 from vector-im/dbkr/yarn_upgrade_20200311
yarn upgrade
2020-03-12 09:45:45 +00:00
Travis Ralston f44694ad44 Support TypeScript for React components
Same treatment as https://github.com/matrix-org/matrix-react-sdk/pull/4203
2020-03-11 18:19:03 -06:00
RiotRobot 34817a0044 js-sdk & react-sdk rc.1 2020-03-11 17:36:18 +00:00
David Baker e18157d5a0 yarn upgrade 2020-03-11 14:56:13 +00:00
RiotRobot 872a7a74fb Reset matrix-react-sdk back to develop branch 2020-03-04 13:07:59 +00:00
RiotRobot 4548831ac5 Reset matrix-js-sdk back to develop branch 2020-03-04 13:07:45 +00:00
RiotRobot d88f9ed2c0 Merge branch 'master' into develop 2020-03-04 13:06:43 +00:00
RiotRobot c26396d693 Upgrade matrix-react-sdk to 2.2.1 2020-03-04 12:01:31 +00:00
RiotRobot 94ceb5a46b Reset SDKs back to develop branch 2020-03-02 17:57:08 +00:00
RiotRobot d077165858 Merge branch 'master' into develop 2020-03-02 17:55:04 +00:00
RiotRobot 620414187f Upgrade matrix-react-sdk to 2.2.0 2020-03-02 17:47:53 +00:00
RiotRobot e71dcacd2d Upgrade matrix-js-sdk to 5.1.0 2020-03-02 17:47:32 +00:00
J. Ryan Stinnett bb5aa94707 Upgrade deps 2020-02-26 15:04:38 +00:00
RiotRobot a4d01a5f04 Upgrade matrix-react-sdk to 2.2.0-rc.1 2020-02-26 14:34:56 +00:00
RiotRobot 4fced076b7 Upgrade matrix-js-sdk to 5.1.0-rc.1 2020-02-26 14:33:57 +00:00
J. Ryan Stinnett de71e36843 Reset matrix-react-sdk back to develop branch 2020-02-20 12:01:58 +00:00
J. Ryan Stinnett 120d36d70b Reset matrix-js-sdk back to develop branch 2020-02-20 12:01:58 +00:00
RiotRobot dafb2f01b1 released react-sdk & js-sdk 2020-02-19 16:20:44 +00:00
RiotRobot 9b5655c1fa Released js-sdk & react-sdk 2020-02-17 13:39:24 +00:00
RiotRobot 35204416bf Upgrade JS SDK to 5.0.0-rc.1 and React SDK to 2.1.0-rc.2 2020-02-13 17:50:29 +00:00
J. Ryan Stinnett 3eb5eb1d21 Upgrade electron-builder 2020-02-13 14:50:19 +00:00
J. Ryan Stinnett 8ca6c2c433 Flip SDKs back to develop 2020-01-27 16:01:12 +00:00
RiotRobot dd26d43173 js-sdk 4.0.0 & react-sdk 2.0.0 2020-01-27 11:52:18 +00:00
David Baker eb5e14661d Actually pull in react-sdk rc.2 2020-01-22 14:20:46 +00:00
David Baker 8913eba60d react-sdk rc.2 2020-01-22 13:06:37 +00:00
David Baker c3a5e2e5d3 react-sdk & js-sdk rc.1 2020-01-20 14:36:12 +00:00
Travis Ralston b965188a5f Run the react-sdk reskindexer for developers
See https://github.com/matrix-org/matrix-react-sdk/pull/3856 for why chokidar was updated.
2020-01-16 15:40:34 -07:00
Travis Ralston 5cd54e9f6d Use jsdom 14 instead of 13 2020-01-15 15:30:40 -07:00
Travis Ralston 5c915f3d02 Add canvas package so COLR check passes in tests
This is required for jsdom to do the right thing.

We also have to bump the jsdom version, but to do that we need an alternative test environment because Jest has it pinned lower.
2020-01-15 14:42:00 -07:00
Travis Ralston 161a1342b2 Swap over to Jest, breaking everything 2020-01-15 13:24:19 -07:00
Travis Ralston f73d2bae1f Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:22:47 -07:00
RiotRobot 057f78fadc released react-sdk & js-dk 2020-01-13 13:12:29 +00:00
Travis Ralston ec66069e96 Update build scripts for new process
We have to convert *something* to TypeScript so it doesn't complain that there's nothing to compile, so this converts the easiest utility library.

Many of the scripts are copied from the react-sdk.
2020-01-08 16:09:42 -07:00
RiotRobot a1b14751e5 bump to matrix-react-sdk rc.2 2020-01-08 11:22:50 +00:00
RiotRobot f7618e3c73 react-sdk & js-sdk rc.1 2020-01-06 14:05:47 +00:00
Travis Ralston 1b41dc3291 Make the webpack config work for us
This moves the babel and postcss configs into the webpack config for ease of maintenance (and because we need variations of them). The typescript config is left outside the webpack config for IDEs to pick it up.
2019-12-23 19:51:01 -07:00
Michael Telatynski 6f06716954 Regenerate yarn.lock 2019-12-13 13:10:30 +00:00
J. Ryan Stinnett 0930424406 Further attempt to flip to develop 2019-12-11 15:56:59 +00:00
J. Ryan Stinnett dd9eda8f97 Flip back to develop 2019-12-11 10:37:36 +00:00
RiotRobot b7f6d7b102 Merge branch 'master' into develop 2019-12-09 11:43:27 +00:00
RiotRobot 45d51f56f2 Released js-sdk & react-sdk 2019-12-09 11:38:11 +00:00
David Baker 60467ffd02 yarn upgrade
attempt 2
2019-12-06 15:58:44 +00:00
David Baker e2b1a86a29 Remove draft-js dependency
...which for some reason was still kicking around
2019-12-06 13:33:30 +00:00
David Baker f93b7a1675 Add transform-async-to-bluebird
Add babel plugin until the js-sdk stop using bluebird, since we
force-recompile the js-sdk so we need the plugin installed for that
to work (and it's a devDependency on js-sdk so doesn't otherwise get
installed).
2019-12-04 14:25:21 +00:00
David Baker 577e614fa4 Add transform-async-to-bluebird
Add babel plugin until the js-sdk stop using bluebird, since we
force-recompile the js-sdk so we need the plugin installed for that
to work (and it's a devDependency on js-sdk so doesn't otherwise get
installed).
2019-12-04 13:52:59 +00:00
RiotRobot c99cd9fc58 js-sdk & react-sdk rc.1 2019-12-04 12:05:56 +00:00
J. Ryan Stinnett 31ee75f14f Flip SDKs back to develop 2019-11-27 13:33:27 +00:00
RiotRobot ff452b9d87 Merge branch 'master' into develop 2019-11-27 10:54:58 +00:00
RiotRobot 10c5485373 Upgrade to JS SDK 2.4.5 and React SDK 1.7.4 2019-11-27 10:44:15 +00:00
David Baker f09a123a87 Add postcss-easings
So we can use names like easeInSine in CSS transitions rather than
cubic-bezier(0.47, 0, 0.745, 0.715)

Required for https://github.com/matrix-org/matrix-react-sdk/pull/3674
2019-11-26 19:12:28 +00:00
RiotRobot acd7e028d5 Merge branch 'master' into develop 2019-11-25 13:43:52 +00:00
RiotRobot 83591b4567 Released js-sdk & react-sdk 2019-11-25 13:36:37 +00:00
RiotRobot 1cebd3dcd1 react-sdk rc.2 2019-11-22 17:27:27 +00:00
Michael Telatynski eac6c46d28 Merge branches 'develop' and 't3chguy/remove_bluebird' of https://github.com/vector-im/riot-web into t3chguy/remove_bluebird 2019-11-22 14:00:02 +00:00
Michael Telatynski 97abce1ca6 Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-20 22:32:12 +00:00
RiotRobot f07e3c3b25 react-sdk & js-sdk rc.1 2019-11-20 18:31:32 +00:00