7e404ace8c
Update contribute.json
2020-09-30 12:29:45 +01:00
9f6a9e101c
Riot -> Element in contribute.json
2020-09-30 11:00:47 +00:00
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
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
7ef0702df4
re-todo
2020-09-29 11:04:08 -06:00
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
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
11600238ed
Merge branch 'master' into develop
2020-09-28 16:33:11 +01:00
802829f0ea
v1.7.8
2020-09-28 16:28:04 +01:00
a42eb0ce42
Prepare changelog for v1.7.8
2020-09-28 16:28:04 +01:00
4d84df11c4
Upgrade matrix-react-sdk to 3.5.0
2020-09-28 16:25:04 +01:00
191fd2fb2d
Upgrade matrix-js-sdk to 8.4.1
2020-09-28 16:24:30 +01:00
4eb5bb2bae
Merge pull request #15274 from vector-im/dbkr/remove_conferencehandler
...
Remove conference handler
2020-09-25 15:52:25 +01:00
c988988a70
This is unused now
2020-09-24 16:44:05 +01:00
b31bf6cfca
Remove conference handler
2020-09-24 16:19:00 +01:00
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
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
14daccecfc
Rebrand the webpack pipeline for Element
2020-09-23 12:39:10 -06:00
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
7f6c2bbe44
v1.7.8-rc.1
2020-09-23 15:45:46 +01:00
63a5156fa0
Prepare changelog for v1.7.8-rc.1
2020-09-23 15:45:45 +01:00
3939a1dc1e
Add sanitize-html types
2020-09-23 15:43:53 +01:00
b0de2d9108
Upgrade matrix-react-sdk to 3.5.0-rc.1
2020-09-23 15:35:23 +01:00
6223d0742d
Upgrade matrix-js-sdk to 8.4.0-rc.1
2020-09-23 15:35:02 +01:00
7f327009bb
Merge pull request #15262 from RiotTranslateBot/weblate-element-web-element-web
...
Update from Weblate
2020-09-23 14:46:52 +01:00
df712626ca
Merge branch 'origin/develop' into Weblate.
2020-09-23 09:06:57 +00:00
df48e3f359
Merge pull request #15260 from vector-im/jryans/large-tables
...
Upgrade sanitize-html
2020-09-23 10:06:51 +01:00
9e7ff5e126
Upgrade sanitize-html
...
Part of https://github.com/vector-im/element-web/issues/15122
2020-09-22 18:07:17 +01:00
429e498b17
Merge branch 'origin/develop' into Weblate.
2020-09-22 15:07:49 +00:00
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
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
e409d61c6f
Merge branch 'origin/develop' into Weblate.
2020-09-18 21:06:41 +00:00
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
c364215d53
Add missing options
2020-09-18 12:24:06 -06:00
72d1950bea
Update documentation for UI Features
2020-09-17 22:22:11 -06:00
05d5e3f680
Remove debugging
2020-09-17 14:59:43 -06:00
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
13ad72af50
Merge branch 'origin/develop' into Weblate.
2020-09-16 20:36:39 +00:00
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
88459b976c
Merge pull request #15218 from vector-im/toml-docs-suggestion
...
Update README.md
2020-09-16 14:36:33 -06:00
cad03d0c47
Update README.md
...
Including `git checkout develop` in the dev env instructions is redundant and confusing (since `develop` is already the default branch)
2020-09-16 21:34:00 +01:00
60fe779f42
Merge branch 'origin/develop' into Weblate.
2020-09-15 14:58:45 +00:00
8c31911677
Merge pull request #15201 from vector-im/t3chguy/fix/15172
...
If no bug_report_endpoint_url, hide rageshaking from the App
2020-09-15 15:58:40 +01:00
40813a6b33
If no bug_report_endpoint_url, hide rageshaking from the App
2020-09-15 15:49:25 +01:00
c76a5f2c52
Attempt to fix tests some more
2020-09-15 13:19:47 +01:00
85979079f1
Add end-user documentation for UI features
2020-09-14 22:28:57 -06:00
fd11b12652
Merge branch 'origin/develop' into Weblate.
2020-09-14 15:13:30 +00:00
df5cb15cf9
Reset matrix-react-sdk back to develop branch
2020-09-14 16:10:18 +01:00
82cfc751af
Reset matrix-js-sdk back to develop branch
2020-09-14 16:10:08 +01:00
62bfc35a8d
Merge branch 'master' into develop
2020-09-14 16:09:30 +01:00
J. Ryan Stinnett