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

7047 Commits

Author SHA1 Message Date
Andrew Morgan dc96f1c70e Remove duped code 2019-03-08 11:03:39 +00:00
Andrew Morgan d4984e3d68 Remove duplicate import 2019-03-08 11:01:07 +00:00
Andrew Morgan c3d3034965 lint 2019-03-08 10:59:15 +00:00
Andrew Morgan 600b8690d7 Remove more merge markers 2019-03-08 10:26:51 +00:00
Andrew Morgan 8b60fe9fff Remove merge markers 2019-03-08 09:52:55 +00:00
Andrew Morgan 94b6396e0c Prevent erroneously setting state outside of settings window 2019-03-07 16:26:53 +00:00
Andrew Morgan 012ad9ef56 Merge branch 'anoa/jitsi_ptt' of github.com:anoadragon453/riot-web into anoa/jitsi_ptt 2019-03-07 16:26:36 +00:00
Andrew Morgan fa72152a96 Merge branch 'develop' into anoa/jitsi_ptt 
* develop: (30 commits)
  [matrix] -> Matrix
  Nudge karma to 3.1.2
  set chrome path for travis CI explicitly
  Updated install spinner referenced in #8913
  Add support for localConfig at $appData/config.json. Move electron-config to $appData/electron-config.json
  Translated using Weblate (Hungarian)
  Update to electron 4.0.6
  Translated using Weblate (Spanish)
  Translated using Weblate (Norwegian Bokmål)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Hindi)
  Translated using Weblate (Greek)
  Translated using Weblate (German)
  Translated using Weblate (Finnish)
  Translated using Weblate (Arabic)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Czech)
  Translated using Weblate (Swedish)
  Translated using Weblate (Swedish)
  Allow disabling update mechanism
  ...
 2019-03-03 00:33:02 +00:00
J. Ryan Stinnett 48015aa36d
Merge pull request #8991 from vector-im/jryans/nudge-karma 
Nudge karma to 3.1.2
 2019-03-01 09:37:07 +00:00
Michael Telatynski baa034230f
Merge pull request #8983 from vector-im/t3chguy/local-config 
Add support for localConfig at $appData/config.json.
 2019-03-01 07:54:49 +00:00
David Baker 4f58deac1f
Merge pull request #8973 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2019-02-28 14:12:15 +00:00
Weblate 97a60834a1 Merge branch 'origin/develop' into Weblate. 2019-02-28 14:10:48 +00:00
Weblate 0e2938d7b3 [matrix] -> Matrix 2019-02-28 14:10:31 +00:00
Bruno Windels b0bbe48220
Merge pull request #8987 from vector-im/bwindels/cichromelocation 
set chrome path for travis CI explicitly
 2019-02-28 15:02:08 +01:00
J. Ryan Stinnett 8b25d4f710 Nudge karma to 3.1.2 
This includes a fix for detecting the version of Chrome used to run tests.
 2019-02-28 13:52:34 +00:00
Weblate 34eb6322c0 Merge branch 'origin/develop' into Weblate. 2019-02-28 13:40:41 +00:00
Bruno Windels 45d1ec8825 set chrome path for travis CI explicitly 
karma seems to be giving priority to a location where an old version is installed.
 2019-02-28 13:18:21 +01:00
David Baker e37a8dc8a1
Merge pull request #8984 from vector-im/nadonomy/electron-spinner 
Updated install spinner
 2019-02-28 10:20:51 +00:00
Nad Chishtie f020995ac4 Updated install spinner referenced in #8913 2019-02-28 11:19:00 +01:00
Andrew Morgan d7b0e15d03 Update cmake-js runtimeVersion to 4.0.6 2019-02-28 00:17:37 +00:00
Michael Telatynski 0e0c1cfad3 Add support for localConfig at $appData/config.json. 
Move electron-config to $appData/electron-config.json

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-28 00:17:33 +00:00
Andrew Morgan 3ee02a76a7 Merge branch 'develop' into anoa/jitsi_ptt 
* develop:
  Update issue templates
  Fix cleanup script not to remove extracted/bundles directories (#8764)
 2019-02-27 23:26:10 +00:00
Andrew Morgan 8d1854a7e4 Merge branch 'master' of https://github.com/vector-im/riot-web into develop 
* 'master' of https://github.com/vector-im/riot-web:
  Update issue templates
 2019-02-27 23:26:04 +00:00
Weblate 79d56bdb0e Merge remote-tracking branch 'origin/develop' into develop 2019-02-27 17:41:51 +00:00
David Baker 3b70faee24 Translated using Weblate (Hungarian) 
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/hu/
 2019-02-27 17:41:48 +00:00
David Baker 0d5e80cc51 Update to electron 4.0.6 2019-02-27 17:34:36 +00:00
Weblate f899c75d0c Merge remote-tracking branch 'origin/develop' into develop 2019-02-27 17:33:01 +00:00
hectorfdezlopez 5266d1bc11 Translated using Weblate (Spanish) 
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/es/
 2019-02-27 17:32:58 +00:00
Herman S 3acc6ee5c9 Translated using Weblate (Norwegian Bokmål) 
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/nb_NO/
 2019-02-27 17:32:58 +00:00
Szimszon 2c0b47a1e9 Translated using Weblate (Hungarian) 
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/hu/
 2019-02-27 17:32:57 +00:00
Akarshan Biswas ea0ce23ac7 Translated using Weblate (Hindi) 
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/hi/
 2019-02-27 17:32:57 +00:00
Sotiris Papatheodorou d644a73595 Translated using Weblate (Greek) 
Currently translated at 84.2% (16 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
 2019-02-27 17:32:57 +00:00
Fridtjof Mund c3c9b63326 Translated using Weblate (German) 
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/de/
 2019-02-27 17:32:57 +00:00
Samu Voutilainen b10ec4db37 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-02-27 17:32:57 +00:00
ButterflyOfFire 5d555e044d Translated using Weblate (Arabic) 
Currently translated at 89.4% (17 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/
 2019-02-27 17:32:56 +00:00
Tom Lant f9be0bfb2e
Update issue templates 2019-02-27 14:06:00 +00:00
Paulo Miranda 0a0aa1c591 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2019-02-27 13:50:43 +00:00
Stanislav Lukeš af2921d0c4 Translated using Weblate (Czech) 
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/cs/
 2019-02-27 09:51:04 +00:00
Joar Wandborg 4beeba6cf6 Translated using Weblate (Swedish) 
Currently translated at 94.7% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
 2019-02-25 10:57:37 +00:00
Tim Stahel 0c742e5424 Translated using Weblate (Swedish) 
Currently translated at 94.7% (18 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
 2019-02-25 10:57:37 +00:00
Travis Ralston a5a4c167e8
Merge pull request #8911 from vector-im/t3chguy/no-update 
Allow disabling update mechanism
 2019-02-24 18:00:54 -07:00
Travis Ralston 9e11c70416
Merge pull request #8908 from vector-im/t3chguy/minimize_tray 
Allow configuration of whether closing window closes or minimizes to tray
 2019-02-24 17:33:14 -07:00
Michael Telatynski ffacf30722 Allow disabling update mechanism 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 04:52:07 +00:00
Michael Telatynski 5a3b9ae454 more matching 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 01:38:21 +00:00
Michael Telatynski 717495c4e0 specify return types to match superclass 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 01:21:18 +00:00
Michael Telatynski 714570443d Allow configuration of whether closing window closes or minimizes to tray 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 01:08:01 +00:00
Akarshan Biswas c691b248a2 Translated using Weblate (Hindi) 
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/hi/
 2019-02-22 06:53:27 +00:00
Andrew Morgan 7ea207327f hey it all works 2019-02-21 23:23:58 +00:00
Andrew Morgan 65a501ff2b Trying to make things work 2019-02-21 20:37:53 +00:00
Andrew Morgan f3fb6f9015 Merge branch 'master' of https://github.com/vector-im/riot-web into develop 
* 'master' of https://github.com/vector-im/riot-web:
  Fix cleanup script not to remove extracted/bundles directories (#8764)
 2019-02-21 20:12:12 +00:00