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