OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,899 Commits
207 Branches
550 Tags
419 MiB
Commit Graph

9899 Commits (fe98a8b0c2b6298508afe66b884be35e48380d3c)

Author SHA1 Message Date
Travis Ralston 15a8ee6663 Merge branch 'develop' into travis/widget-api 2020-09-29 13:17:18 -06:00
Weblate d42e5ea1d8 Merge branch 'origin/develop' into Weblate. 2020-09-29 17:06:47 +00:00
Travis Ralston 20c6e6dd73
Merge pull request #15316 from vector-im/travis/jitsi-widget 
Give the Jitsi widget an icon to help with discovery
 2020-09-29 11:06:42 -06:00
Weblate b8b5c30eb6 Merge branch 'origin/develop' into Weblate. 2020-09-29 17:06:33 +00:00
Travis Ralston 7d3ccb6242
Merge pull request #15219 from vector-im/travis/ft-sep1620/04-jitsi-hangup 
Jitsi widget wrapper updates for hangup button
 2020-09-29 11:06:28 -06:00
Travis Ralston 7ef0702df4 re-todo 2020-09-29 11:04:08 -06:00
Travis Ralston a1e6b019d2 Give the Jitsi widget an icon to help with discovery 
We think users will be expecting to follow a series of icons into their conference, so we'll remind them here of what is going on with a giant icon.

This does not change depending on the call type because the jitsi widget doesn't understand the call type anyways - it's always a video conference.
 2020-09-29 11:01:26 -06:00
Travis Ralston 97afe18310 Merge branch 'develop' into travis/widget-api 2020-09-28 21:09:10 -06:00
Weblate 736c575f1b Merge branch 'origin/develop' into Weblate. 2020-09-28 15:47:20 +00:00
Michael Telatynski aa9b517664
Merge pull request #15271 from vector-im/t3chguy/fix/15265 
Tidy up Service Worker, only run Workbox in production
 2020-09-28 16:47:15 +01:00
Weblate 984f5ac901 Merge branch 'origin/develop' into Weblate. 2020-09-28 15:33:56 +00:00
John 6a89776404 Translated using Weblate (Greek) 
Currently translated at 90.9% (30 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.riot.im/projects/element-web/element-web/el/
 2020-09-28 15:33:56 +00:00
RiotRobot 11600238ed Merge branch 'master' into develop 2020-09-28 16:33:11 +01:00
RiotRobot 802829f0ea v1.7.8 2020-09-28 16:28:04 +01:00
RiotRobot a42eb0ce42 Prepare changelog for v1.7.8 2020-09-28 16:28:04 +01:00
RiotRobot 4d84df11c4 Upgrade matrix-react-sdk to 3.5.0 2020-09-28 16:25:04 +01:00
RiotRobot 191fd2fb2d Upgrade matrix-js-sdk to 8.4.1 2020-09-28 16:24:30 +01:00
Adrià 0f7a207c3e Translated using Weblate (Catalan) 
Currently translated at 93.9% (31 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.riot.im/projects/element-web/element-web/ca/
 2020-09-27 16:04:58 +00:00
linsui 6c92e794f9 Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2020-09-26 05:04:56 +00:00
Travis Ralston c114932da0 Merge branch 'develop' into travis/widget-api 2020-09-25 09:38:52 -06:00
David Baker 4eb5bb2bae
Merge pull request #15274 from vector-im/dbkr/remove_conferencehandler 
Remove conference handler
 2020-09-25 15:52:25 +01:00
Travis Ralston 82749c3de3 Fix Jitsi for new widget-api 2020-09-24 13:25:59 -06:00
David Baker c988988a70 This is unused now 2020-09-24 16:44:05 +01:00
David Baker b31bf6cfca Remove conference handler 2020-09-24 16:19:00 +01:00
Michael Telatynski c47532fe2a Tidy up Service Worker, only run Workbox in production 
Moves ServiceWorker load into Platform so its not done by Electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-24 13:01:34 +01:00
Travis Ralston 7b8010f23a
Merge pull request #15266 from vector-im/travis/rebrand-webpack 
Rebrand the webpack pipeline for Element
 2020-09-23 16:05:23 -06:00
Travis Ralston 14daccecfc Rebrand the webpack pipeline for Element 2020-09-23 12:39:10 -06:00
Travis Ralston b9b859dd28 Merge branch 'develop' into travis/widget-api 2020-09-23 12:00:54 -06:00
Michael Telatynski 477b7a362b
Merge pull request #15196 from vector-im/t3chguy/fix/12591 
Replace dummy sw.js with pre-caching and runtime-caching workbox SW
 2020-09-23 17:03:26 +01:00
RiotRobot 7f6c2bbe44 v1.7.8-rc.1 2020-09-23 15:45:46 +01:00
RiotRobot 63a5156fa0 Prepare changelog for v1.7.8-rc.1 2020-09-23 15:45:45 +01:00
RiotRobot 3939a1dc1e Add sanitize-html types 2020-09-23 15:43:53 +01:00
RiotRobot b0de2d9108 Upgrade matrix-react-sdk to 3.5.0-rc.1 2020-09-23 15:35:23 +01:00
RiotRobot 6223d0742d Upgrade matrix-js-sdk to 8.4.0-rc.1 2020-09-23 15:35:02 +01:00
J. Ryan Stinnett 7f327009bb
Merge pull request #15262 from RiotTranslateBot/weblate-element-web-element-web 
Update from Weblate
 2020-09-23 14:46:52 +01:00
Weblate df712626ca Merge branch 'origin/develop' into Weblate. 2020-09-23 09:06:57 +00:00
J. Ryan Stinnett df48e3f359
Merge pull request #15260 from vector-im/jryans/large-tables 
Upgrade sanitize-html
 2020-09-23 10:06:51 +01:00
J. Ryan Stinnett 9e7ff5e126 Upgrade sanitize-html 
Part of https://github.com/vector-im/element-web/issues/15122
 2020-09-22 18:07:17 +01:00
Weblate 429e498b17 Merge branch 'origin/develop' into Weblate. 2020-09-22 15:07:49 +00:00
J. Ryan Stinnett 48a1c49b73
Merge pull request #15251 from vector-im/jryans/secure-backup-setup-methods 
Document config for preferring Secure Backup setup methods
 2020-09-22 16:07:44 +01:00
Travis Ralston c7617c2538 Fix bad merge 2020-09-22 09:01:55 -06:00
Travis Ralston 465a2ce314 Merge branch 'develop' into travis/widget-api 2020-09-22 09:00:48 -06:00
J. Ryan Stinnett 307f7c23e9 Document config for preferring Secure Backup setup methods 
Part of https://github.com/vector-im/element-web/issues/15238
 2020-09-21 15:56:38 +01:00
Weblate e409d61c6f Merge branch 'origin/develop' into Weblate. 2020-09-18 21:06:41 +00:00
Travis Ralston 76463e836e
Merge pull request #15190 from vector-im/travis/ui-func/docs 
Add end-user documentation for UI features
 2020-09-18 15:06:35 -06:00
Travis Ralston c364215d53 Add missing options 2020-09-18 12:24:06 -06:00
Travis Ralston 72d1950bea Update documentation for UI Features 2020-09-17 22:22:11 -06:00
Travis Ralston 05d5e3f680 Remove debugging 2020-09-17 14:59:43 -06:00
Travis Ralston 737fa7dca5 Jitsi widget wrapper updates for hangup button 
See https://github.com/matrix-org/matrix-react-sdk/pull/5223
 2020-09-16 14:39:40 -06:00
Weblate 13ad72af50 Merge branch 'origin/develop' into Weblate. 2020-09-16 20:36:39 +00:00