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

248 Commits

Author SHA1 Message Date
Andrew Morgan 12394bfe8a Fix electron build command 2019-03-20 15:59:57 +00:00
Andrew Morgan fc23febf63 Merge branch 'develop' into anoa/jitsi_ptt 
* develop: (75 commits)
  Support CI for matching branches on forks
  Update yarn.lock
  v1.0.4
  Prepare changelog for v1.0.4
  v1.0.4
  Released js-sdk & react-sdk
  Translated using Weblate (Irish)
  Translated using Weblate (English (United States))
  Added translation using Weblate (Irish)
  Update README.md grammar
  Cross-promote mobile apps
  Fix downstream branch fetching
  Update issue templates
  Declare the officially supported browsers in the README
  Update version number in issue templates
  Use the right CI branch
  Set up BuildKite for Chrome
  Lint doesn't need develop deps
  Remove Travis (CI)
  Add a basic BuildKite :pipeline:
  ...
 2019-03-20 15:42:37 +00:00
David Baker 42c2692d28 Merge branch 'master' into develop 2019-03-18 14:20:09 +00:00
David Baker 5254cef980 v1.0.4 2019-03-18 14:11:52 +00:00
Aaron Raimist b40ed7cb11
Update Electron help menu link 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-03-13 14:43:24 -05:00
David Baker 958e8662d9 v1.0.4-rc.1 2019-03-13 14:58:28 +00:00
J. Ryan Stinnett 13aca0716a Add yarn lock file for Electron app 
We did not previously commit lock files for the Electron app, so there is no
correct copy to import from. For this directory, I created a fresh yarn lock
file using yarn install.
 2019-03-11 15:33:00 +00:00
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 012ad9ef56 Merge branch 'anoa/jitsi_ptt' of github.com:anoadragon453/riot-web into anoa/jitsi_ptt 2019-03-07 16:26:36 +00:00
David Baker acb8afaeb7 Merge branch 'master' into develop 2019-03-06 16:07:05 +00:00
David Baker 8e9d73fb5b v1.0.3 2019-03-06 15:55:40 +00:00
David Baker b2d417d7ef Merge branch 'master' into develop 2019-03-06 11:38:17 +00:00
David Baker ea86359c41 v1.0.2 2019-03-06 11:31:02 +00:00
David Baker b7d2159d60 v1.0.2-rc.3 2019-03-05 19:20:57 +00:00
David Baker 5474a5e0c7 utm_campaign is now added automatically 2019-03-05 18:27:22 +00:00
David Baker 9235b5a861 Add modular.im hosting link to electron app config 2019-03-05 18:27:15 +00:00
David Baker 116f1d7d92 utm_campaign is now added automatically 2019-03-05 16:45:46 +00:00
David Baker 3c123a064b Add modular.im hosting link to electron app config 2019-03-05 16:18:04 +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
David Baker 29ff95cccc v1.0.2-rc.2 2019-03-01 17:39:57 +00:00
David Baker ab1ceff242 v1.0.2-rc.1 2019-03-01 12:20:32 +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
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
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
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 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
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 6e71fa5902 Jitsi Push-to-Talk 2019-02-21 18:52:10 +00:00
Bruno Windels 77b317b3cf v1.0.1 2019-02-15 14:00:01 +01:00
J. Ryan Stinnett 55da52debd v1.0.0 2019-02-14 17:07:27 +00:00
J. Ryan Stinnett 21f11f02a4 v1.0.0-rc.2 2019-02-14 11:19:06 +00:00
J. Ryan Stinnett 32c958e2f2 Merge branch 'develop' into release-v1.0.0 2019-02-14 11:17:18 +00:00
Nad Chishtie db30c24b9f Updated app icons 2019-02-13 17:58:57 +00:00
David Baker bbbb4c7861 run icons script on new icon 2019-02-13 17:28:28 +00:00
David Baker a51c0744e6 v1.0.0-rc.1 2019-02-08 18:45:53 +00:00
Aaron Raimist a03a738317
Only allow Electron to zoom with CommandOrControl+= 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-02-06 13:20:40 -06:00
Andrew Morgan 726ca5b530 Merge branch 'develop' of github.com:vector-im/riot-web into anoa/jitsi_ptt 2019-02-04 16:40:29 +00:00
Aaron Raimist bfdffc653e
Allow Electron to zoom with CommandOrControl+= 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-02-02 15:53:10 -06:00
Bruno Windels 90140f6361
Merge pull request #8321 from vector-im/experimental 
Merge redesign into develop
 2019-01-30 12:49:37 +00:00
David Baker 2aaed5d4c3 Doc broken will-navigate listener 2019-01-24 11:36:36 +00:00
David Baker a0c205e4c9 v0.17.9 2019-01-22 11:44:13 +00:00
David Baker e94e712d49 v0.17.9-rc.1 2019-01-17 11:07:42 +00:00
Michael Telatynski 8c895cd435 Correct the copying of e-mail addresses in the electron app 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-01-15 08:37:01 +00:00
David Baker 62a49af23f Only serve origin migrator whilst migrating 
as per comment
 2018-12-21 22:21:06 +00:00
David Baker 751a1dc543 Add tool to migrate logins between origins 
App checks at startup for an existing session, if there isn't one,
it will start the tool to check for a login in the file:// origin.
If there is one, it will copy the login over to the vector://vector
origin.

In principle this could also be used to migrate logins between
other origins on the web if this were ever required.

This includes a minified copy of the browserified js-sdk with
a getAllEndToEndSessions() function added to the crypto store
(https://github.com/matrix-org/matrix-js-sdk/pull/812). This is
not great, but for a short-lived tool this seems better than
introducing more entry points into webpack only used for the
electron app.
 2018-12-21 19:14:25 +00:00
David Baker b6d70f4434 Missing include 2018-12-19 12:25:32 +00:00