gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,491 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

7491 Commits

Author SHA1 Message Date
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 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
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
David Baker fceb05e646
Merge pull request #10124 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-06-20 11:00:34 +01:00
Weblate c0e81e7808 Merge branch 'origin/develop' into Weblate. 2019-06-19 15:04:21 +00:00
Tuomas Hietala 470f6a8cbc Translated using Weblate (Finnish) 
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/fi/
 2019-06-19 15:04:20 +00:00
RiotRobot 6f1ce750bf Merge branch 'master' into develop 2019-06-19 16:03:22 +01:00
RiotRobot 672cf1a46e v1.2.2 2019-06-19 16:00:42 +01:00
RiotRobot 5f7ee3f4ee Prepare changelog for v1.2.2 2019-06-19 16:00:42 +01:00
RiotRobot 80262314f3 v1.2.2 2019-06-19 15:59:10 +01:00
RiotRobot 48b6f8c954 Released js-sdk & react-sdk 2019-06-19 15:55:02 +01:00
J. Ryan Stinnett b7a19c6d16
Merge pull request #10097 from vector-im/jryans/linux-icons 
Fix default Electron window and tray icons
 2019-06-18 17:35:34 +01:00
Weblate cece9a5028 Merge branch 'origin/develop' into Weblate. 2019-06-18 16:35:30 +00:00
J. Ryan Stinnett f3bfb08280 Update Electron's runtime PNG icon to match others 
This runtime PNG icon (the default window and tray icon) was not updated to
remove the white background when we last changed the branding. This copies a 265
px PNG from elsewhere to ensure it matches.

Part of https://github.com/vector-im/riot-web/issues/9897
 2019-06-18 16:59:04 +01:00
J. Ryan Stinnett 292427c275 Move default Electron icons outside asar 
Electron doesn't seem to want to load icons from within `asar`s, so this changes
the default icons (used for window and tray) so that they are just regular files
on disk and updates the reference to match.

Part of https://github.com/vector-im/riot-web/issues/9897
 2019-06-18 16:58:43 +01:00
RiotRobot db77d91500 v1.2.2-rc.2 2019-06-18 16:02:21 +01:00
RiotRobot 290a99ba85 Prepare changelog for v1.2.2-rc.2 2019-06-18 16:02:21 +01:00
RiotRobot a86f1e8a90 v1.2.2-rc.2 2019-06-18 15:58:36 +01:00
RiotRobot 589aa19246 js-sdk & react-sdk rc.2 2019-06-18 15:57:30 +01:00
J. Ryan Stinnett f10e7ac224 Fix reference to main window when setting Electron window icon 
This fixes the fallback path which sets the Electron window icon to the default
icon in case there's no data URI based icon coming content. This is true
immediately after startup, for example.

Part of https://github.com/vector-im/riot-web/issues/9897
 2019-06-18 14:31:19 +01:00
BenjaminVettori 9e5712594c Translated using Weblate (German) 
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/de/
 2019-06-17 22:29:00 +00:00
Nathan Follens c90cc096a1 Translated using Weblate (West Flemish) 
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/vls/
 2019-06-16 08:28:56 +00:00
Le Dang Trung f1a6651f04 Translated using Weblate (Vietnamese) 
Currently translated at 57.1% (12 of 21 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/vi/
 2019-06-16 08:28:56 +00:00
Vitaly Lipatov a36013f2e0 Translated using Weblate (Russian) 
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/ru/
 2019-06-16 08:28:55 +00:00
random 36cebd565a Translated using Weblate (Italian) 
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/it/
 2019-06-16 08:28:55 +00:00
Slavi Pantaleev fefa2ee036 Translated using Weblate (Bulgarian) 
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/bg/
 2019-06-16 08:28:55 +00:00
Osoitz 446a4b16ee Translated using Weblate (Basque) 
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/eu/
 2019-06-16 08:28:55 +00:00
RiotRobot 9af5aea687 v1.2.2-rc.1 2019-06-12 12:12:17 +01:00
RiotRobot a413621efc Prepare changelog for v1.2.2-rc.1 2019-06-12 12:12:16 +01:00
RiotRobot b751383702 v1.2.2-rc.1 2019-06-12 12:11:12 +01:00
RiotRobot 974da9947c js-sdk & react-sdk rc.1 2019-06-12 12:10:37 +01:00
Weblate 3b557c273f Merge branch 'origin/develop' into Weblate. 2019-06-11 13:06:33 +00:00
David Baker 8458aa7978
Merge pull request #10012 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-06-11 14:06:29 +01:00
Weblate d5cdfe62d5 Merge branch 'origin/develop' into Weblate. 2019-06-11 13:03:19 +00:00
David Baker dfb7c163a0 electron 4.2.4 2019-06-11 14:03:05 +01:00