Commit graph

6513 commits

Author SHA1 Message Date
Weblate
4d02d28aef Merge remote-tracking branch 'origin/develop' into develop 2018-04-27 12:39:38 +00:00
Luke Barnard
cb061d80fa
Merge pull request #6624 from vector-im/dbkr/update_hoek
Update hoek
2018-04-27 13:39:33 +01:00
Luke Barnard
9b055171ab Enforce loading babel-polyfill first
This is to avoid loading anything before loading the polyfill, otherwise
we risk loading dependencies (such as React) before it.

This was causing the compatibility page to fail somehow.

See https://github.com/facebook/react/issues/8379

Fixes https://github.com/vector-im/riot-web/issues/6562
2018-04-27 13:32:09 +01:00
David Baker
3df214c56e Update hoek 2018-04-27 12:57:37 +01:00
MTRNord
d69084f31e
Fix builld:dev build by using raw-loader instead css-raw-loader 2018-04-27 12:02:00 +02:00
MTRNord
02a185f2fe
Update Webpack to version 4 2018-04-27 11:32:59 +02:00
Марко М. Костић
53f44c5459 Translated using Weblate (Serbian)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
2018-04-26 17:01:56 +00:00
David Baker
137665685d v0.14.2-rc.3 2018-04-26 15:38:18 +01:00
David Baker
3d1c2fa5f1 Prepare changelog for v0.14.2-rc.3 2018-04-26 15:38:17 +01:00
David Baker
6dad8e695e v0.14.2-rc.3 2018-04-26 15:35:51 +01:00
David Baker
1eb82d97ae Fix dependencies to the same versions as react-sdk
Otherwise Things Get Weird, eg. headers in the left panel end up in
the wrong place because the gemini scrollbar CSS has changed
between versions.
2018-04-26 15:25:20 +01:00
Weblate
a17a9521b4 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 12:06:41 +00:00
Luke Barnard
2dc1c5c618
Merge pull request #6614 from vector-im/dbkr/fix_release_wrapper
Fix args in the release wrapper script
2018-04-26 13:06:34 +01:00
David Baker
d5a07a446d typo 2018-04-26 12:55:12 +01:00
David Baker
7232c01a80 Fix args in the release wrapper script
It was assuming the version was always $1 which meant there was no
way to pass options (eg. -x to skip changelog generation) through
to the underlying release script without breaking the wrapper
script.
2018-04-26 12:07:02 +01:00
David Baker
b8f7025f2a v0.14.2-rc.2 2018-04-26 11:46:38 +01:00
David Baker
73e4fcafdc v0.14.2-rc.2 2018-04-26 11:44:36 +01:00
David Baker
45661dd960 changelog 2018-04-26 11:37:49 +01:00
David Baker
18ba570c74 Bump react-sdk version 2018-04-26 11:33:44 +01:00
David Baker
5923417654 v0.14.2-rc.1 2018-04-25 17:39:56 +01:00
David Baker
8b99a72f2c v0.14.2-rc.1 2018-04-25 17:37:35 +01:00
David Baker
981bd94615 Change CSS dependencies to not hardcoded paths
Add add direct dependencies on the packages they come from, because
referring to them by path like this doesn't work in a frash
checkout / npm install because of how npm lays out the packages.
2018-04-25 17:33:18 +01:00
David Baker
083dd4eeec Temporarily revert electron version bump 2018-04-25 16:36:16 +01:00
David Baker
8d4d16bde1 Bump react-sdk version 2018-04-25 16:35:13 +01:00
David Baker
8e218f12b4 Prepare changelog for v0.14.2-rc.1 2018-04-25 15:42:38 +01:00
David Baker
3dcf194960 v0.14.2-rc.1 2018-04-25 15:41:33 +01:00
David Baker
ee9f781adc js-sdk & react-sdk RCs 2018-04-25 15:37:24 +01:00
Weblate
e5eb617447 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 14:17:38 +00:00
David Baker
864057e8ee
Merge pull request #6602 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-04-25 15:17:32 +01:00
Weblate
cb51ad929e Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 14:00:54 +00:00
David Baker
83c20f5d5d Bump electron version to 1.8.4 2018-04-25 15:00:39 +01:00
Weblate
ff93ace4cc Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 10:22:00 +00:00
Ivan Shapovalov
ae3158ff00 Translated using Weblate (Russian)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/

я думаю, сленговое "релиз" даже более знакомо и читабельно, чем "выпуск"
2018-04-25 10:21:59 +00:00
David Baker
3bec9c5eb4
Merge pull request #6600 from vector-im/dbkr/readme_cross_origin_rendeer
Add readme bit on cross-origin renderer
2018-04-25 11:21:54 +01:00
David Baker
964a3bc35b Add readme bit on cross-origin renderer 2018-04-25 11:10:46 +01:00
Ivan Shapovalov
ed51a8794d Translated using Weblate (Russian)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2018-04-24 09:44:13 +00:00
Weblate
b8556671c5 Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 08:43:10 +00:00
Matthew Hodgson
6b2c8539a3
Merge pull request #6573 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-04-24 09:43:03 +01:00
Weblate
e165c42377 Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 17:12:39 +00:00
Matthew Hodgson
845bb3fa09
Merge pull request #6588 from vector-im/dbkr/fix_media_2
Copy media from react-sdk
2018-04-23 18:12:34 +01:00
David Baker
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
Weblate
e4837af72e Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 10:50:43 +00:00
David Baker
82f51fb476
Merge pull request #6580 from vector-im/dbkr/fix_favicon_2
Fix favicon
2018-04-23 11:50:38 +01:00
David Baker
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
Osoitz
c94d5c1a9a Translated using Weblate (Basque)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
2018-04-23 04:14:14 +00:00
Megumin
9eb449484e Translated using Weblate (Icelandic)
Currently translated at 67.5% (25 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/
2018-04-21 19:28:44 +00:00
RainSlide
5aed7a375d Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2018-04-21 19:28:44 +00:00
Kévin C
aa82513c7e Translated using Weblate (French)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2018-04-21 13:08:51 +00:00
Ralitsa Bozhkova
4107c64ac2 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2018-04-21 11:38:25 +00:00
Aidan Gauland
a8e578f5b8 Move and reword note about out-of-date dev setup
Replace an inline, parenthetical note about possible failures of the `npm run`
scripts with additional items in the Requirements section.
2018-04-21 21:52:56 +12:00