mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2026-03-03 04:22:31 +01:00
Code Issues Projects Releases Wiki Activity
64,990 Commits 203 Branches 635 Tags
Commit Graph

573 Commits

Author SHA1 Message Date
David Baker
12a56e37ba Don't copy the 32 bit linux deb 
As per comment
 2019-03-07 11:12:43 +00:00
David Baker
7b684aee0c Also makes this unnecessary 2019-03-06 16:48:58 +00:00
David Baker
8543c7b9ff Merge branch 'release-v1.0.2' 2019-03-06 11:36:41 +00:00
David Baker
1e7af106b0 Merge branch 'master' into develop 2019-03-06 11:28:54 +00:00
David Baker
53e25ff247 Set a resuire alias for the webapp directory 
So languagehandler can pull the languages json from there
 2019-03-01 11:32:37 +00:00
David Baker
63c6f600bf Use webpack alias to resolve the languages file 
Hopefully this will end up simpler than having to figure out in
riot-web what the relative path is from react-sdk's
src/languageHandler.js to riot-web's webapp directory.
 2019-03-01 11:30:50 +00:00
Bruno Windels
712522a16d set chrome path for travis CI explicitly 
karma seems to be giving priority to a location where an old version is installed.
 2019-02-28 12:45:43 +01:00
J. Ryan Stinnett
09b17f77c2 Fix language file path for Jenkins 
Jenkins seems to use a different layout of the repos than other environments.
The sub-projects are cloned inside of the `riot-web` workspace. To account for
this, we need to adjust the Riot language file path.
 2019-02-21 12:31:45 +00:00
Bruno Windels
e56206241b use same hash format as webpack defaults 2019-02-20 09:39:27 +01:00
Richard van der Hoff
d4e1f1af7a
Fix cleanup script not to remove extracted/bundles directories (#8764) 2019-02-18 17:05:48 +00:00
Bruno Windels
6bf8269bcd riot-web is a subdirectory when running the tests 2019-02-18 17:26:09 +01:00
Bruno Windels
878190ba27 add content hash to individual language files 2019-02-18 16:11:41 +01:00
Matthew Hodgson
20dc7068af
Merge pull request #8550 from abeluck/develop 
Make scripts/make-icons.sh work on linux
 2019-02-15 12:28:58 +00:00
J. Ryan Stinnett
674b8c3561 Merge branch 'release-v1.0.0' 2019-02-14 17:11:09 +00:00
J. Ryan Stinnett
4872992ba2 Make arch specific directories 2019-02-14 13:13:53 +00:00
J. Ryan Stinnett
2b069fce75 Copy unsigned builds to separate dirs 2019-02-14 13:05:49 +00:00
J. Ryan Stinnett
0f4757c289 Fix up packaging directories for Windows 2019-02-14 12:54:26 +00:00
Abel Luck
d395fdcc6a
Make scripts/make-icons.sh work on linux 
This commit detects if the macos-only utility `iconutil` is available in
the PATH, if it is, then the icns is built as usual. However if it
isn't (such as on a linux system), then it checks for `png2icns` and
uses it if possible.

Signed-off-by: Abel Luck <abel@guardianproject.info>
 2019-02-13 11:59:36 +01:00
J. Ryan Stinnett
7b9de1dbf2 Remove Status theme 2019-02-13 10:47:51 +00:00
J. Ryan Stinnett
dd51cccd7c Move home to welcome, remove unused images 2019-02-07 17:10:38 +00:00
vectorwebexp@ares
c421c0b1bf cleanup script for the deployment dir 
-- richvdh
 2019-02-02 22:43:43 +00:00
David Baker
03de7f9901 Cache-bust olm.wasm 
In the same way as we now do images/fonts
 2019-01-28 14:09:28 +00:00
David Baker
a28691f14d Add returns to fetch-develop-deps 
These look necessary for https://github.com/vector-im/riot-web/pull/8225
to work - the build is failing on jenkins
 2019-01-23 11:40:21 +00:00
J. Ryan Stinnett
cf150fc575 Try fetching more branches for PRs 
Attempt both the PR author's branch and the PR's target branch. This resolves
issues on experimental where we need matrix-react-sdk to also be experimental.
 2019-01-22 21:28:09 -06:00
J. Ryan Stinnett
49be03e845 Process images with Webpack 
This adds a `file-loader` rule to the Webpack build so that any requests for
image resource will be output into the app's output directory, but with an extra
content has appended so that we can safely use a long cache lifetime.

The CSS and SCSS rules are also changed to use `css-loader` so that any `url`
inside is automatically processed by the new image rule above.
 2019-01-18 08:39:09 -06:00
Bruno Windels
19190deb3c set x perms 2019-01-09 15:20:55 +01:00
Bruno Windels
45558f5323 run both react-sdk and riot-web tests 2019-01-09 15:16:20 +01:00
Bruno Windels
509ae4cea4 run unit tests on riot-web like before 2019-01-09 15:02:20 +01:00
Bruno Windels
419726f423 set executable perms 2019-01-09 14:43:05 +01:00
Bruno Windels
481cd292ad make e2e tests job conditional at travis.yml level 2019-01-09 14:36:32 +01:00
Bruno Windels
5ce08523f8 split up script for unit and end-to-end tests so unit tests are not run as part of e2e tests 2019-01-09 14:21:45 +01:00
Erik Johnston
ab468b5346 Refactor travis-ci to use parallel jobs 2019-01-08 11:33:12 +00:00
Travis Ralston
8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real 2019-01-03 16:00:23 -07:00
David Baker
f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" 
This reverts commit ad47144355e221e9a430f09dcba0b9c6d99a74a8.
 2019-01-03 15:37:03 -07:00
David Baker
7d161de35b Partial merge of develop to experimental 
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
 2019-01-03 15:02:58 +00:00
J. Ryan Stinnett
135a0884c9
Update scripts/fetchdep.sh 
Co-Authored-By: turt2live <travpc@gmail.com>
 2018-12-28 19:42:13 -07:00
Travis Ralston
310f634a0d Ensure we install the master branch of the e2e tests as a default 2018-12-21 19:24:07 -07:00
J. Ryan Stinnett
7affd5fcff Try fetching more branches for PRs 
Attempt both the PR author's branch and the PR's target branch. This resolves
issues on experimental where we need riot-web to also be experimental.
 2018-12-20 22:58:09 +00:00
Travis Ralston
a2b825ba92 Sort translations by file name 
This keeps the strings close together and roughly in the same area as the others, and makes it easier to maintain the translation file.
 2018-12-05 11:52:10 -07:00
David Baker
8298e73205 Argh, npm, why are you so awful? 2018-11-21 19:25:11 +00:00
David Baker
d2c87a0331 Fix jenkins build 2018-11-21 19:13:42 +00:00
David Baker
7df77d7e5d Recent node please 2018-11-21 19:00:11 +00:00
Aaron Raimist
2f991d190f
Add Japanese (#7599) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-11-08 13:31:09 -06:00
David Baker
9b80aa76ce
Merge pull request #7385 from vector-im/dbkr/wasm 
Support WebAssembly version of Olm
 2018-10-25 15:58:24 +01:00
David Baker
de7d3ba701 Change electron build script paths 
Because electron builder has decided to output the mac assets to
somewhere else today.
 2018-10-16 10:26:04 +01:00
David Baker
c5ee92f4c3 Fall back to legacy asm.js Olm 2018-10-04 20:11:34 +01:00
David Baker
30f0a7932b Merge remote-tracking branch 'origin/develop' into dbkr/wasm 2018-10-02 16:58:31 +01:00
Travis Ralston
fb262596b2 Provide more helpful errors when i18n generation fails 
Also fix TextForEvent.js so it doesn't break the script. Using a variable here is not recognized, so the object has been moved inline instead.
 2018-09-27 11:55:57 -06:00
David Baker
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
Travis Ralston
4041f3db5c Send standard output/input from npm-sub.js to the parent proc 2018-09-25 15:54:38 -06:00