Commit graph

6631 commits

Author SHA1 Message Date
David Baker
8996b6b429 Merge branch 'master' into develop 2018-11-22 17:06:25 +00:00
David Baker
d483fb0605 v0.17.7 2018-11-22 16:58:48 +00:00
David Baker
c2ec5f39ab Prepare changelog for v0.17.7 2018-11-22 16:58:48 +00:00
David Baker
58f927538f v0.17.7 2018-11-22 16:56:41 +00:00
David Baker
d9434c7af5 Bump js-sdk & react-sdk 2018-11-22 16:56:13 +00:00
David Baker
6f54ff9e7f Fix missing js-sdk logging
Some of the js-sdk logging was going missing due to js-sdk's
loglevel library being initialised before the rageshake logging.

Fix by doing the rageshake setup within an import, as commented.
2018-11-22 16:43:15 +00:00
David Baker
4805858ecb
Merge pull request #7736 from vector-im/dbkr/fix_missing_logging
Fix missing js-sdk logging
2018-11-22 16:32:39 +00:00
David Baker
092ae7ef2f Fix missing js-sdk logging
Some of the js-sdk logging was going missing due to js-sdk's
loglevel library being initialised before the rageshake logging.

Fix by doing the rageshake setup within an import, as commented.
2018-11-22 16:21:55 +00: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
David Baker
81c75eb14b Merge branch 'master' into develop 2018-11-19 15:30:01 +00:00
David Baker
e604dfe9e8 v0.17.6 2018-11-19 15:24:34 +00:00
David Baker
135a5d38ff Prepare changelog for v0.17.6 2018-11-19 15:24:33 +00:00
David Baker
07ed2e8d0a v0.17.6 2018-11-19 15:23:08 +00:00
David Baker
2a594414e7 released js-sdk / react-sdk 2018-11-19 15:21:12 +00:00
Travis Ralston
6d1640194e
Merge pull request #7710 from vector-im/travis/terms-auth-improvements
Add $accent-color-50pct as a CSS variable to the Status theme
2018-11-16 12:36:32 -07:00
Travis Ralston
c338e491fe Add $accent-color-50pct as a CSS variable to the Status theme 2018-11-15 20:21:20 -07:00
David Baker
a570ee53a8 v0.17.6-rc.2 2018-11-15 15:40:54 +00:00
David Baker
417a31f1fe Prepare changelog for v0.17.6-rc.2 2018-11-15 15:40:53 +00:00
David Baker
a4a6f070e4 v0.17.6-rc.2 2018-11-15 15:38:42 +00:00
David Baker
d287abcd68 Update js-sdk to 0.14 & react-sdk to rc.2
rc.1 used js-sdk 0.13 which did not use the new Olm API.
2018-11-15 15:37:20 +00:00
David Baker
79fd38a899 v0.17.6-rc.1 2018-11-15 12:23:06 +00:00
David Baker
0aa0773ef7 Prepare changelog for v0.17.6-rc.1 2018-11-15 12:23:05 +00:00
David Baker
154e8bdb50 v0.17.6-rc.1 2018-11-15 12:21:16 +00:00
David Baker
8f37c22917 releaesed js-sdk & react-sdk rc.1 2018-11-15 12:20:42 +00:00
David Baker
0aeef3187a
Merge pull request #7708 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-11-15 12:13:47 +00:00
Weblate
8903eebe17 Merge remote-tracking branch 'origin/develop' into develop 2018-11-13 19:02:46 +00:00
David Baker
cc4d0af713 Merge branch 'master' into develop 2018-11-13 19:02:34 +00:00
David Baker
4a217d9e9f v0.17.5 2018-11-13 18:54:25 +00:00
David Baker
122caf7a95 Prepare changelog for v0.17.5 2018-11-13 18:54:25 +00:00
David Baker
a1e5c72eb9 v0.17.5 2018-11-13 18:52:59 +00:00
David Baker
7dd163ac85 bump react-sdk 2018-11-13 18:52:16 +00:00
Weblate
01432d3848 Merge remote-tracking branch 'origin/develop' into develop 2018-11-13 18:19:27 +00:00
toriko
d3cae13552 Translated using Weblate (Japanese)
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/ja/
2018-11-13 18:19:26 +00:00
David Baker
061838bdab Merge branch 'master' into develop 2018-11-13 18:19:10 +00:00
David Baker
24846a1d64 v0.17.4 2018-11-13 18:11:12 +00:00
David Baker
0b31d32793 Prepare changelog for v0.17.4 2018-11-13 18:11:12 +00:00
David Baker
71403980cc v0.17.4 2018-11-13 18:09:48 +00:00
David Baker
f8ab754af4 bump react-sdk 2018-11-13 18:09:10 +00:00
Weblate
fd3ed9e119 Merge remote-tracking branch 'origin/develop' into develop 2018-11-09 10:53:49 +00:00
David Baker
b53c86c5f4
Merge pull request #7673 from aaronraimist/add-japanese
Add Japanese (#7599)
2018-11-09 10:53:43 +00:00
Weblate
cbe6d31ee3 Merge remote-tracking branch 'origin/develop' into develop 2018-11-08 21:37:30 +00:00
Travis Ralston
5810221181
Merge pull request #7674 from jryans/webpack-bind-all
Allow Webpack dev server to listen to all interfaces
2018-11-08 14:37:24 -07:00
J. Ryan Stinnett
e9f4594eb9 Allow Webpack dev server to listen to all interfaces
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-11-08 20:55:51 +01:00
Aaron Raimist
2f991d190f
Add Japanese (#7599)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-11-08 13:31:09 -06:00
Victor Grousset
ae90b9877a Translated using Weblate (Esperanto)
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/eo/
2018-11-06 12:22:01 +00:00
Weblate
786c2a1fd7 Merge remote-tracking branch 'origin/develop' into develop 2018-11-02 15:39:21 +00:00
Travis Ralston
eef4f7c4cf
Merge pull request #7637 from vector-im/travis/cleanup-request
Remove the request-only stuff we don't need anymore
2018-11-02 09:39:15 -06:00
Travis Ralston
36cc5de0e7 Remove the request-only stuff we don't need anymore
This was introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2250 but can be pulled out due to https://github.com/matrix-org/matrix-js-sdk/pull/770. See https://github.com/vector-im/riot-web/issues/7634 for more information about the future.
2018-10-31 13:05:36 -06:00