30f0a7932b
Merge remote-tracking branch 'origin/develop' into dbkr/wasm
2018-10-02 16:58:31 +01:00
1f34d2d644
Kill off olm-loader
...
Now that Olm needs to be inited asynchronously anyway, we can just
pass the options to Olm.init(), and as long as we do that before we
start the js-sdk, we're all good.
This will means the olm js is now part of the main bundle but since
it's now just a wrapper around the wasm, this is probably faster.
Also add the directwatch flag to olm.wasm because otherwise it
doesn't seem to copy the file in watch mode...
2018-09-26 16:44:52 +01:00
4041f3db5c
Send standard output/input from npm-sub.js to the parent proc
2018-09-25 15:54:38 -06:00
91304e70a1
Swap out the complicated canary stuff for serial execution
...
Fixes https://github.com/vector-im/riot-web/issues/7386
2018-09-25 15:49:14 -06:00
27c23058dc
Alter build process to rely on canaries only
...
With the react-sdk and js-sdk having their `npm start`s split out (as per https://github.com/matrix-org/matrix-react-sdk/pull/2175 and https://github.com/matrix-org/matrix-js-sdk/pull/742 ) we can trigger an initial build ourselves and start the watcher afterwards. This canary approach has a very slight speed increase over serially running all the commands as the watcher can be started as early as possible.
This all can be improved and potentially eliminated with a bit more planning, however: https://github.com/vector-im/riot-web/issues/7386
2018-09-25 11:20:58 -06:00
c511902356
Support WebAssembly version of Olm.
...
* Olm no longer supports setting the stack/memory size at runtime,
so don't (they're now set to be that in the Olm build).
* Copy the wasm file from the Olm library (see multiple comments
about it being in the wrong place and webpack being awful).
2018-09-25 17:55:41 +01:00
8d7cec2a94
Add some comments to describe the build process
2018-09-24 17:57:18 -06:00
2b037ee146
Prevent races by blocking on SDK builds
...
If we don't block on SDK builds, then the riot-web build fails due to half-built dependencies. This needs to be done at two levels: the js-sdk because it is used by both the react-sdk and riot-web, and at the react-sdk because riot-web needs it. This means our build process is synchronous for js -> react -> riot, at least for the initial build.
This does increase the startup time, particularly because the file watch timer is at 5 seconds. The timer is used to detect a storm of file changes in the underlying SDKs and give the build process some room to compile larger files if needed.
The file watcher is accompanied by a "canary signal file" to prevent the build-blocking script from unblocking too early. Both the js and react SDKs build when `npm install` is run, so we ensure that we only listen for the `npm start` build for each SDK.
This is all done at the riot level instead of at the individual SDK levels (where we could use a canary file to signal up the stack) because:
* babel (used by the js-sdk) doesn't really provide an "end up build" signal
* webpack is a bit of a nightmare to get it to behave at times
* this blocking approach is really only applicable to riot-web, although may be useful to some other projects.
Hopefully that all makes sense.
2018-09-24 17:12:42 -06:00
c6da122e41
Fix npm link in the build script
2018-09-17 17:57:27 -06:00
67e9606d55
Reduce the number of terminals required to build riot-web to 1
...
A step towards a real solution for https://github.com/vector-im/riot-web/issues/7305
This approach makes use of `npm link` to remove the use of symlinks in the build process. The build process has also been altered to invoke the build process of each underlying SDK (react, js). This means that one can now `npm link` and `npm start` and have a working environment.
At the same time, parallelshell was dropped due to lack of maintenance from the maintainer.
2018-09-17 17:50:03 -06:00
8a167d2743
Add Norsk & Italian
2018-08-16 15:04:17 +01:00
0abaff5aed
Copy media from react-sdk
...
Looks like this just got missed
Fixes https://github.com/vector-im/riot-web/issues/6586
2018-04-23 17:27:35 +01:00
f012dd5f31
Fix favicon
...
In removing 'media' here, it changed the meaning of the copy so
the contents of vector-icons (rather than the dir itself) got
copied to webapp/
2018-04-23 11:28:01 +01:00
a46b718b4a
copy resources from their new locations
2018-04-13 01:49:52 +01:00
57803f7a41
reorder based on language code
2018-03-17 16:24:47 +01:00
14f70beac2
Add languages (czech, galician and serbian)
2018-03-17 11:27:10 +01:00
075f568f61
Fix crash; fs event received /w langauge file empty
...
It was common, at least for me, to experience a crash produced
when running the `matrix-react-sdk/scripts/gen-i18n.js` script
because when writing en_EN.json (via the script or otherwise)
choikdar would receive an event and cause the file to be read,
but the file would be empty when clearly it wasn't.
This would happen even when doing an atomic write in gen-i18n.
The fix adds a debounce as a workaround.
2018-03-02 15:30:06 +00:00
90897b0741
Add Bulgarian to the list of languages
...
Bulgarian is now at 100% for both riot-web and matrix-react-sdk.
It has also been tested by building it manually and verifying that it looks good.
2018-02-24 10:28:39 +02:00
e56b16f7d1
Add Catalan
2018-01-25 18:25:46 +01:00
bddab533a3
Merge pull request #5938 from osoitz/master
...
Corrected language name
2018-01-07 20:34:19 +00:00
5106809394
Update copy-res.js
...
Corrected Basque name
2018-01-07 20:39:24 +01:00
dff791d478
Add Slovak to included languages
2017-11-17 15:07:20 +00:00
9664b4d176
Add Slovak to included languages
2017-11-15 12:14:30 +00:00
f86b616769
status homepage
2017-10-26 01:38:07 +01:00
01b3d6128c
move status theme into a dedicated dir, and make fonts work
2017-10-22 17:03:39 +01:00
e39730d52e
Say which translation file failed ( #5196 )
...
So we can see which i18n file is invalid when it fails
2017-10-11 09:56:38 +01:00
133e17c1db
Merge remote-tracking branch 'origin/develop' into dbkr/add_finnish
2017-09-22 09:50:56 +01:00
1cca4c2133
Fix debug message to be clearer
2017-09-21 10:26:07 +01:00
b4ea938be3
This is the default
2017-09-20 18:17:06 +01:00
6ec26932af
This is the default anyway
2017-09-20 17:54:52 +01:00
21d233b5af
oops, leftover debug
2017-09-20 17:48:47 +01:00
b9b4ac3166
Rename symlink to 'include' & add to redeploy
...
Because redeploy.py already has a 'symlink' option that does
something else.
2017-09-20 17:22:47 +01:00
6ff91789b2
Rename 'config' option to 'symlink'
...
because that's really all it's doing and we can use it for other
things
2017-09-20 17:04:31 +01:00
be938ac0f4
Accept globs for the config location
...
and make the default config*.sjon so we'll automatically symlink
any config files in the current dir.
2017-09-20 14:38:41 +01:00
e4082d4f45
Support multiple configs on the command line
2017-09-20 14:25:33 +01:00
b2e1a2956f
Include Finnish translation
...
Which is 100% on riot-web and 40% on react-sdk which is probably
at a point where it can be useful.
2017-09-15 12:26:45 +01:00
7202556f45
Don't delete dist dir after putting stuff in it
2017-09-06 14:37:57 +01:00
e6d43f9d77
Edit electron build script fior signed win builds
...
Don't copy them to pub: let the signing process do that
2017-09-06 13:28:21 +01:00
4ff9131e61
Redeploy script: don't bail if bundle exists ( #4977 )
...
Just don't bother replacing that bundle. Continue redeploying the
rest as other assets (eg translation files) may have changed.
2017-09-05 13:54:51 +01:00
b55174e5e9
Fix plurals in translations
...
See https://github.com/matrix-org/matrix-react-sdk/pull/1358
Requires https://github.com/matrix-org/matrix-react-sdk/pull/1358
2017-09-04 17:18:27 +01:00
1f3f7af1e1
Revert accidental merge
2017-09-04 17:16:13 +01:00
1e203cade7
Fix plurals in translations
...
See https://github.com/matrix-org/matrix-react-sdk/pull/1358
Requires https://github.com/matrix-org/matrix-react-sdk/pull/1358
2017-09-04 17:14:41 +01:00
5db01373bb
Add i18n for Basque (eu), Latvian (lv), Telugu (te)
2017-08-16 11:15:48 +01:00
6cf671ad42
order languages in copy-res by iso code
2017-08-16 11:14:24 +01:00
c31f66aed5
Jenkins.sh: only fetch head of dependency branches
2017-08-08 09:50:49 +01:00
7b024751d1
fetch-develop-deps: avoid breaking js-sdk
...
do `npm i` in react-sdk *before* symlinking js-sdk, to avoid moving a load of
deps from js-sdk to react-sdk and hence breaking the build.
2017-08-08 09:50:49 +01:00
62579ed6b0
Add tracebacks to deploy exceptions
2017-07-20 11:25:19 +01:00
9864ce5bb2
Support multiple config.json symlinks in redeploy.py ( #4644 )
...
* Support multiple config.json symlinks in redeploy.py
* Review comments
2017-07-20 11:02:10 +01:00
eaf61526fb
add new languages
2017-06-18 23:50:27 +01:00
491d83b17f
Enable Korean Translations
...
As it's now at 64% on react-sdk and looking good
2017-06-16 13:05:56 +01:00
a62a9b9cd1
Use Thai string for Thai in Language-Chooser
2017-06-10 03:11:55 +02:00
a158549a4c
Merge pull request #4039 from vector-im/new-guest-access
...
New guest access
2017-06-07 13:40:00 +01:00
9c94f2ac14
Use bash magic instead of sed
2017-06-07 10:39:46 +01:00
b0486e333d
Chop off 'origin/'
...
when figuring out what branch we're on
2017-06-07 10:35:08 +01:00
13c780c7c5
add traditional chinese, thai, greek
2017-06-06 16:51:00 +01:00
e30fcdba4c
Merge branch 'develop' into new-guest-access
2017-06-06 11:39:47 +01:00
c610d21e68
enable en_US as a 1st class language
2017-06-05 16:05:07 +01:00
4225813523
Fix DeprecationWarning
...
the copy-res.js did throw "(node:8688) DeprecationWarning: Calling an asynchronous function without callback is deprecated." before
2017-06-04 12:36:14 +02:00
4b92bbe6f4
enable swedish, as it's got bigger than danish & dutch
2017-06-02 22:05:46 +01:00
81c0c7bd4f
Various tweaks to fetch-develop-deps
...
* tell git to checkout the right branch, rather than cloning and then changing.
* clone with depth 1 under travis, to save time.
* less pushd/popd, which print out confusing text - use `cd` in a subshell
instead. (and just avoid it where possible).
* add some markers to the output to let travis roll it up.
2017-06-01 18:18:46 +01:00
33cf39e9a0
Add language picker labels ( #4141 )
...
* fix after rebase
* add string to translate in messagecontextmenu
* add labels for language picker
2017-06-01 14:38:36 +01:00
cb33302f10
add spanish & dutch
2017-06-01 11:44:55 +01:00
89e5c4f8ae
Fix fetch-develop-deps.sh
...
This got broken by https://github.com/vector-im/riot-web/pull/4120 so that it
didn't work on a clean git clone.
2017-05-31 23:50:06 +01:00
0e742cec27
scripts/fetch-develop.deps.sh: set -e ( #4120 )
...
... so that when the git clone fails, it doesn't plough on regardless.
2017-05-31 15:37:30 +01:00
1f4f86b5f8
rework tom's welcome page to fit in slightly better with riot's UI/UX
...
* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit.
2017-05-30 03:58:45 +01:00
f085d2db39
make flags less muddy - fixes https://github.com/vector-im/riot-web/issues/3974
2017-05-29 00:10:08 +01:00
a92d96347b
Merge branch 'develop' into new-guest-access
2017-05-28 22:50:53 +01:00
22e5e2126b
rev-parse the commit from the deps
...
Because it's not added to package.json by npm anymore
2017-05-26 22:52:49 +01:00
96393f69b6
Remove old versions before linking react/js sdk
2017-05-26 22:37:44 +01:00
d3875ec794
Oops, include file extension in language list
2017-05-26 17:11:11 +01:00
6c3c4fc547
Language generation and file structure
...
* Move language files to strings/ subdir to be consistent with
react-sdk
* Only copy static list of languages (to avoid including
languages that are only a few percent translated)
* Make copy-res script work with watch mode
* Other general cleanups like only write each language file once,
rather than n times.
2017-05-26 16:48:21 +01:00
efb6316ba0
Implement default welcome page and allow custom URL /w config
...
counterpart to https://github.com/matrix-org/matrix-react-sdk/pull/922
2017-05-24 17:58:03 +01:00
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +01:00
d7f1e01cfa
Don't fail if reskindex symlink exists
2017-05-19 14:47:44 +01:00
50b46af943
Merge pull request #3945 from vector-im/dbkr/fetch_deps_script
...
Script to fetch corresponding branches of dependent projects
2017-05-19 13:14:07 +01:00
7d81ade563
genflags.sh should be run from root dir
2017-05-18 11:38:01 +01:00
bc5ad3c761
Move genflags.sh to scripts
2017-05-18 11:36:24 +01:00
e879fb0eef
Add square flag pngs /w genflags.sh script
...
This uses the github.com:googlei18n/region-flags and imagemagick to generate 27x27 flag pngs. The flags have a 1px #e0e0e0 border and transparent padding such that each flag is of the same height (17px including the border).
2017-05-18 11:25:42 +01:00
a9a4b1c44e
Get branch from various CI env vars
...
So we hopefully get the right branch for PRs from the same repo
(but not forks).
From @t3chguy's comment (tweaked a bit)
2017-05-18 11:05:19 +01:00
c929cb1337
Do I mean bash? Probably
2017-05-17 18:21:58 +01:00
18afbc5bec
Make dep install script work
2017-05-17 18:14:28 +01:00
60d33f50a7
Create node_modules if it doesn't exist
2017-05-17 16:19:19 +01:00
94ac4bf490
Use fetch dep script in jenkins script
2017-05-17 16:17:08 +01:00
fac8906102
Add script to fetch correct dep branches
...
Fetch branches of js-sdk and react-sdk that match the current
branch name, if they exist. This will mostly be used in the
automated tests.
2017-05-17 16:11:34 +01:00
cef26a5b20
fix #3894
2017-05-15 21:14:01 +01:00
ea0b166da7
change wording to not confuse users building repo
...
change default repos to match their current naming
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:49:31 +01:00
f248477f82
stage 0.5 rebrand (rename dist release)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:46:08 +01:00
0e0918d07c
Merge pull request #3888 from vector-im/pr/3799
...
move manifest.json outward so it is scoped properly
2017-05-11 13:20:33 +01:00
3c5594e034
move manifest.json outward so it is scoped properly
...
this will matter more when we add a service worker
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 13:12:26 +01:00
c607b1bc89
npm is "smart" enough to try and install our electron wrapper as a module
...
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-10 13:36:27 +01:00
640aa98cf4
Update 2 missed icons to the new icon
...
Electron icons for windows & Linux. Also add them to the script
that makes all the icon versions.
2017-05-08 13:05:17 +01:00
1e5908a31e
speed up burndown generation by ~250x
2017-05-07 19:34:16 +01:00
6013a3e71d
Merge pull request #3683 from t3chguy/t3chguy/electron_version_inconsistency
...
Remove leading v in /version file, for SemVer and to match Electron ver
2017-05-05 18:28:16 +01:00
7b320f8fbb
Remove babelcheck
...
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
2017-05-04 16:51:36 +01:00
61c338a233
remove leading v in /version file so its semver
...
and also then consistent with electron versioning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:32:27 +01:00
f010afe63f
Add emojione PNGs to the COPY_LIST
2017-04-21 17:36:48 +01:00
8707cca7bc
Remove rageshake server
...
This is now at https://github.com/matrix-org/rageshake
2017-04-04 16:29:12 +01:00
a0f572c26e
Don't hardcode home dir in jenkins script
2017-02-17 19:18:58 +00:00
5f678eb838
Review comments: change realm name
2017-02-08 10:36:39 +00:00
64eb1f08a9
rageshake: Add file server with basic auth
...
Set via environment variables on startup.
2017-02-08 09:59:41 +00:00
f16bb85f9b
Review comments
2017-02-07 16:04:06 +00:00
678eccf33d
Store bug reports in separate directories
2017-02-06 16:18:08 +00:00
db31f0a087
Host API under /api. Use filepath.Join rather than string concatenation
2017-02-06 15:31:53 +00:00
d4247e0179
Dump to bugs subdirectory
2017-02-06 14:56:06 +00:00
18ac71e8c0
Merge pull request #3072 from vector-im/kegan/rageshake-server
...
Bug report server script
2017-02-03 17:33:51 +00:00
541eb45e1a
Jenkins: use default olm
...
... to stop us making a release and realising we forgot to bump the olm version
in vector-web.
2017-02-03 15:06:03 +00:00
3404521d5d
Fix jenkins build
...
Do `npm install` on js-sdk rather than `npm run build`, which will hopefully
mean that `browserify` gets installed before we try to run it.
The README says we should use `npm install` for the react-sdk too, so let's do
that, and bring the travis and jenkins builds into sync with the README.
2017-02-01 16:11:11 +00:00
22bb0f9d30
UTC please
2017-01-26 12:17:47 +00:00
6a40ad8a20
Fail the request if we clash files
...
Rather than make the file names incredibly long (by adding ms),
just 500 it and expect the user to resend.
2017-01-26 11:57:56 +00:00
aae62ff94e
store logs
2017-01-26 11:44:07 +00:00
e8c51a0b54
gzip bug reports when storing on disk. Set max payload size
2017-01-26 11:28:38 +00:00
9d034c77a5
Initial rageshake server
2017-01-25 17:27:07 +00:00
4c3ea13413
Make jenkins run the linter
2017-01-23 15:42:50 +00:00
d1fbbf90c0
Verify PGP signatures on tarballs when deploying
2017-01-18 22:58:04 +00:00
5206410f21
Deployment script
...
Factor some bits out of redeploy.py, so that they can be used in a deployment
script suitable for riot.im/app.
2017-01-17 22:43:23 +00:00
8371006d90
Update redeploy script to keep old bundles
...
... so that people using old versions of the master chunk can still load other
webpack chunks.
2017-01-17 13:55:33 +00:00
70f48343ee
It's now just build
2017-01-11 19:03:52 +00:00
f17f103d12
s/build/compile/ for js sdk
2017-01-11 18:19:44 +00:00
10f0631487
Build the js-sdk in the CI script
...
now it's transpiled
2017-01-11 17:20:27 +00:00
6a1af891b7
Use a custom script to copy resources ( #2893 )
...
All of those cpx invocations were getting unwieldy, and I suspect the exotic
quoting needed to run them under parallelshell was breaking things on windows.
Replace the unwieldy cpx invocations with an unwieldy custom script.
2017-01-06 10:43:13 +00:00
c6c4aff8ae
Redeploy script: put each build in a separate directory ( #2790 )
...
* Redeploy script: put each build in a separate directory
Hopefully this will fix the problem whereby we can overwrite the live
deployment.
2016-12-22 12:02:54 +00:00
2740013625
RELEASES is for update, not install
2016-12-13 10:24:32 +00:00
c6dbeee245
ico needs to be at least 256x256
2016-12-09 22:33:20 +00:00
feb3a13a71
Get version after we've checked out...
2016-12-09 20:23:19 +00:00
6acbdc442d
Actually write latest version into `latest`
2016-12-09 18:29:54 +00:00
f0b0999f65
Numeracy
2016-12-08 18:04:44 +00:00
e55845ac52
Makeover!
...
Also add script for generating the PNGs and add pre-rendered PNGs
for the Linux electron build which means you don't need icns2png
to build it and the Linux icons are straight from the SVG rather
than resized bitmaps.
2016-12-08 16:22:34 +00:00
2b51cda6da
talk to jenkins via https for the /dev redeployer
2016-12-07 14:07:31 +00:00
987822bd5a
typo in cp destination
2016-12-05 17:27:30 +00:00
189c8aca79
Remove redundant line getting version
...
As there is no latest.yml now
2016-12-05 17:15:48 +00:00
72de35a2a1
Switch back to Squirrel installer
...
which it turns out is by far the lesser of two evils.
* Auto-update works with a proxy
* The update process is reasonably atomic & faster, rather than
running the uninstaller then the installer, leaving you with a
broken install if you shut down your machine at the wrong time
* Gets the update URL the same way as on mac, rather than baking
it into the app at build time from package.json. We don't want
it in package.json because only our builds want our update URL.
2016-12-05 14:08:27 +00:00
9f51e2c407
Auto-update & build process with NSIS for windows
...
Amalgamate the electron build packaging into one script.
Use update_base_url so we can compute the actual URL in the
script for windows (because we need to put it in the build) and
at runtime for mac os.
2016-12-01 19:33:42 +00:00
4073688ba6
Missed an x64
2016-11-25 20:07:12 +00:00
693867f074
Final bits to prepare electron distribtion:
...
* Remove the config: nobody else wants our update URL so we'll
keep it separately. Don't copy the config.
* Script to yell at you if you've build a package with auto
update turned off.
* s/vector/webapp/ when looking for config
* Use different update URLs for the various platforms
2016-11-25 19:57:08 +00:00
9ce2adceef
Include config.sample.json in dist tarball
...
Fixes https://github.com/vector-im/vector-web/issues/2607
2016-11-21 10:40:35 +00:00
b0c1097f86
Don't include two vector prefixes
2016-11-11 18:23:25 +00:00
6e47d2f1b5
It's '=' in sh, not '=='
2016-11-11 18:07:03 +00:00
8676481aab
dist now, not packages
2016-11-08 17:37:49 +00:00
1401de2e7d
Move the jenkins / redeploy scripts to scripts
...
While we're breaking things anyway
2016-11-08 17:09:44 +00:00
3b06563960
Fix jenkins script / redeployer
...
and make them re-use the package script rather than doing their
own thing
2016-11-08 17:08:01 +00:00
5b7f629996
Build to the 'webapp' directory instead
...
People may have config files in vector/ so it would be nonideal
if we started overwriting them / blowing them away.
2016-11-08 15:46:21 +00:00
f5d95f7314
Use an env var for the package version
...
Because supplying arguments to npm scripts is a bad idea: it just
appends the arguments blindly to whatever the command was. Thanks,
npm.
2016-11-04 09:40:24 +00:00
d04cc03c1c
Take version from first arg, if given
2016-11-02 11:38:11 +00:00
f17e851435
Rename the package script/output dir to 'dist'
...
To match conventions from other projects and match the release
script which expects releasde artefacts in dist/
2016-11-01 15:22:06 +00:00
f20b2593bc
move babelcheck.js to scripts/
2016-10-17 16:28:14 +01:00
ea09a25563
Revert "Switch to babel 6"
2016-10-14 18:50:22 +01:00
e6caf9ece4
move babelcheck.js to scripts/
2016-10-13 09:50:40 +01:00
4c9ade5ecb
Use cpx to copy olm.js, and add watcher
...
We are now using `cpx` to copy the emojione files, so we might as well use it
for olm.js, rather than rolling our own - particularly since that makes it easy
to add a watcher for `npm start`.
We have to add a `-L` to the `cpx` invocation, otherwise, if olm is a
symlink (as is useful for development), cpx ends up watching the symlink, which
obviously never changes.
2016-08-15 12:16:08 +01:00
8a2b2daad7
Revert "Unpin react-sdk and js-sdk"
...
I messed this up and removed staticfiles.js by accident
This reverts commit 21334cab28
2016-08-15 12:13:58 +01:00
21334cab28
Unpin react-sdk and js-sdk
2016-08-15 12:11:35 +01:00
David Baker