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

8612 Commits

Author SHA1 Message Date
Besnik Bleta a560d3586a Translated using Weblate (Albanian) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/
 2020-03-20 11:53:08 +00:00
Weblate fbf4437159 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:45:16 +00:00
Michael Telatynski f5ac675379
Merge pull request #12800 from vector-im/t3chguy/shortcuts2 
Register Mac electron specific Cmd+, shortcut to User Settings
 2020-03-20 10:45:07 +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
Weblate f377dfcad4 Merge branch 'origin/develop' into Weblate. 2020-03-19 17:52:28 +00:00
Travis Ralston 775e1fc4ae
Merge pull request #12780 from vector-im/travis/wrapped-jitsi 
Use a local widget wrapper for Jitsi calls
 2020-03-19 11:52:22 -06:00
Travis Ralston 09e26d0882 Misc case changes, comment updates 2020-03-19 11:47:43 -06:00
Weblate acfeee3258 Merge branch 'origin/develop' into Weblate. 2020-03-19 11:01:28 +00:00
Michael Telatynski 2b751d2ca6
Merge pull request #12786 from vector-im/t3chguy/patch-2 
Delete shortcuts.md
 2020-03-19 11:01:22 +00:00
Michael Telatynski 9055d0b8b5
Delete shortcuts.md 
The in-app keyboard shortcuts view has more.
https://github.com/matrix-org/matrix-react-sdk/pull/4231
 2020-03-19 10:52:48 +00:00
Travis Ralston e1eb16ce46 Use a local widget wrapper for Jitsi calls 
Effectively fixes https://github.com/vector-im/riot-web/issues/11074
Effectively fixes https://github.com/vector-im/riot-web/issues/7112
Fixes https://github.com/vector-im/riot-web/issues/6930
Fixes Jitsi widgets not working for guests (https://github.com/vector-im/riot-web/issues/8933)
Fixes https://github.com/vector-im/riot-web/issues/5048

Previously we were relying on an integration manager to be defined, functional, and alive in order to join Jitsi calls. This commit changes this so we aren't reliant on an integration manager for Jitsi calls at all, and gives people the option of choosing a Jitsi server via the config.json.

This side is just the wrapper/shell: the logic is mostly in the react-sdk (to be linked via PRs). This layer simply has an HTML file exported that can be used to render a Jitsi widget, and the react-sdk constructs a URL to access it locally. This is similar to how the mobile apps handle Jitsi widgets: instead of iframing the widget URL directly into the app, they pull apart the widget information and natively render it. We're effectively doing the same here by parsing the widget options and using our local wrapper instead of whatever happens to be defined in the widget state event.

Integration managers should still continue to offer a widget URL for Jitsi widgets as this is what the spec requires.

A large part of this is based upon Dimension's handling of Jitsi and widgets in general: a license has been granted to allow Riot (and therefore the react-sdk) to use the code and be inspired by it.
 2020-03-18 15:48:02 -06:00
Weblate 6b959b4a76 Merge branch 'origin/develop' into Weblate. 2020-03-18 14:04:05 +00:00
Michael Telatynski 7296b704a8
Merge pull request #12756 from vector-im/t3chguy/gemini 
Remove remainders of gemini-scrollbar and react-gemini-scrollbar
 2020-03-18 14:03:59 +00:00
Weblate f02a74a449 Merge branch 'origin/develop' into Weblate. 2020-03-18 11:43:43 +00:00
Elwyn Malethan 3a8a5febe9 Translated using Weblate (Welsh) 
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/cy/
 2020-03-18 11:43:42 +00:00
Pedro Silva a0fbae0971 Translated using Weblate (Portuguese) 
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/pt/
 2020-03-18 11:43:42 +00:00
J. Ryan Stinnett 3b8a34917f
Merge pull request #12762 from jaredsmith/patch-1 
Update electron to v7.1.14
 2020-03-18 11:43:37 +00:00
Alexis a366c68c38 Translated using Weblate (Portuguese) 
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/pt/
 2020-03-17 23:32:14 +00:00
Pedro Silva 93059366ab Translated using Weblate (Portuguese) 
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/pt/
 2020-03-17 23:32:14 +00:00
Jared Smith df9069090f
Update electron to v7.1.14 
Update dependency to electron version 7.1.4 to resolve issue where riot-web
has troubles syncing messages, and throws a "**CRASHING**:seccomp-bpf
failure in syscall 0230" error.  

See https://github.com/electron/electron/issues/22291 for more details.
 2020-03-17 10:51:39 -04:00
Weblate 77c5d55d38 Merge branch 'origin/develop' into Weblate. 2020-03-17 14:39:19 +00:00
RiotRobot a9fbf2f968 Reset matrix-react-sdk back to develop branch 2020-03-17 14:39:09 +00:00
RiotRobot 25a3449ad2 Reset matrix-js-sdk back to develop branch 2020-03-17 14:38:58 +00:00
Weblate 96c7765f5a Merge branch 'origin/develop' into Weblate. 2020-03-17 14:37:53 +00:00
RiotRobot b01c6e67fd Merge branch 'master' into develop 2020-03-17 14:37:28 +00:00
RiotRobot c4f3d39d42 v1.5.13 2020-03-17 14:31:49 +00:00
RiotRobot c84a01310f Prepare changelog for v1.5.13 2020-03-17 14:31:49 +00:00
RiotRobot 61bf0d5447 v1.5.13 2020-03-17 14:29:28 +00:00
RiotRobot 8002bc66d7 Upgrade matrix-react-sdk to 2.2.3 2020-03-17 14:29:06 +00:00
RiotRobot c3553a2649 Upgrade matrix-js-sdk to 5.1.1 2020-03-17 14:28:23 +00:00
Weblate 6854f2d7e8 Merge branch 'origin/develop' into Weblate. 2020-03-17 11:16:54 +00:00
Michael Telatynski 5913e3830b
Merge pull request #12735 from vector-im/t3chguy/url 
Add url tests to Modernizr
 2020-03-17 11:16:48 +00:00
Michael Telatynski 368d26af34 update yarn lock a little more forcibly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 10:36:26 +00:00
Weblate ebf4e03019 Merge branch 'origin/develop' into Weblate. 2020-03-17 10:32:39 +00:00
catborise 3e94b7d911 Translated using Weblate (Turkish) 
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/tr/
 2020-03-17 10:32:39 +00:00
Mejans 1fda6eb5ab Translated using Weblate (Occitan) 
Currently translated at 83.3% (20 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/oc/
 2020-03-17 10:32:39 +00:00
Michael Telatynski 8cef591c57 Remove remainders of gemini-scrollbar and react-gemini-scrollbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 10:31:46 +00:00
Damir Jelić 31faa4753c Merge branch 'poljar/delete-events' into develop 2020-03-17 10:17:21 +01:00
Mejans fe27939394 Added translation using Weblate (Occitan) 2020-03-16 20:06:50 +00:00
Travis Ralston 4155973b8a
Merge pull request #12744 from vector-im/dependabot/npm_and_yarn/electron_app/minimist-1.2.2 
Bump minimist from 1.2.0 to 1.2.2 in /electron_app
 2020-03-16 09:55:42 -06: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
Michael Telatynski eba63ce9ab Add url tests to Modernizr 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-14 00:13:47 +00:00
Travis Ralston 8e2eab21ae
Merge pull request #12731 from vector-im/travis/theme-poc 
Add docs and flag for custom theme support
 2020-03-13 09:48:03 -06:00
Travis Ralston 98bd951366 Add docs and flag for custom theme support 2020-03-13 09:34:16 -06:00
Travis Ralston 7c8363c85e
Merge pull request #12716 from vector-im/travis/ts-2 
Declare jsx in tsconfig for IDEs
 2020-03-13 09:25:16 -06:00
Travis Ralston b419afad40 Declare jsx in tsconfig for IDEs 2020-03-12 13:37:28 -06:00
Travis Ralston 139bf536e4
Merge pull request #12713 from vector-im/travis/yarn-cleanup 
Remove stuff that yarn install doesn't think we need
 2020-03-12 10:58:28 -06:00
Travis Ralston e110c8ed9b Remove stuff that yarn install doesn't think we need 2020-03-12 10:47:34 -06:00
Damir Jelić 20a89d67cb ElectronPlatform: Add support to remove events from the event index. 2020-03-12 11:51:34 +01:00
David Baker ce9a964956
Merge pull request #12691 from vector-im/dbkr/yarn_upgrade_20200311 
yarn upgrade
 2020-03-12 09:45:45 +00:00