PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
9824 commits 1 branch 0 tags 338 MiB
Commit graph

5170 commits

Author SHA1 Message Date
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
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
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
2a5b389053 Merge branch 'origin/develop' into Weblate. 2020-09-30 11:28:34 +00:00
J. Ryan Stinnett
991a1e743c
Merge pull request #15328 from resynth1943/patch-6 
Update Riot -> Element in VectorAuthFooter
 2020-09-30 12:28:29 +01:00
Weblate
c710cde50c Merge branch 'origin/develop' into Weblate. 2020-09-30 11:28:16 +00:00
J. Ryan Stinnett
05551219ac
Merge pull request #15329 from resynth1943/patch-7 
Update Riot -> Element in VectorEmbeddedPage
 2020-09-30 12:28:12 +01:00
Weblate
4b137b639e Merge branch 'origin/develop' into Weblate. 2020-09-30 11:24:46 +00:00
Qt Resynth
10d6fbaef7
Update Riot -> Element in index.ts 2020-09-30 11:10:35 +00:00
Qt Resynth
d5d3bcfac3
Riot -> Element in VectorEmbeddedPage 2020-09-30 11:04:28 +00:00
Qt Resynth
b440a263bd
Riot -> Element in VectorAuthFooter 
I'm so sorry :-)
 2020-09-30 11:03:37 +00:00
Travis Ralston
c56368cdbb Fix hangup button handler 2020-09-29 13:20:16 -06:00
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
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
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
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
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
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
Mirza Arnaut
ba1af283f6 Translated using Weblate (Bosnian) 
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/bs/
 2020-09-16 20:36:38 +00:00
Weblate
60fe779f42 Merge branch 'origin/develop' into Weblate. 2020-09-15 14:58:45 +00:00