gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,219 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

1052 Commits

Author SHA1 Message Date
Michael Telatynski bb6afd7c30 backport riot-desktop implementation into riot-web 2020-03-02 20:16:41 +00:00
RiotRobot 94ceb5a46b Reset SDKs back to develop branch 2020-03-02 17:57:08 +00:00
RiotRobot 43b70bf720 v1.5.11 2020-03-02 17:51:01 +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
RiotRobot 03f63397ff v1.5.11-rc.1 2020-02-26 14:37:19 +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 9b9d585af0 Upgrade to Electron 8.0.2 2020-02-26 13:44:07 +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 eb66d62f1a v1.5.10 2020-02-19 16:23:51 +00:00
RiotRobot dafb2f01b1 released react-sdk & js-sdk 2020-02-19 16:20:44 +00:00
David Baker 5ac9902384 Switch back to develop deps 2020-02-17 14:15:21 +00:00
RiotRobot a5d5e2800c v1.5.9 2020-02-17 13:42:37 +00:00
RiotRobot 9b5655c1fa Released js-sdk & react-sdk 2020-02-17 13:39:24 +00:00
RiotRobot 08c149ed66 v1.5.9-rc.1 2020-02-13 17:56:15 +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 036348cd60 Electron 8.0.0 crashes on macOS, reverting to 7.1.12 2020-02-13 15:24:59 +00:00
J. Ryan Stinnett 2c0968e40e Return to default deb after install script 
Upstream electron-builder now contains the SUID sandbox change.

See also https://github.com/electron-userland/electron-builder/pull/4163
 2020-02-13 14:52:44 +00:00
J. Ryan Stinnett 3eb5eb1d21 Upgrade electron-builder 2020-02-13 14:50:19 +00:00
J. Ryan Stinnett 4a1b9d8ea4 Upgrade to Electron 8.0.0 2020-02-13 14:45:42 +00:00
Travis Ralston b107da09fa
Merge pull request #12251 from vector-im/jaywink/add-contribute-json 
Add contribute.json
 2020-02-05 15:21:07 +00:00
Jason Robinson 9534a25270 Fix contribute.json location as per spec 
Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2020-02-05 16:28:44 +02:00
Michael Telatynski bceca49cdc Update vendored modernizr 2020-02-04 11:00:47 +00:00
Travis Ralston d50b52cdc5 Try to fix Jest 2020-01-28 14:31:09 +00:00
J. Ryan Stinnett 8ca6c2c433 Flip SDKs back to develop 2020-01-27 16:01:12 +00:00
RiotRobot 9782599c69 Merge branch 'master' into develop 2020-01-27 12:02:44 +00:00
RiotRobot 768cabe4bb v1.5.8 2020-01-27 11:57:49 +00:00
RiotRobot dd26d43173 js-sdk 4.0.0 & react-sdk 2.0.0 2020-01-27 11:52:18 +00:00
RiotRobot 902252ad93 v1.5.8-rc.2 2020-01-22 14:24:50 +00:00
David Baker eb5e14661d Actually pull in react-sdk rc.2 2020-01-22 14:20:46 +00:00
RiotRobot ebd3f0e4e1 v1.5.8-rc.1 2020-01-22 13:22:19 +00:00
David Baker 8913eba60d react-sdk rc.2 2020-01-22 13:06:37 +00:00
Travis Ralston 5b575d5627 Force Jest to resolve the js-sdk and react-sdk to src directories 2020-01-20 14:28:29 -07:00
David Baker c3a5e2e5d3 react-sdk & js-sdk rc.1 2020-01-20 14:36:12 +00:00
David Baker ad8bd62ae6 bump electron version 2020-01-20 14:15:40 +00:00
J. Ryan Stinnett 8c6d6b1d09 Fix yarn start concurrent commands 2020-01-16 23:26:13 +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 3fb6b1ed63 Remove excessive sleep now that we're not using chrome 2020-01-15 15:31:08 -07:00
Travis Ralston 5cd54e9f6d Use jsdom 14 instead of 13 2020-01-15 15:30:40 -07:00
Travis Ralston c70d21a92e Force Jest to use exactly one copy of React and ReactDOM 2020-01-15 14:42:16 -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 f0dbc85ca5 Mock out browser-request to fix i18n 2020-01-15 14:06:55 -07:00
Travis Ralston 161a1342b2 Swap over to Jest, breaking everything 2020-01-15 13:24:19 -07:00
Travis Ralston a978a6734f Fix CI tests 
There's a bunch of generated files that webpack relies on to work, and Karma works off webpack. To make both happy we've added
a new `build:genfiles` script which takes care of this for us. We also have to install and build our other layers to get the
same effect (like generating the react-sdk's component index, while we still have one).

This commit also fixes all the imports in the tests because they were just wrong. They should have been caught in the ES6ification
earlier, but were missed.
 2020-01-13 20:40:00 -07:00
Travis Ralston 3b688aaeb8 Don't run linter on tests for now 
We previously ignored this whole directory, and it's a bit of wishful thinking that we'll have these delinted as a result.

Switching to Jest should fix most of the problems anyways, so we can enable the linter when we get there.
 2020-01-13 20:37:10 -07:00
Travis Ralston f73d2bae1f Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:22:47 -07:00
RiotRobot 2574841bf4 v1.5.7 2020-01-13 13:14:12 +00:00
RiotRobot 057f78fadc released react-sdk & js-dk 2020-01-13 13:12:29 +00:00
Travis Ralston d877187d5e Remove postinstall script now that it's not needed 2020-01-09 13:43:33 -07:00
Travis Ralston 9bf1c65971 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev 2020-01-09 13:43:25 -07: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 f7637a0df7 v1.5.7-rc.2 2020-01-08 11:25:06 +00:00
RiotRobot a1b14751e5 bump to matrix-react-sdk rc.2 2020-01-08 11:22:50 +00:00
RiotRobot 5f1ef6dfb8 v1.5.7-rc.1 2020-01-06 16:26:46 +00:00
RiotRobot 1de2fe5e27 Merge remote-tracking branch 'origin/develop' into release-v1.5.7 2020-01-06 16:22:33 +00:00
David Baker 52ca0908e2 Fix the build 
Run `yarn install` in the js-sdkc and react-sdk installs. We were
avoiding this before due to using babel dependencies from riot-web
ro build js-sdk, which worked as long as the installed babel versions
and plugins were identical. js-sdk has now been upgraded to babel 7
and so that no longer worked.

This will probably cause react-sdk & js-sdk to be built an
unnecessary number of times.
 2020-01-06 14:55:38 +00:00
RiotRobot f7618e3c73 react-sdk & js-sdk rc.1 2020-01-06 14:05:47 +00:00
David Baker 8b3df0d793 Bump electron version 2020-01-06 13:09:10 +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
Travis Ralston 4479018289
Merge pull request #11660 from vector-im/travis/babel7-reskindex 
Remove now-retired package.json property
 2019-12-17 08:11:14 -07:00
Michael Telatynski f6db2ed8dd Remove babel-plugin-transform-async-to-bluebird 2019-12-13 13:08:29 +00:00
Travis Ralston c143b9b2d7 Remove now-retired package.json property 
For https://github.com/matrix-org/matrix-react-sdk/pull/3723
 2019-12-12 19:47:31 -07:00
J. Ryan Stinnett dd9eda8f97 Flip back to develop 2019-12-11 10:37:36 +00:00
J. Ryan Stinnett eb42793ad5 Remove bluebird transform as regular dep 2019-12-11 10:36:24 +00:00
David Baker 26eff8d372
Merge pull request #11631 from vector-im/dbkr/remove_origin_migrator 
Remove the code that calls the origin migrator
 2019-12-09 15:18:20 +00:00
David Baker bd57ff793f Remove rest of the origin migrator 2019-12-09 14:54:36 +00:00
RiotRobot b7f6d7b102 Merge branch 'master' into develop 2019-12-09 11:43:27 +00:00
RiotRobot cfb3258c36 v1.5.6 2019-12-09 11:39:56 +00:00
RiotRobot 45d51f56f2 Released js-sdk & react-sdk 2019-12-09 11:38:11 +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
J. Ryan Stinnett 1d49544238 Remove bluebird transform as regular dep 2019-12-06 12:39:29 +00:00
J. Ryan Stinnett 70d2adb9e2 Move extract-text-webpack-plugin to dev dep 2019-12-06 12:36:58 +00:00
J. Ryan Stinnett 8ad1bd1501 Move bluebird transform to a dev dependency 2019-12-04 16:02:55 +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
RiotRobot aaf1afaa13 v1.5.6-rc.1 2019-12-04 13:59:44 +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
David Baker c6afbed3fe electron 7.1.3 2019-12-04 11:47:14 +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 d56b73e220 v1.5.5 2019-11-27 10:48:52 +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
David Baker 070d5fc6e8 Sign all of the Windows executable files 
We can actually just supply a custom signing module here to do our
signing rather than manually signing things in the afterSign hook.
This means all 4 executable files get signed (the main exe, the
stub exe, Update.exe and the installer).
 2019-11-26 12:08:29 -07:00
David Baker a84de0bae2 Sign all of the Windows executable files 
We can actually just supply a custom signing module here to do our
signing rather than manually signing things in the afterSign hook.
This means all 4 executable files get signed (the main exe, the
stub exe, Update.exe and the installer).
 2019-11-26 15:24:43 +00:00
RiotRobot acd7e028d5 Merge branch 'master' into develop 2019-11-25 13:43:52 +00:00
RiotRobot bf26ec9d1a v1.5.4 2019-11-25 13:40:05 +00:00
RiotRobot 83591b4567 Released js-sdk & react-sdk 2019-11-25 13:36:37 +00:00
RiotRobot 7b59379d29 v1.5.4-rc.2 2019-11-22 17:30:05 +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 fa5475f1c0 v1.5.4-rc.1 2019-11-20 18:32:56 +00:00
RiotRobot f07e3c3b25 react-sdk & js-sdk rc.1 2019-11-20 18:31:32 +00:00
David Baker 1b0b3e1a44 Bump to Electron 7.1.2 
Tested with electron 7 and appears to be fine
 2019-11-20 17:33:32 +00:00
RiotRobot 5bc15cf83c v1.5.3 2019-11-06 14:28:59 +00:00
David Baker f522305593 Bump to electron 6.1.4 2019-11-06 14:26:45 +00:00
RiotRobot 15c0561588 released react-sdk 2019-11-06 14:24:59 +00:00
Michael Telatynski 385ad5f9ce Don't transform async at all, all browsers we care about support it 2019-11-05 10:43:05 +00:00
David Baker e006e92255 Upgrade electron-notarize 
To include https://github.com/electron/electron-notarize/pull/14
 2019-11-04 18:56:41 +00:00
RiotRobot a92e676e28 Merge branch 'release-v1.5.2' 2019-11-04 18:34:12 +00:00
RiotRobot 17027cb515 v1.5.2 2019-11-04 18:30:37 +00:00
Michael Telatynski 7391846eda
Merge pull request #11306 from vector-im/t3chguy/add_eslint-plugin-react-hooks 
Add dependency to eslint-plugin-react-hooks as react-sdk did
 2019-11-04 16:58:26 +00:00
Michael Telatynski f3656c2792 Add dependency to eslint-plugin-react-hooks as react-sdk did 2019-11-04 16:52:23 +00:00
David Baker 7a7ea8c7f6 I meant 6.1.2. There is no 6.1.12 2019-11-04 15:33:25 +00:00
RiotRobot fb64a0a46c v1.5.1 2019-11-04 15:17:30 +00:00
RiotRobot 6d553d1ecd Released react-sdk & js-sdk 2019-11-04 15:14:59 +00:00
Michael Telatynski 10e1d9093e transform-async-to-promises: get rid of bluebird 2019-11-04 12:46:28 +00:00
RiotRobot 3ba3c1b881 v1.5.1-rc.2 2019-11-01 10:24:29 +00:00
RiotRobot 0c18f944cc react-sdk rc.2 2019-11-01 10:22:09 +00:00
RiotRobot 35d1222cba v1.5.1-rc.1 2019-10-30 16:51:57 +00:00
RiotRobot f7bb2c02fb js-sdk & react-sdk rc.1 2019-10-30 16:50:31 +00:00
David Baker 88339fc782 Bump electron to 6.1.2 
7 is available but I'm not feeling that brave just yet
 2019-10-30 13:54:05 +00:00
J. Ryan Stinnett 14f59801d7 Change back to develop branch for deps 2019-10-18 16:14:28 +01:00
RiotRobot 36c07a1c3a Merge branch 'master' into develop 2019-10-18 15:01:21 +01:00
RiotRobot 46b75e8c3c v1.5.0 2019-10-18 14:57:44 +01:00
RiotRobot e275441701 Upgrade to JS SDK v2.4.2 and React SDK v1.7.0 2019-10-18 14:54:02 +01:00
J. Ryan Stinnett 77731b5674 Merge 'dbkr/windows_signing' into v1.5.0 2019-10-18 14:24:57 +01:00
David Baker 8e81685a9f
Merge pull request #11126 from vector-im/dbkr/windows_signing 
Sign main Windows executable
 2019-10-18 12:02:04 +01:00
Michael Telatynski 5e783124e8
Merge pull request #11140 from vverst/dark-title-bar 
Add darkModeSupport to allow dark themed title bar.
 2019-10-14 18:27:27 +01:00
David Baker 5a7efcd738 Sign the main executable on windows 
and automate the signing of the installers
 2019-10-11 12:01:50 +01:00
David Baker 0259eb6419 Go back to upstream electron-notarize 
It doesn't work as a github dependency because the typescript
doesn't get built.
 2019-10-10 18:34:26 +01:00
David Baker a7d1d9880b Use my fork of electron-notarize 
if only to test it
 2019-10-10 14:56:35 +01:00
David Baker 29f186bc18 add electron-notarize 2019-10-10 11:57:39 +01:00
RiotRobot 561d0c9a4c v1.5.0-rc.1 2019-10-09 17:37:00 +01:00
RiotRobot b18e4f079f js-sdk & react-sdk rc.1 2019-10-09 17:00:22 +01:00
David Baker ff70339aad Working branch for notarisation 2019-10-09 16:29:24 +01:00
David Baker b6d1d0bf5d Bump Olm to 3.1.4 for olm_session_describe 2019-10-09 15:40:25 +01:00
J. Ryan Stinnett fce5b4dd78 Enable Webpack production mode for start:js:prod 
The (rarely used) `start:js:prod` script for running production mode locally
failed to set Webpack into production mode, so things like minification would be
skipped.
 2019-10-09 10:59:44 +01:00
vverst 2e5b0fb72d
Add darkModeSupport 2019-10-09 09:04:45 +02:00
David Baker af57c9e321 js-sdk & react-sdk develop 2019-10-04 11:08:08 +01:00
RiotRobot 685d913171 v1.4.2 2019-10-04 10:41:06 +01:00
RiotRobot b333058b57 released react-sdk 2019-10-04 10:39:53 +01:00
David Baker 7df140c164 electron version bump 2019-10-04 10:21:27 +01:00
RiotRobot 1ba2731391 v1.4.2-rc.1 2019-10-02 10:33:37 +01:00
David Baker d83c942fe5 released js-sdk & react-sdk 2019-10-02 10:30:13 +01:00
J. Ryan Stinnett f7a08e8d27 Change back to develop branch for deps 2019-10-01 13:32:36 +01:00
RiotRobot be0b4e9072 v1.4.1 2019-10-01 11:52:23 +01:00
RiotRobot 55fe24e72c Upgrade to React SDK 1.6.1 and JS SDK 2.4.1 2019-10-01 11:47:44 +01:00
J. Ryan Stinnett 6094b8be9a Change back to develop branch for deps 2019-09-27 14:46:05 +01:00
RiotRobot 97a2a6a168 v1.4.0 2019-09-27 12:36:45 +01:00
RiotRobot d76ed50625 Upgrade to React SDK 1.6.0 and JS SDK 2.4.0 2019-09-27 12:09:11 +01:00
RiotRobot 845590ed68 v1.4.0-rc.2 2019-09-26 12:21:17 +01:00
RiotRobot 0e6b3eab11 Upgrade to React SDK 1.6.0-rc.2 2019-09-26 12:15:43 +01:00
RiotRobot 1713f49e07 v1.4.0-rc.1 2019-09-25 17:49:29 +01:00
RiotRobot 6db826005c Upgrade to React SDK 1.6.0-rc.1 and JS SDK 2.4.0-rc.1 2019-09-25 17:42:57 +01:00
J. Ryan Stinnett 3ee8098eb2 Upgrade to latest Electron 6.x 2019-09-25 17:07:52 +01:00
RiotRobot 6bd089c350 Merge branch 'master' into develop 2019-09-19 17:54:39 +01:00