Commit graph

129 commits

Author SHA1 Message Date
David Baker
133e17c1db Merge remote-tracking branch 'origin/develop' into dbkr/add_finnish 2017-09-22 09:50:56 +01:00
David Baker
1cca4c2133 Fix debug message to be clearer 2017-09-21 10:26:07 +01:00
David Baker
b4ea938be3 This is the default 2017-09-20 18:17:06 +01:00
David Baker
6ec26932af This is the default anyway 2017-09-20 17:54:52 +01:00
David Baker
21d233b5af oops, leftover debug 2017-09-20 17:48:47 +01:00
David Baker
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
David Baker
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
David Baker
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
David Baker
e4082d4f45 Support multiple configs on the command line 2017-09-20 14:25:33 +01:00
David Baker
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
David Baker
7202556f45 Don't delete dist dir after putting stuff in it 2017-09-06 14:37:57 +01:00
David Baker
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
David Baker
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
David Baker
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
David Baker
1f3f7af1e1 Revert accidental merge 2017-09-04 17:16:13 +01:00
David Baker
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
Luke Barnard
5db01373bb Add i18n for Basque (eu), Latvian (lv), Telugu (te) 2017-08-16 11:15:48 +01:00
Luke Barnard
6cf671ad42 order languages in copy-res by iso code 2017-08-16 11:14:24 +01:00
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