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

288 Commits

Author SHA1 Message Date
Andrew Morgan f4a7f0dedd Fix some merge conflicts and up to electron 4.2.6 2019-07-12 17:39:31 +01:00
Andrew Morgan b7781ab503 Merge branch 'develop' into anoa/jitsi_ptt 
* develop: (249 commits)
  Clarify deployment scripts
  Add riot.im configuration files
  Enable reactions and edits for desktop
  Remove unused disable_identity_server config flag
  Improve wording in debug log sending in issue templates
  Require a rageshake description in mxSendRageshake
  Fetch deps
  Verify i18n in CI
  Upgrade dependencies
  v1.2.4
  Prepare changelog for v1.2.4
  v1.2.4
  Upgrade lodash
  Upgrade to JS SDK 2.1.1 and React SDK 1.3.1
  v1.2.3
  Prepare changelog for v1.2.3
  v1.2.3
  Upgrade to JS SDK 2.1.0 and React SDK 1.3.0
  Upgrade dependencies
  v1.2.3-rc.1
  ...
 2019-07-12 16:57:01 +01:00
J. Ryan Stinnett f1a680322b Add riot.im configuration files 2019-07-12 10:48:34 +01:00
J. Ryan Stinnett d47d0e4097 Enable reactions and edits for desktop 2019-07-12 10:23:14 +01:00
RiotRobot e5ffb8de4c v1.2.4 2019-07-11 11:24:52 +01:00
RiotRobot a53d7edc7f v1.2.3 2019-07-08 11:10:31 +01:00
RiotRobot 1ce8f3844b v1.2.3-rc.1 2019-07-03 17:47:41 +01:00
J. Ryan Stinnett c9bd1b8510 Change update URL to match new host 2019-07-03 15:47:52 +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
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
RiotRobot 6f1ce750bf Merge branch 'master' into develop 2019-06-19 16:03:22 +01:00
RiotRobot 80262314f3 v1.2.2 2019-06-19 15:59:10 +01: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 a86f1e8a90 v1.2.2-rc.2 2019-06-18 15:58:36 +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
RiotRobot b751383702 v1.2.2-rc.1 2019-06-12 12:11:12 +01:00
RiotRobot 6b93053a80 v1.2.1 2019-05-31 11:53:34 +01:00
RiotRobot d6fb0bc24f v1.2.0 2019-05-29 16:19:59 +01:00
RiotRobot 7f7b3e747c v1.2.0-rc.1 2019-05-23 17:40:08 +01:00
David Baker 8ac5957186 v1.1.2 2019-05-15 14:34:59 +01:00
David Baker 875d1b209a v1.1.1 2019-05-14 13:53:31 +01:00
David Baker 5c46bd37e8 v1.1.0 2019-05-07 15:54:38 +01:00
David Baker 7c5e39e170 Add new scalar staging url 2019-05-01 11:45:11 +01:00
David Baker 49efece6c6 v1.1.0-rc.1 2019-04-30 12:48:52 +01:00
David Baker f400cea437 Merge branch 'master' into develop 2019-04-16 01:26:24 +01:00
David Baker 29cb8c42b0 v1.0.8 2019-04-16 01:22:02 +01:00
pacien 2c9b51f29d Add support for custom profile directory 
A custom user data directory can now be specified using the "profile-dir"
command line argument.

Github ref: closes #6175

Signed-off-by: Pacien TRAN-GIRARD <pacien.trangirard@pacien.net>
 2019-04-09 19:35:14 +02:00
Andrew Morgan 10d0b728fd Update electron version and add compiling docs 2019-04-08 18:16:55 +01:00
Andrew Morgan c8a04cdfcc Merge branch 'develop' into anoa/jitsi_ptt 
* develop: (47 commits)
  Translated using Weblate (Romanian)
  Translated using Weblate (Finnish)
  Translated using Weblate (Dutch)
  Added translation using Weblate (Slovenian)
  bump olm version
  Use a different cookie to expire any cookies people may already have
  Step cookie down to 4 hours
  Fix autolaunch setting appearing toggled off
  Expire mobile guide cookie after 24 hours
  Don't try to save files the user didn't want to save
  v1.0.6
  Prepare changelog for v1.0.6
  v1.0.6
  Released js-sdk & react-sdk, and bump electron version
  Deleted translation using Weblate (English (United Kingdom))
  Translated using Weblate (Italian)
  Translated using Weblate (Irish)
  Translated using Weblate (Finnish)
  Translated using Weblate (Esperanto)
  Translated using Weblate (English (United Kingdom))
  ...
 2019-04-08 16:18:44 +01:00
Bruno Windels a41a14b975 Merge branch 'master' into develop 2019-04-08 16:21:13 +02:00
Bruno Windels 659c29cf77 v1.0.7 2019-04-08 16:16:46 +02:00
Travis Ralston f36a24fef0 Fix autolaunch setting appearing toggled off 
Fixes https://github.com/vector-im/riot-web/issues/9123

The value used here is a function which returns a promise, not a flag.
 2019-04-02 17:59:47 -06:00
Travis Ralston 8b2d33ac0a Don't try to save files the user didn't want to save 
Fixes https://github.com/vector-im/riot-web/issues/9350
 2019-04-01 13:24:17 -06:00
David Baker 2bac72fa36 v1.0.6 2019-04-01 13:53:18 +01:00
Travis Ralston 7a9cea4baa Add "Save image as..." button to context menu on images 
Fixes https://github.com/vector-im/riot-web/issues/9324
Requires https://github.com/matrix-org/matrix-react-sdk/pull/2848
 2019-03-29 16:21:25 -06:00
David Baker f392a00138 v1.0.6-rc.1 2019-03-27 17:46:32 +00:00
Bruno Windels f777c2c9bc Merge branch 'master' into develop 2019-03-21 11:40:43 +01:00
Bruno Windels 0dd1a7b309 v1.0.5 2019-03-21 11:34:17 +01:00
Andrew Morgan 5240be63fe Update to iohook 0.4.0 2019-03-20 17:54:59 +00:00
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