OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,861 Commits
187 Branches
523 Tags
443 MiB
Commit Graph

9861 Commits (t3chguy/feat/modal-widgets)

Author SHA1 Message Date
Michael Telatynski ad15747c21 Iterate Modal Widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 20:39:44 +01:00
Michael Telatynski 55e6ff9b2d Merge branch 't3chguy/feat/widgets' of github.com:vector-im/riot-web into t3chguy/demo/widgets2020 2020-10-19 19:38:25 +01:00
Michael Telatynski c75a4add42 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/feat/widgets 2020-10-19 18:51:22 +01:00
Michael Telatynski 4d8fe1f7f3 Jitsi accept theme variable and restyle 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:51:16 +01:00
J. Ryan Stinnett 69c7d08941
Merge pull request #15495 from vector-im/jryans/events-lib 
Adjust for new widget messaging APIs
 2020-10-19 17:31:04 +01:00
J. Ryan Stinnett 06aa5a9aa9 Shake lock file 2020-10-19 17:08:07 +01:00
J. Ryan Stinnett 0f76c858ac Upgrade widget API 2020-10-19 16:57:18 +01:00
J. Ryan Stinnett dfb1579625 Adjust for new widget messaging APIs 
As part of changing to the `events` package, the API surface changed slightly.

Related to https://github.com/vector-im/element-web/issues/15493
 2020-10-19 16:43:55 +01:00
Travis Ralston b8662b43d8
Merge pull request #15479 from denzs/develop 
Use HTTPS_PROXY environment variable for downloading external_api.min…
 2020-10-16 13:15:15 -06:00
Travis Ralston 44bf49d414
Update scripts/build-jitsi.js 2020-10-16 13:15:08 -06:00
Sebastian Denz 7f4f9b2cf1 Use HTTPS_PROXY environment variable for downloading external_api.min.js if set 2020-10-16 14:48:28 +02:00
J. Ryan Stinnett acca9005a9
Merge pull request #15475 from vector-im/jryans/doc-customisations 
Document customisation points
 2020-10-16 12:27:30 +01:00
J. Ryan Stinnett 4053d598f8 Update README.md link 2020-10-16 11:32:57 +01:00
J. Ryan Stinnett f37b63a6cb
Fix file extension 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-10-16 11:22:28 +01:00
J. Ryan Stinnett 7793f07c81 Document customisation points 
https://github.com/matrix-org/matrix-react-sdk/pull/5327 adds a concept of
"customisation points" to keep custom functionality contained. This adds some
general guidance on how to use them.
 2020-10-15 18:01:38 +01:00
Travis Ralston c2a9157258
Merge pull request #15466 from vector-im/travis/jitsi-popout-fix 
Don't fatally end the Jitsi widget when it's not being used as a widget
 2020-10-14 16:36:59 -06:00
Travis Ralston 917a85ead9 Don't fatally end the Jitsi widget when it's not being used as a widget 2020-10-14 16:16:08 -06:00
Michael Telatynski 22e3286b96 fix 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 10:26:50 +01:00
Damir Jelić 0507cd2d90 electron-platform: Use camel case for the user/device id. 2020-10-13 17:04:40 +02:00
Damir Jelić 5350c5e551 electron-platform: Pass the user/devce id pair when initializing the event index. 2020-10-13 16:36:38 +02:00
Michael Telatynski 97b3a4a3e0 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/feat/widgets 2020-10-13 13:46:56 +01:00
RiotRobot f8e84c42ad Reset matrix-react-sdk back to develop branch 2020-10-12 13:59:58 +01:00
RiotRobot fd2895eb40 Reset matrix-js-sdk back to develop branch 2020-10-12 13:59:47 +01:00
RiotRobot d4d1b957af v1.7.9 2020-10-12 13:56:01 +01:00
RiotRobot 04f95cc555 Prepare changelog for v1.7.9 2020-10-12 13:56:01 +01:00
RiotRobot 2d03ccfa57 Upgrade matrix-react-sdk to 3.6.0 2020-10-12 13:40:53 +01:00
RiotRobot ed86341ba5 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:40:35 +01:00
Michael Telatynski b66ab3991b Update sample widgets with new matrix-widget-api interfaces 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-08 15:24:07 +01:00
Michael Telatynski 2ed497bcf6 Merge branch 't3chguy/demo/widgets2020' of github.com:vector-im/riot-web into t3chguy/feat/widgets 2020-10-08 13:10:14 +01:00
RiotRobot c0143e58a2 v1.7.9-rc.1 2020-10-07 14:44:54 +01:00
RiotRobot 75c9bad10d Prepare changelog for v1.7.9-rc.1 2020-10-07 14:44:53 +01:00
RiotRobot b5f114c157 Upgrade matrix-react-sdk to 3.6.0-rc.1 2020-10-07 14:39:28 +01:00
RiotRobot 27ff4e9488 Upgrade matrix-js-sdk to 8.5.0-rc.1 2020-10-07 14:36:06 +01:00
J. Ryan Stinnett 54f92bd483
Merge pull request #15406 from RiotTranslateBot/weblate-element-web-element-web 
Update from Weblate
 2020-10-07 13:39:27 +01:00
Weblate aeca2571e8 Merge branch 'origin/develop' into Weblate. 2020-10-07 09:43:48 +00:00
Michael Telatynski 25eb587e3b
Merge pull request #15402 from vector-im/t3chguy/fix/10353 
Update Jest and JSDOM
 2020-10-07 10:43:43 +01:00
Weblate ea059bbd7d Merge branch 'origin/develop' into Weblate. 2020-10-07 09:20:09 +00:00
J. Ryan Stinnett 06f434c313
Merge pull request #15398 from uhoreg/dehydration 
Add support for dehydration/fallback keys
 2020-10-07 10:20:03 +01:00
Michael Telatynski 07c0b20075 Update Jest and JSDOM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:08:41 +01:00
Hubert Chathi 72aeb6ea5d bump olm version again 2020-10-06 18:04:13 -04:00
Hubert Chathi 520e6e5fef update yarn.lock 2020-10-06 15:33:39 -04:00
Hubert Chathi e710346fd6 depend on newer olm 2020-10-06 15:30:36 -04:00
Hubert Chathi 49fd9f827d document dehydration feature flag 2020-10-06 15:29:45 -04:00
Weblate 5fdeb23ca0 Merge branch 'origin/develop' into Weblate. 2020-10-05 16:14:51 +00:00
J. Ryan Stinnett 9700ff9083
Merge pull request #15376 from vector-im/jryans/remove-outdated-config 
Remove riot-bot from sample config
 2020-10-05 17:14:45 +01:00
J. Ryan Stinnett 7b209bdf9f Remove riot-bot from sample config 
`riot-bot` is no longer recommended these days, and it causes confusion to have
in the sample config.

Fixes https://github.com/vector-im/element-web/issues/15357
 2020-10-05 16:02:01 +01:00
Weblate 910ab3583f Merge branch 'origin/develop' into Weblate. 2020-10-01 16:16:17 +00:00
Travis Ralston 5f353c4907
Merge pull request #15102 from vector-im/travis/widget-api 
Switch to using the Widget API SDK for Jitsi widgets
 2020-10-01 10:16:11 -06:00
Travis Ralston 9cb823b210 Fix join button 2020-10-01 09:59:13 -06:00
Weblate 947c6b2365 Merge branch 'origin/develop' into Weblate. 2020-10-01 13:40:32 +00:00