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

430 Commits

Author SHA1 Message Date
RiotRobot 15922f6656 v1.6.0-rc.3 2020-04-17 17:58:57 +01:00
RiotRobot 3fd726af5e v1.6.0-rc.2 2020-04-16 20:06:06 +01:00
RiotRobot 09b171c1de v1.6.0-rc.1 2020-04-15 19:24:25 +01:00
RiotRobot 08ef4ff3b1 Merge branch 'release-v1.5.16' into release-v1.6.0 2020-04-15 19:08:28 +01:00
J. Ryan Stinnett b5e8e5cf75
Merge pull request #13179 from vector-im/jryans/enable-cross-signing 
Enable cross-signing / E2EE by default for DM on release
 2020-04-15 18:54:02 +01:00
J. Ryan Stinnett cd19af4003 Enable cross-signing / E2EE by default for DM on release 
Fixes https://github.com/vector-im/riot-web/issues/13178
 2020-04-15 18:36:22 +01:00
Michael Telatynski a77ed6e844
Merge branch 'develop' into t3chguy/poc_riot_desktop_sso_multi_profile 2020-04-14 17:03:00 +01:00
Michael Telatynski 2346829055 Add riot-desktop shortcuts for forward/back matching browsers&slack 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-11 18:58:00 +01:00
Michael Telatynski 99e5271cb8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/poc_riot_desktop_sso_multi_profile 2020-04-09 21:17:45 +01:00
Michael Telatynski 15bb819c8a Instead of encrypting, pass the HS an opaque token which we locally resolve in a map to our profile data 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 21:17:37 +01:00
Michael Telatynski 4afd29f62c add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 16:23:41 +01:00
Michael Telatynski 6fdeca93b6 Make the riot-desktop callback args more generic and encrypt the args 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 16:21:52 +01:00
RiotRobot c8e284e26f v1.5.16-rc.1 2020-04-08 14:06:05 +01:00
dependabot[bot] 97fdb559fb
Bump minimist from 1.2.2 to 1.2.3 in /electron_app 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.2...1.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-04 16:36:41 +00:00
Michael Telatynski 67cf1e7536 rejig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-04 00:48:26 +01:00
Michael Telatynski 8ca9e4ccb1 Fix Electron SSO handling to support multiple profiles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-04 00:22:15 +01:00
RiotRobot ccd998d709 Merge branch 'master' into develop 2020-04-01 15:34:02 +01:00
RiotRobot 97586aa5c3 v1.5.15 2020-04-01 15:10:52 +01:00
RiotRobot 365041c6c3 Merge branch 'master' into develop 2020-03-30 13:52:20 +01:00
RiotRobot 5bd155c294 v1.5.14 2020-03-30 13:45:32 +01:00
David Baker a3d09e6d54 Remove welcome user from config 
Until we update its tutorial videos to the current interface
 2020-03-26 14:51:46 +00:00
RiotRobot bfcb46c4fd v1.5.14-rc.1 2020-03-26 13:28:13 +00:00
Michael Telatynski 3d266cb237 Register Mac electron specific Cmd+, shortcut to User Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 23:42:10 +00:00
RiotRobot b01c6e67fd Merge branch 'master' into develop 2020-03-17 14:37:28 +00:00
RiotRobot 61bf0d5447 v1.5.13 2020-03-17 14:29:28 +00:00
dependabot[bot] 5949c432fa
Bump minimist from 1.2.0 to 1.2.2 in /electron_app 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.2.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-16 04:12:25 +00:00
RiotRobot 149098921f v1.5.13-rc.1 2020-03-11 17:36:48 +00:00
RiotRobot d88f9ed2c0 Merge branch 'master' into develop 2020-03-04 13:06:43 +00:00
RiotRobot 096831c9df v1.5.12 2020-03-04 12:01:38 +00:00
Michael Telatynski 48c8f16a4c
Merge pull request #12590 from vector-im/t3chguy/sso 
riot-desktop open SSO in browser so user doesn't have to auth twice
 2020-03-03 22:27:46 +00:00
J. Ryan Stinnett 2a5438d636 Revert "Remove will-navigate comment after Electron fix" 
This reverts commit 749d7e8e4c.
 2020-03-03 13:20:12 -07:00
Michael Telatynski 706834939f Revert "Remove will-navigate as we expect it to be broken like pre-8.0.2" 
This reverts commit fb656ce8bd.
 2020-03-03 13:20:03 -07:00
Michael Telatynski bb6afd7c30 backport riot-desktop implementation into riot-web 2020-03-02 20:16:41 +00:00
RiotRobot 8710f7d196 v1.5.11 2020-03-02 17:47:58 +00:00
Michael Telatynski fb656ce8bd Remove will-navigate as we expect it to be broken like pre-8.0.2 2020-03-02 13:08:04 +00:00
J. Ryan Stinnett 749d7e8e4c Remove will-navigate comment after Electron fix 
Electron 8.0.2 and later (which we're now using) resolves this issue with
`will-navigate`.
 2020-03-02 13:07:49 +00:00
Michael Telatynski 0d9be8c255 Remove will-navigate as we expect it to be broken like pre-8.0.2 2020-03-02 11:09:06 +00:00
J. Ryan Stinnett 1043b0eb11 Remove will-navigate comment after Electron fix 
Electron 8.0.2 and later (which we're now using) resolves this issue with
`will-navigate`.
 2020-02-28 11:42:08 +00:00
RiotRobot 00244d5428 v1.5.11-rc.1 2020-02-26 14:35:20 +00:00
RiotRobot 3147624df2 v1.5.10 2020-02-19 16:21:35 +00:00
RiotRobot 38cd6a0d0c v1.5.9 2020-02-17 13:40:07 +00:00
RiotRobot 49ece1cbf9 v1.5.9-rc.1 2020-02-13 17:53:36 +00:00
J. Ryan Stinnett 51f2afb7b7 Add allow-jit entitlement from electron-builder defaults 2020-02-13 15:02:22 +00:00
J. Ryan Stinnett 2c0968e40e Return to default deb after install script 
Upstream electron-builder now contains the SUID sandbox change.

See also https://github.com/electron-userland/electron-builder/pull/4163
 2020-02-13 14:52:44 +00:00
RiotRobot 9782599c69 Merge branch 'master' into develop 2020-01-27 12:02:44 +00:00
RiotRobot 15a77e8826 v1.5.8 2020-01-27 11:52:56 +00:00
Damir Jelić 7aff020d4d Merge branch 'poljar/seshat-ui' into develop 2020-01-24 14:40:54 +01:00
Damir Jelić c0558f3527 Merge branch 'poljar/seshat-filepanel' into develop 2020-01-24 14:38:20 +01:00
Travis Ralston 47d88d6b79 Fix the remainder of the cookie links 
Fixes https://github.com/vector-im/riot-web/issues/10362

Per https://github.com/vector-im/riot-web/pull/11998#issuecomment-577329852
 2020-01-22 11:55:09 -07:00
RiotRobot cd3fafb2b0 v1.5.8-rc.2 2020-01-22 14:22:40 +00:00