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

8420 Commits

Author SHA1 Message Date
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
Will Hunt 625c21a8af
@babolivier showed me the way 2020-01-15 17:07:38 +00:00
Half-Shot d515bad46f Support application/wasm in docker 
Signed-off-by: Half-Shot <will@half-shot.uk>
 2020-01-15 13:13:03 +00:00
Travis Ralston f2da98b136 Revert change to electron updater exports 2020-01-14 10:03:24 -07:00
David Baker ab758d2377
Merge pull request #11850 from vector-im/dbkr/disdable_event_indexing_on_develop 
Disable event indexing on develop
 2020-01-14 11:10:46 +00:00
David Baker 1a3e5a3c70 Disable event indexing on develop 
develop is a web deploy and therefore unlikely to have to node
module available
 2020-01-14 11:01:40 +00: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
J. Ryan Stinnett 6ce5377747
Merge pull request #11792 from Eothred/develop 
Updated blog url
 2020-01-13 17:12:29 +00:00
Matthew Hodgson 619cd57bc6 fix the blog url 2020-01-13 16:50:46 +00:00