Commit graph

7379 commits

Author SHA1 Message Date
Travis Ralston
1459bfe7be
Merge pull request #9892 from vector-im/travis/check-login-for-config
Use the user's pre-existing HS when config validation fails
2019-05-31 11:03:38 -06:00
Travis Ralston
81ec75f81d Change warning message 2019-05-31 10:44:20 -06:00
RiotRobot
ada47d476c Merge branch 'master' into develop 2019-05-31 12:02:00 +01:00
RiotRobot
7446799e4b v1.2.1 2019-05-31 11:59:31 +01:00
RiotRobot
947e5ab582 Prepare changelog for v1.2.1 2019-05-31 11:59:31 +01:00
RiotRobot
6b93053a80 v1.2.1 2019-05-31 11:53:34 +01:00
RiotRobot
7c03bd128b Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1 2019-05-31 11:52:42 +01:00
J. Ryan Stinnett
f4192e4f9d
Merge pull request #9909 from vector-im/matthew/low_bandwidth
Low bandwidth mode
2019-05-31 09:56:59 +01:00
Travis Ralston
c5461b4509 Don't try and render null avatars in desktop notifications
as much fun as http://localhost:8080/null is to see
2019-05-30 20:04:16 -06:00
Travis Ralston
98f2d865b9 Add 'showLabsSettings' flag to docs+sample config 2019-05-30 20:03:42 -06:00
Travis Ralston
52c3ff02ae appease the linter 2019-05-29 12:12:12 -06:00
Travis Ralston
48a634bff4 Use the user's pre-existing HS when config validation fails
Only applies if the user appears to be logged in. If the user is not logged in, we scream loudly.

This is a temporary measure for https://github.com/vector-im/riot-web/issues/9828

Fixes https://github.com/vector-im/riot-web/issues/9835
2019-05-29 12:07:31 -06:00
RiotRobot
fcf8e246cf Merge branch 'master' into develop 2019-05-29 16:27:46 +01:00
RiotRobot
2af3d20a71 v1.2.0 2019-05-29 16:23:52 +01:00
RiotRobot
fde9a7a7ba Prepare changelog for v1.2.0 2019-05-29 16:23:52 +01:00
RiotRobot
d6fb0bc24f v1.2.0 2019-05-29 16:19:59 +01:00
RiotRobot
f4b1e3307d Upgrade SDKs to 1.2.0 2019-05-29 16:14:25 +01:00
J. Ryan Stinnett
53d8341886
Merge pull request #9869 from vector-im/jryans/twemoji-windows
Fix Twemoji loading on Windows dev machines
2019-05-28 18:25:38 +01:00
J. Ryan Stinnett
95d36c1f29 Fix Twemoji loading on Windows dev machines
This corrects our path handling on Windows development machines for
paths referenced in JS and HTML files. Both images and fonts (like
Twemoji) were afflicted (with Windows-style backslash path delimiters),
but browsers seems to tolerate them in the `src` attribute of images, so
we didn't notice that variant before.
2019-05-28 14:31:42 +01:00
Travis Ralston
982416b3f7
Merge pull request #9848 from spantaleev/make-docker-image-smaller
Base Docker image on nginx:alpine, not the larger nginx:latest
2019-05-27 11:41:18 -06:00
Slavi Pantaleev
4e63e3b0de Base Docker image on nginx:alpine, not the larger nginx:latest
`nginx:latest` is based on Debian Stretch and is listed as being 45MB,
while `nginx:alpine` is based on Alpine 3.9 and is just 7MB.

Basing the riot-web Docker image on `nginx:alpine` should
make it 38MB smaller compared to the current situation.

The nginx version seems to be "latest mainline" on both (currently 1.15.12),
judging by each Dockerfile:
- e5123eea0d/mainline/stretch/Dockerfile
- e5123eea0d/mainline/alpine/Dockerfile
2019-05-27 11:57:37 +03:00
J. Ryan Stinnett
28ffca1f84 Ignore /electron_app/pub 2019-05-24 11:34:03 +01:00
J. Ryan Stinnett
e129db4978 Upgrade electron-builder 2019-05-24 11:29:02 +01:00
J. Ryan Stinnett
734d8a8151 Clarify Electron steps 2019-05-24 11:28:12 +01:00
Travis Ralston
afdaca0515
Merge pull request #9779 from vector-im/travis/feature/wellknown2
Validate homeserver configuration prior to loading the app
2019-05-23 10:56:19 -06:00
RiotRobot
52b2dbec85 v1.2.0-rc.1 2019-05-23 17:41:20 +01:00
RiotRobot
aa10d7aeed Prepare changelog for v1.2.0-rc.1 2019-05-23 17:41:20 +01:00
RiotRobot
7f7b3e747c v1.2.0-rc.1 2019-05-23 17:40:08 +01:00
RiotRobot
59fa374491 Upgrade SDKs to 1.2.0-rc.1 2019-05-23 17:39:03 +01:00
Travis Ralston
26d8056755 Merge branch 'develop' into travis/feature/wellknown2 2019-05-22 23:06:09 -06:00
Travis Ralston
b772bc75a9 Update copyright 2019-05-22 22:57:39 -06:00
David Baker
001b7fb799 electron 4.2.2 2019-05-22 12:51:41 +01:00
David Baker
260f819e38
Merge pull request #9802 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2019-05-22 12:45:41 +01:00
Weblate
6306bc0c90 Merge branch 'origin/develop' into Weblate. 2019-05-21 12:27:12 +00:00
J. Ryan Stinnett
913bc6da93 Update yarn.lock 2019-05-21 13:27:02 +01:00
Weblate
6ac035f0b1 Merge branch 'origin/develop' into Weblate. 2019-05-21 10:33:16 +00:00
Matthew Hodgson
fa1b2fe70f
Merge pull request #9766 from vector-im/matthew/twemoji
remove emojione
2019-05-21 11:33:12 +01:00
Travis Ralston
fa9d2a81a3 Merge branch 'develop' into travis/feature/wellknown2 2019-05-20 19:48:54 -06:00
Matthew Hodgson
4cbe6c1000 remove emojione 2019-05-19 21:26:11 +01:00
Weblate
c203d3356b Merge branch 'origin/develop' into Weblate. 2019-05-19 15:09:55 +00:00
Karol Kosek
d617d8ebb3 Translated using Weblate (Polish)
Currently translated at 89.5% (17 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2019-05-19 15:09:55 +00:00
Edgars Voroboks
43d2c3bbc8 Translated using Weblate (Latvian)
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
2019-05-19 15:09:55 +00:00
Matthew Hodgson
3e17e9f00d tell webpack about woff & woff2 files 2019-05-19 16:09:47 +01:00
Filip Š
b54a53d1ac Translated using Weblate (Slovenian)
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sl/
2019-05-18 14:15:56 +00:00
Tuomas Hietala
bdb0f5e81c Translated using Weblate (Finnish)
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2019-05-18 14:15:55 +00:00
Fendo
29398a0ab5 Translated using Weblate (Esperanto)
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2019-05-18 14:15:55 +00:00
Travis Ralston
7a65dc96cd
Merge pull request #9726 from vector-im/travis/wk/mobileguide
Show resolved homeserver configuration on the mobile guide
2019-05-17 11:01:42 -06:00
Travis Ralston
1ac5df3cd0 Merge branch 'develop' into travis/feature/wellknown2 2019-05-16 12:58:09 -06:00
Travis Ralston
39d1293350
Merge pull request #9721 from vector-im/travis/wk/fallback_hs
Flag the validated config as the default config
2019-05-16 12:47:01 -06:00
Travis Ralston
6f8c6bf13e
Merge pull request #9736 from vector-im/travis/docker-test
Make Dockerfile work for develop and other branches
2019-05-16 08:43:44 -06:00