OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,380 Commits
207 Branches
549 Tags
668 MiB
Commit Graph

8380 Commits (c30f901716aa29410e19b3457be4ba437548ea6f)

Author SHA1 Message Date
David Baker 6835f6054b path.resolve does joining too so path.join is redundant 2020-01-21 10:16:32 +00:00
Travis Ralston 99e1ff9477 Load as little as possible in index.js for the skinner 
Imports are optimized to be concurrent/async by webpack, which means that when the old index.js referenced the Lifecycle from the react-sdk it caused the app to explode. This is because in another branch the Lifecycle references a class member of a skinnable component, leading to the skinner complaining that the skin hasn't been loaded.

To work around this, we've shoved all the app stuff to a new app.js file, leaving just the skinning and some early bootstrap work in the index.js
 2020-01-20 19:52:11 -07:00
Travis Ralston 932c221548 Fix webpack config (by stealing Dave's config) 
Without doing something like this it's hard to use `yarn link`ed resources.
 2020-01-20 18:10:06 -07:00
Travis Ralston 3e324f6544
Merge pull request #11954 from vector-im/travis/fix/tests/jest-resolve 
Force Jest to resolve the js-sdk and react-sdk to src directories
 2020-01-20 14:38:16 -07: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 be64e86cc3
Merge pull request #11949 from vector-im/dbkr/fix_webpack_build_fix 
Fix build to not babel modules inside js/react sdk
 2020-01-20 18:31:06 +00:00
David Baker 42743c3ead Third try at fixing build 2020-01-20 18:20:41 +00:00
David Baker 5d8d5d70d0 Fix build to not babel modules inside js/react sdk 
Adds 'src' to react-sdk & js-sdk babel test path so we don't run node
modules inside js & react sdk through babel
 2020-01-20 18:00:38 +00:00
David Baker 024297c200
Merge pull request #11947 from vector-im/dbkr/fix_build_webpack_rel 
Fix webpack to babel js-sdk & react-sdk but no other deps
 2020-01-20 17:23:23 +00:00
David Baker db030d9733 Fix webpack to babel js-sdk & react-sdk but no other deps 
This was happening implicitly in our dev setups and the CI build
because of the comment on the last line.
 2020-01-20 17:22:21 +00:00
David Baker 4c699d8001
Merge pull request #11944 from vector-im/dbkr/fix_build_webpack 
Fix webpack to babel js-sdk & react-sdk but no other deps
 2020-01-20 17:19:59 +00:00
David Baker 922ed597d6 Fix webpack to babel js-sdk & react-sdk but no other deps 
This was happening implicitly in our dev setups and the CI build
because of the comment on the last line.
 2020-01-20 16:55:07 +00: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
David Baker 119802d00f
Merge pull request #11934 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-01-20 10:08:45 +00:00
Weblate 674adfb81e Merge branch 'origin/develop' into Weblate. 2020-01-18 01:36:54 +00:00
Travis Ralston 342d717ff6
Merge pull request #11926 from vector-im/travis/fix-rageshake 
Fix rageshake post-sourcemaps
 2020-01-17 18:36:48 -07:00
Travis Ralston cdd25ea45f Fix rageshake post-sourcemaps 2020-01-17 18:27:37 -07:00
catborise 4191c51b42 Translated using Weblate (Turkish) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2020-01-17 20:22:42 +00:00
Damir Jelić a2e256b4c9 ElectronPlatform: Add the ability to load file events from the event index. 2020-01-17 10:11:57 +01:00
J. Ryan Stinnett e3b4f189b4
Merge pull request #11895 from vector-im/jryans/comma-yarn-start 
Fix yarn start concurrent commands
 2020-01-16 23:36:16 +00:00
J. Ryan Stinnett 8c6d6b1d09 Fix yarn start concurrent commands 2020-01-16 23:26:13 +00:00
Travis Ralston 63f8a22b34
Merge pull request #11894 from vector-im/travis/fix-reskindex 
Run the react-sdk reskindexer for developers
 2020-01-16 15:49:10 -07: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 4ca41f4971
Merge pull request #11893 from vector-im/travis/ftue/user-lists/6.1-multidialog 
Update labs documentation for feature_ftue_dms given new scope
 2020-01-16 15:07:09 -07:00
Travis Ralston 276d14dd5d Update labs documentation for feature_ftue_dms given new scope 
See https://github.com/matrix-org/matrix-react-sdk/pull/3854
 2020-01-16 14:46:19 -07:00
Travis Ralston 9a084a6801
Merge pull request #11892 from vector-im/travis/fix-sourcemaps 
Fix indentation on webpack config and make sourcemapped files legible
 2020-01-16 12:01:32 -07:00
Travis Ralston fb9503199d Don't calculate sourcemaps in production 2020-01-16 11:55:54 -07:00
Travis Ralston bb931e25d8 Make sourcemaps legible by humans 2020-01-16 11:47:16 -07:00
Travis Ralston 69d49f9881 Fix indentation of webpack config 2020-01-16 11:33:55 -07:00
J. Ryan Stinnett 6ce50435e3
Merge pull request #11891 from vector-im/jryans/cross-signing-setup 
Remove spinner check
 2020-01-16 16:42:30 +00:00
Travis Ralston 0efd7edf0c
Merge pull request #11867 from vector-im/travis/fix-ci 
Don't minifiy builds of develop through CI packaging
 2020-01-16 09:31:29 -07:00
Travis Ralston 4e37f8aa88 Merge branch 'develop' into travis/fix-ci 2020-01-16 09:25:10 -07:00
J. Ryan Stinnett fb77bcf762 Remove spinner check 
We may no longer see a spinner for some login paths with the changes to add a
complete security step.

Part of https://github.com/vector-im/riot-web/issues/11214
 2020-01-16 16:07:49 +00:00
Travis Ralston 2652060e38
Merge pull request #11869 from vector-im/travis/jest 
Use Jest for tests
 2020-01-15 17:18:51 -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 9ab40af430 Ensure autogenned files are present for tests 2020-01-15 14:52:26 -07:00
Travis Ralston bcda501864 Replace usages of expect.toStartWith with boolean checks 2020-01-15 14:44:46 -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 84439cff86 Import the cryptostore from the right place 2020-01-15 14:06:44 -07:00
Travis Ralston e37da08730 Replace beforeEach with just a cleanLocalstorage call 
The rest isn't needed anymore.
 2020-01-15 14:06:24 -07:00
Travis Ralston 3c9c0ec447 Leave the language handler setup to the test init scripts 2020-01-15 14:05:55 -07:00
Travis Ralston 161a1342b2 Swap over to Jest, breaking everything 2020-01-15 13:24:19 -07:00
Travis Ralston ae010ef649 Convert babel config to JS for Jest to pick up 2020-01-15 13:00:11 -07:00
Travis Ralston 909fddb732 Don't minifiy builds of develop through CI packaging 
Fixes https://github.com/vector-im/riot-web/issues/11864

This uses an environment variable because the build script assumes you want a production build, but we don't for this particular script. To avoid having a mess of NPM scripts to worry about, we'll just pass a flag down.
 2020-01-15 12:19:45 -07:00
Will Hunt 044720b7e5
Merge pull request #11858 from vector-im/hs/wasm-docker 
Support application/wasm in Docker image
 2020-01-15 18:02:39 +00:00
Travis Ralston 599b263e22
Merge pull request #11843 from vector-im/travis/sourcemaps 
Fix sourcemaps by refactoring the build system
 2020-01-15 10:11:39 -07:00