Commit graph

6516 commits

Author SHA1 Message Date
Bruno Windels
4d3df8b86b
Merge pull request #7454 from vector-im/dbkr/double_closing_tags
Fix double-closed tags
2018-10-04 13:45:14 +02:00
David Baker
a356264801 Fix double-closed tags 2018-10-04 10:49:28 +01:00
Weblate
d32dbb6d10 Merge remote-tracking branch 'origin/develop' into develop 2018-10-03 04:53:45 +00:00
IMIN
70319e4939 Translated using Weblate (Korean)
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/ko/
2018-10-03 04:53:44 +00:00
Travis Ralston
92b2980b41
Merge pull request #7435 from aaronraimist/patch-1
Document how to turn off Piwik and bug reports (#6738)
2018-10-02 22:53:40 -06:00
Aaron Raimist
eabcc9261d
Add text saying that bug reports aren't automatic
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-02 22:58:49 -05:00
Marcel
ad5be455bb
Fix reskindex on matrix-react-side not being called if using build script 2018-10-03 02:00:35 +02:00
IMIN
20ce990763 Translated using Weblate (Korean)
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/ko/
2018-10-02 17:45:43 +00:00
Weblate
33d248d1e4 Merge remote-tracking branch 'origin/develop' into develop 2018-10-02 11:13:09 +00:00
David Baker
f69869ac1e
Merge pull request #7429 from vector-im/bwindels/alsocommitlockfile
also commit the lock file when bumping version as it is now committed to the repo
2018-10-02 12:13:04 +01:00
Aaron Raimist
d256194255
Document how to turn off Piwik and bug reports (#6738) 2018-10-01 20:21:13 -05:00
Bruno Windels
4de63e612d also commit the lock file when bumping version as it is now committed to the repo 2018-10-01 17:18:31 +02:00
Weblate
7f50acd886 Merge remote-tracking branch 'origin/develop' into develop 2018-10-01 15:04:22 +00:00
giqtaqisi
18f8ea8519 Translated using Weblate (Lojban)
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/jbo/
2018-10-01 15:04:21 +00:00
Bruno Windels
0a4e3379f9 Merge branch 'master' into develop 2018-10-01 17:03:54 +02:00
Bruno Windels
e355753900 also update package-lock file 2018-10-01 17:01:07 +02:00
Bruno Windels
712d020dfa v0.16.5 2018-10-01 16:51:39 +02:00
Bruno Windels
5fc53f19f4 Prepare changelog for v0.16.5 2018-10-01 16:51:39 +02:00
Bruno Windels
957fde964b v0.16.5 2018-10-01 16:48:52 +02:00
Bruno Windels
b9688acdf5 bump both SDKs to latest version 2018-10-01 16:16:25 +02:00
David Baker
2a8c7b260a Don't show mobile guide if deep linking
Other part of https://github.com/vector-im/riot-web/issues/7378
2018-10-01 15:14:40 +02:00
David Baker
a2c7ef5424 Don't show custom server bit on matrix.org
On mobile guide

Part of https://github.com/vector-im/riot-web/issues/7378
2018-10-01 15:14:18 +02:00
giqtaqisi
a1a417329c Translated using Weblate (Lojban)
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/jbo/
2018-10-01 13:12:29 +00:00
Weblate
1f81ed306d Merge remote-tracking branch 'origin/develop' into develop 2018-10-01 08:41:20 +00:00
giqtaqisi
2d78bc95ec Translated using Weblate (Lojban)
Currently translated at 62.1% (23 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/jbo/
2018-10-01 08:41:19 +00:00
Silvano
4f720e9c3b Translated using Weblate (Italian)
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/it/
2018-10-01 08:41:19 +00:00
Ryu SASAOKA
0374c91ee7 Translated using Weblate (English (United States))
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/en_US/
2018-10-01 08:41:19 +00:00
David Baker
894ad32e83
Merge pull request #7393 from vector-im/dbkr/update_deps_2
Update a bunch of deps
2018-10-01 09:41:14 +01:00
giqtaqisi
f3ee639dcc Added translation using Weblate (Lojban) 2018-09-30 14:30:15 +00:00
toriko
74a2b5a958 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-09-30 09:58:26 +00:00
Bruno Windels
4e4906605b
Merge pull request #7415 from vector-im/dbkr/mobile_guide_deep_link
Don't show mobile guide if deep linking
2018-09-28 13:34:11 +01:00
David Baker
894e31fe73 Don't show mobile guide if deep linking
Other part of https://github.com/vector-im/riot-web/issues/7378
2018-09-28 11:23:46 +01:00
David Baker
67a762aeaf Actually update package.json 2018-09-28 11:02:14 +01:00
David Baker
28f1140588 Merge remote-tracking branch 'origin/develop' into dbkr/update_deps_2
Updates a bunch more deps now we've updated webpack
2018-09-28 10:58:22 +01:00
David Baker
ac81080185
Merge pull request #7408 from vector-im/dbkr/unnecessary_custom_server
Don't show custom server bit on matrix.org
2018-09-28 10:32:06 +01:00
David Baker
bc8323f96b Don't show custom server bit on matrix.org
On mobile guide

Part of https://github.com/vector-im/riot-web/issues/7378
2018-09-27 18:19:33 +01:00
Matthew Hodgson
a38661c0f0
Merge pull request #7387 from vector-im/matthew/webpack4
Webpack4
2018-09-27 16:21:43 +01:00
Bruno Windels
57cdd26d4d v0.16.5-rc.1 2018-09-27 14:50:38 +01:00
Bruno Windels
582b67c42e v0.16.5-rc.1 2018-09-27 14:48:40 +01:00
Bruno Windels
44791a65b8 Revert "v0.16.5-rc.1"
This reverts commit 81dfe506ac.
2018-09-27 14:46:42 +01:00
Bruno Windels
f3214b7891 Prepare changelog for v0.16.5-rc.1 2018-09-27 14:43:05 +01:00
Bruno Windels
81dfe506ac v0.16.5-rc.1 2018-09-27 14:42:14 +01:00
Bruno Windels
2356524d1c bump matrix-js-sdk and matrix-react-sdk 2018-09-27 13:55:06 +01:00
Bruno Windels
a371bede4d
Merge pull request #7395 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-09-26 18:15:03 +01:00
David Baker
2166213400 Update a bunch of deps
To try & get deps without vulns in them.

Exceptions are:
 * electron builder: which is nontrivial to update
 * webpack-dev-server: probably needs newer webpack
 * moderizr: no new version released yet
2018-09-26 12:37:40 +01:00
Matthew Hodgson
c4f6158f46 pin karma-webpack to 4.0.0-beta.0 to fix perf regression
so karma-webpack 3.0.5 is 4x slower than 4.0.0-beta.0 for webpacking for unknown reasons.
However, 4.0.0-rc.1 and 4.0.0-rc.2 fail with a different error. So: pinned for now
2018-09-26 03:12:08 +01:00
Matthew Hodgson
7e33ea351d upgrade karma & babel to latest 2018-09-26 02:27:22 +01:00
Matthew Hodgson
9e916cdd5c make sure karma runs tests in dev mode to speed up build 2018-09-26 01:39:05 +01:00
Matthew Hodgson
b7843a5d46 find versions of webpack, webpack-cli, and karma-webpack which work together atm 2018-09-26 01:18:53 +01:00
Matthew Hodgson
41e03333a7 Merge branch 'develop' into matthew/webpack4 2018-09-26 00:17:49 +01:00