Commit Graph

7523 Commits (5f1d6f333ce2d6304fae6b68a813d76bc4dd3318)

Author SHA1 Message Date
RiotRobot 5f1d6f333c Merge branch 'master' into develop 2019-07-08 11:14:40 +01:00
RiotRobot 6546108307 v1.2.3 2019-07-08 11:12:04 +01:00
RiotRobot 4a33c0af6e Prepare changelog for v1.2.3 2019-07-08 11:12:03 +01:00
RiotRobot a53d7edc7f v1.2.3 2019-07-08 11:10:31 +01:00
RiotRobot 090b2dbd30 Upgrade to JS SDK 2.1.0 and React SDK 1.3.0 2019-07-08 10:58:13 +01:00
J. Ryan Stinnett cb92e1d4c9
Merge pull request #10260 from vector-im/jryans/upgrade-deps
Upgrade dependencies
2019-07-05 17:50:19 +01:00
J. Ryan Stinnett 7424c776e5 Upgrade dependencies 2019-07-04 15:14:44 +01:00
RiotRobot 6e502478e3 v1.2.3-rc.1 2019-07-03 17:48:55 +01:00
RiotRobot 72052b913f Prepare changelog for v1.2.3-rc.1 2019-07-03 17:48:55 +01:00
RiotRobot 1ce8f3844b v1.2.3-rc.1 2019-07-03 17:47:41 +01:00
RiotRobot 751316f388 Upgrade to JS SDK 2.1.0-rc.1 and React SDK 1.3.0-rc.1 2019-07-03 17:25:05 +01:00
J. Ryan Stinnett e1282081bf
Merge pull request #10247 from vector-im/jryans/update-base-url
Change update URL to match new host
2019-07-03 16:28:21 +01:00
J. Ryan Stinnett ba5cae554c Upgrade electron-builder, electron-builder-squirrel-windows to latest 2019-07-03 16:06:12 +01:00
J. Ryan Stinnett ea665da391 Upgrade to Electron 4.2.6 2019-07-03 15:53:23 +01:00
J. Ryan Stinnett c9bd1b8510 Change update URL to match new host 2019-07-03 15:47:52 +01:00
David Baker 9de26ed062
Merge pull request #10219 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2019-07-01 10:40:32 +01:00
Benjamin 8956661eb7 Translated using Weblate (Esperanto)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2019-06-30 14:29:43 +00:00
Benjamin 325a083e89 Translated using Weblate (English (United States))
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/en_US/
2019-06-30 14:29:43 +00:00
Jeff Huang 5918f757cd Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2019-06-30 14:29:43 +00:00
Weblate 75e426978c Merge branch 'origin/develop' into Weblate. 2019-06-28 17:09:38 +00:00
Nathan Follens 2ea640cee3 Translated using Weblate (West Flemish)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/vls/
2019-06-28 17:09:38 +00:00
Szimszon d52ccc0500 Translated using Weblate (Hungarian)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2019-06-28 17:09:38 +00:00
Kévin C 63e76e109f Translated using Weblate (French)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2019-06-28 17:09:38 +00:00
Nathan Follens c8009487ab Translated using Weblate (Dutch)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2019-06-28 17:09:38 +00:00
Osoitz 271be70806 Translated using Weblate (Basque)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
2019-06-28 17:09:37 +00:00
Besnik Bleta 56a65d95e3 Translated using Weblate (Albanian)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/
2019-06-28 17:09:37 +00:00
J. Ryan Stinnett 0e9e7612a4
Merge pull request #10195 from vector-im/jryans/config-docs
Extract configuration docs to separate file
2019-06-28 18:09:32 +01:00
J. Ryan Stinnett b93388f504 Restore config.json section for old Riot
Riot includes a link to the config.json section of the README, so let's restore
it (at least for a while) keep that link working.
2019-06-28 13:50:54 +01:00
Weblate cdda490fc7 Merge branch 'origin/develop' into Weblate. 2019-06-27 23:24:48 +00:00
Travis Ralston 9d14f92c01
Merge pull request #10197 from vector-im/t3chguy/preload_warning.svg
Add e2e/warning.svg to preload
2019-06-27 17:24:44 -06:00
Weblate 3a966add42 Merge branch 'origin/develop' into Weblate. 2019-06-27 23:22:56 +00:00
Tuomas Hietala 8fc125c5b5 Translated using Weblate (Finnish)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2019-06-27 23:22:56 +00:00
Travis Ralston 2e241fda2c
Merge pull request #10196 from vector-im/t3chguy/fix_vector_links
Fix Electron vector: links
2019-06-27 17:22:51 -06:00
Weblate 846257957e Merge branch 'origin/develop' into Weblate. 2019-06-27 20:09:52 +00:00
Travis Ralston 975f177a23
Merge pull request #10193 from vector-im/travis/syntax-error
Display a red box of anger for config syntax errors
2019-06-27 14:09:47 -06:00
Michael Telatynski 575f013bc9 Add e2e/warning.svg to preload
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 20:59:11 +01:00
Michael Telatynski 320f3198ea Fix Electron vector: links
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 20:33:15 +01:00
Travis Ralston e49583f8e0 Copy from toml 2019-06-27 12:09:58 -06:00
J. Ryan Stinnett 73d801cb1d Extract configuration docs to separate file
The main README is very busy with too much information in one file. This
attempts to clean up one portion by moving configuration docs to a separate
file.

Fixes https://github.com/vector-im/riot-web/issues/9965
2019-06-27 19:08:33 +01:00
Travis Ralston 67664365bd Display a red box of anger for config syntax errors
Fixes https://github.com/vector-im/riot-web/issues/9519
2019-06-27 11:47:29 -06:00
Weblate 8530adc782 Merge branch 'origin/develop' into Weblate. 2019-06-27 12:49:07 +00:00
pebles 2c45299b6a Translated using Weblate (Spanish)
Currently translated at 100.0% (21 of 21 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2019-06-27 12:49:06 +00:00
Benjamin 97f031c623 Translated using Weblate (Esperanto)
Currently translated at 100.0% (21 of 21 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2019-06-27 12:49:06 +00:00
Michael Telatynski 2111db73a7
Merge pull request #10181 from vector-im/t3chguy/electron_config_via_plaf
Move config-getting to VectorBasePlatform
2019-06-27 13:49:00 +01:00
Michael Telatynski 01a78feb41
unexport getConfig, it was never imported externally 2019-06-27 11:17:56 +01:00
Michael Telatynski a70f6de2e4 cleanup
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-26 21:11:27 +01:00
Michael Telatynski dbd198ec07 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-26 21:10:28 +01:00
Michael Telatynski 974797648f Move config-getting to VectorBasePlatform
in Electron get config via IPC from main process
which has access to the "local" config.json override file
and can make people happy :D

Remove bunch of duplicated code,
and move comments around to put them in the right place

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-26 21:08:04 +01:00
あかれぎ c84ef8bdb5 Translated using Weblate (Japanese)
Currently translated at 81.0% (17 of 21 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2019-06-26 11:29:28 +00:00
Tirifto 0fb17c91d8 Translated using Weblate (Esperanto)
Currently translated at 100.0% (21 of 21 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2019-06-26 11:29:28 +00:00