OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,546 Commits
218 Branches
563 Tags
447 MiB
Commit Graph

10546 Commits (c08b7be434b128e4b472c32723c6194608aa30d4)

Author SHA1 Message Date
Damir Jelić 5350c5e551 electron-platform: Pass the user/devce id pair when initializing the event index. 2020-10-13 16:36:38 +02:00
Weblate 97314f2c9e Merge branch 'origin/develop' into Weblate. 2020-10-12 13:00:06 +00: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
Weblate dc73505c84 Merge branch 'origin/develop' into Weblate. 2020-10-12 12:59:28 +00: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
Marcelo Filho 4ee538117b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.riot.im/projects/element-web/element-web/pt_BR/
 2020-10-10 19:05:21 +00:00
Marcelo Filho 3402236a0c Translated using Weblate (Portuguese) 
Currently translated at 42.4% (14 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.riot.im/projects/element-web/element-web/pt/
 2020-10-10 19:05:21 +00:00
Aleks Kissinger 89ce904ebb Merge branch 'develop' into katex 2020-10-10 19:32:35 +01:00
Aleks Kissinger 1dae7df28a added doc for latex_maths feature flag 2020-10-10 19:01:30 +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
Michael Telatynski 7b71db94e0
Merge pull request #15352 from vector-im/t3chguy/remove-workbox 
Remove workbox
 2020-10-01 14:40:26 +01:00
Michael Telatynski ad95d1fa64 Update yarn.lock 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:06:28 +01:00
Michael Telatynski cfee4c925a Revert "Attempt to fix tests some more" 
This reverts commit c76a5f2c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:05:07 +01:00
Michael Telatynski 1edbe36547 Revert "Tidy up Service Worker, only run Workbox in production" 
This reverts commit c47532fe

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:32 +01:00
Michael Telatynski 87c42934ea Revert "Disable workbox when running in webpack dev server, not in dev mode" 
This reverts commit 11e676ce

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:21 +01:00
Michael Telatynski daa755017e Revert "consolidate" 
This reverts commit aa2f3918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:11 +01:00
Travis Ralston cdf9547220 Appease the linter 2020-09-30 20:51:31 -06:00
Travis Ralston 408766366c Use the beta release of the widget-api 2020-09-30 20:43:21 -06:00
Travis Ralston 7b93c56bd0 Fix custom hangup button 2020-09-30 20:09:42 -06:00
Weblate b29498bfae Merge branch 'origin/develop' into Weblate. 2020-09-30 18:26:37 +00:00
Michael Telatynski ca78985abc
Merge pull request #15345 from vector-im/t3chguy/fix/workbox 
Disable workbox when running in webpack dev server, not in dev mode
 2020-09-30 19:26:31 +01:00
Michael Telatynski aa2f3918cc consolidate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 17:36:57 +01:00
Michael Telatynski 11e676cee0 Disable workbox when running in webpack dev server, not in dev mode 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 17:35:12 +01:00
Weblate 0191d65bac Merge branch 'origin/develop' into Weblate. 2020-09-30 13:37:14 +00:00
Travis Ralston 8f1a641e6d
Merge pull request #15326 from resynth1943/patch-4 
Update Riot -> Element in contribute.json
 2020-09-30 07:37:08 -06:00
Weblate 7a2b103165 Merge branch 'origin/develop' into Weblate. 2020-09-30 12:42:03 +00:00