OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
12,539 Commits
217 Branches
561 Tags
467 MiB
Commit Graph

311 Commits (9860f4befcf08ae76e5bc559bf144b70184ccda1)

Author SHA1 Message Date
Richard van der Hoff c31f66aed5 Jenkins.sh: only fetch head of dependency branches 2017-08-08 09:50:49 +01:00
Richard van der Hoff 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
Kegan Dougal 62579ed6b0 Add tracebacks to deploy exceptions 2017-07-20 11:25:19 +01:00
Kegsay 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
Matthew Hodgson eaf61526fb add new languages 2017-06-18 23:50:27 +01:00
David Baker 491d83b17f Enable Korean Translations 
As it's now at 64% on react-sdk and looking good
 2017-06-16 13:05:56 +01:00
krombel a62a9b9cd1 Use Thai string for Thai in Language-Chooser 2017-06-10 03:11:55 +02:00
Luke Barnard a158549a4c Merge pull request #4039 from vector-im/new-guest-access 
New guest access
 2017-06-07 13:40:00 +01:00
David Baker 9c94f2ac14 Use bash magic instead of sed 2017-06-07 10:39:46 +01:00
David Baker b0486e333d Chop off 'origin/' 
when figuring out what branch we're on
 2017-06-07 10:35:08 +01:00
Matthew Hodgson 13c780c7c5 add traditional chinese, thai, greek 2017-06-06 16:51:00 +01:00
David Baker e30fcdba4c Merge branch 'develop' into new-guest-access 2017-06-06 11:39:47 +01:00
Matthew Hodgson c610d21e68 enable en_US as a 1st class language 2017-06-05 16:05:07 +01:00
Marcel 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
Matthew Hodgson 4b92bbe6f4 enable swedish, as it's got bigger than danish & dutch 2017-06-02 22:05:46 +01:00
Richard van der Hoff 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
dtygel 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
Matthew Hodgson cb33302f10 add spanish & dutch 2017-06-01 11:44:55 +01:00
Richard van der Hoff 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
Richard van der Hoff 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
Matthew Hodgson 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
Matthew Hodgson f085d2db39 make flags less muddy - fixes https://github.com/vector-im/riot-web/issues/3974 2017-05-29 00:10:08 +01:00
Matthew Hodgson a92d96347b Merge branch 'develop' into new-guest-access 2017-05-28 22:50:53 +01:00
David Baker 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
David Baker 96393f69b6 Remove old versions before linking react/js sdk 2017-05-26 22:37:44 +01:00
David Baker d3875ec794 Oops, include file extension in language list 2017-05-26 17:11:11 +01:00
David Baker 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
Luke Barnard 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
David Baker 6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
David Baker d7f1e01cfa Don't fail if reskindex symlink exists 2017-05-19 14:47:44 +01:00
David Baker 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
Luke Barnard 7d81ade563 genflags.sh should be run from root dir 2017-05-18 11:38:01 +01:00
Luke Barnard bc5ad3c761 Move genflags.sh to scripts 2017-05-18 11:36:24 +01:00
Luke Barnard 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
David Baker 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
David Baker c929cb1337 Do I mean bash? Probably 2017-05-17 18:21:58 +01:00
David Baker 18afbc5bec Make dep install script work 2017-05-17 18:14:28 +01:00
David Baker 60d33f50a7 Create node_modules if it doesn't exist 2017-05-17 16:19:19 +01:00
David Baker 94ac4bf490 Use fetch dep script in jenkins script 2017-05-17 16:17:08 +01:00
David Baker 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
Michael Telatynski cef26a5b20 fix #3894 2017-05-15 21:14:01 +01:00
Michael Telatynski 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
Michael Telatynski f248477f82 stage 0.5 rebrand (rename dist release) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:46:08 +01:00
Luke Barnard 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
Michael Telatynski 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
Michael Telatynski 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
David Baker 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
Matthew Hodgson 1e5908a31e speed up burndown generation by ~250x 2017-05-07 19:34:16 +01:00
David Baker 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
David Baker 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
Michael Telatynski 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
Luke Barnard f010afe63f Add emojione PNGs to the COPY_LIST 2017-04-21 17:36:48 +01:00
Richard van der Hoff 8707cca7bc Remove rageshake server 
This is now at https://github.com/matrix-org/rageshake
 2017-04-04 16:29:12 +01:00
David Baker a0f572c26e Don't hardcode home dir in jenkins script 2017-02-17 19:18:58 +00:00
Kegan Dougal 5f678eb838 Review comments: change realm name 2017-02-08 10:36:39 +00:00
Kegan Dougal 64eb1f08a9 rageshake: Add file server with basic auth 
Set via environment variables on startup.
 2017-02-08 09:59:41 +00:00
Kegan Dougal f16bb85f9b Review comments 2017-02-07 16:04:06 +00:00
Kegan Dougal 678eccf33d Store bug reports in separate directories 2017-02-06 16:18:08 +00:00
Kegan Dougal db31f0a087 Host API under /api. Use filepath.Join rather than string concatenation 2017-02-06 15:31:53 +00:00
Kegan Dougal d4247e0179 Dump to bugs subdirectory 2017-02-06 14:56:06 +00:00
Kegsay 18ac71e8c0 Merge pull request #3072 from vector-im/kegan/rageshake-server 
Bug report server script
 2017-02-03 17:33:51 +00:00
Richard van der Hoff 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
Richard van der Hoff 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
Kegan Dougal 22bb0f9d30 UTC please 2017-01-26 12:17:47 +00:00
Kegan Dougal 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
Kegan Dougal aae62ff94e store logs 2017-01-26 11:44:07 +00:00
Kegan Dougal e8c51a0b54 gzip bug reports when storing on disk. Set max payload size 2017-01-26 11:28:38 +00:00
Kegan Dougal 9d034c77a5 Initial rageshake server 2017-01-25 17:27:07 +00:00
David Baker 4c3ea13413 Make jenkins run the linter 2017-01-23 15:42:50 +00:00
Richard van der Hoff d1fbbf90c0 Verify PGP signatures on tarballs when deploying 2017-01-18 22:58:04 +00:00
Richard van der Hoff 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
Richard van der Hoff 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
David Baker 70f48343ee It's now just build 2017-01-11 19:03:52 +00:00
David Baker f17f103d12 s/build/compile/ for js sdk 2017-01-11 18:19:44 +00:00
David Baker 10f0631487 Build the js-sdk in the CI script 
now it's transpiled
 2017-01-11 17:20:27 +00:00
Richard van der Hoff 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
Richard van der Hoff 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
David Baker 2740013625 RELEASES is for update, not install 2016-12-13 10:24:32 +00:00
David Baker c6dbeee245 ico needs to be at least 256x256 2016-12-09 22:33:20 +00:00
David Baker feb3a13a71 Get version after we've checked out... 2016-12-09 20:23:19 +00:00
David Baker 6acbdc442d Actually write latest version into `latest` 2016-12-09 18:29:54 +00:00
David Baker f0b0999f65 Numeracy 2016-12-08 18:04:44 +00:00
David Baker 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
Matthew Hodgson 2b51cda6da talk to jenkins via https for the /dev redeployer 2016-12-07 14:07:31 +00:00
David Baker 987822bd5a typo in cp destination 2016-12-05 17:27:30 +00:00
David Baker 189c8aca79 Remove redundant line getting version 
As there is no latest.yml now
 2016-12-05 17:15:48 +00:00
David Baker 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
David Baker 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
David Baker 4073688ba6 Missed an x64 2016-11-25 20:07:12 +00:00
David Baker 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
Richard van der Hoff 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
David Baker b0c1097f86 Don't include two vector prefixes 2016-11-11 18:23:25 +00:00
David Baker 6e47d2f1b5 It's '=' in sh, not '==' 2016-11-11 18:07:03 +00:00
David Baker 8676481aab dist now, not packages 2016-11-08 17:37:49 +00:00
David Baker 1401de2e7d Move the jenkins / redeploy scripts to scripts 
While we're breaking things anyway
 2016-11-08 17:09:44 +00:00
David Baker 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
David Baker 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
David Baker 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
David Baker d04cc03c1c Take version from first arg, if given 2016-11-02 11:38:11 +00:00
David Baker 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
David Baker f20b2593bc move babelcheck.js to scripts/ 2016-10-17 16:28:14 +01:00
David Baker ea09a25563 Revert "Switch to babel 6" 2016-10-14 18:50:22 +01:00
David Baker e6caf9ece4 move babelcheck.js to scripts/ 2016-10-13 09:50:40 +01:00
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff 21334cab28 Unpin react-sdk and js-sdk 2016-08-15 12:11:35 +01:00
Richard van der Hoff 51b74251f9 Exclude olm from the webpack 
Olm takes *ages* to webpack, and it doesn't compress well. So, serve it as a
separate asset to the browser.
 2016-08-02 12:44:23 +01:00
Matthew Hodgson 28b9892486 burndown generator 2016-03-30 21:25:18 +01:00
Matthew Hodgson 212a070a02 add a github issues graphing script 2016-03-30 01:23:44 +01:00
David Baker fa322e8488 Auto-create a sensible version file. Copy the vector dir so we can put it in there rather than creating files in the main vector dir. 2016-02-24 18:59:33 +00:00
David Baker 874123bbfa Move package script out and make it tar into a versioned top level directory. It may as well be a shell script since it's unix specific anyway, and maintaining it inside package.json is now impractical. 2016-02-24 18:41:30 +00:00