OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,021 Commits
186 Branches
525 Tags
448 MiB
Commit Graph

10021 Commits (ec781b3ebea3bd2ad9b3d434d6f1162cabb21e74)

Author SHA1 Message Date
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
J. Ryan Stinnett 77c64fa03c
Merge pull request #15336 from resynth1943/patch-14 
Update Riot -> Element in redeploy.py
 2020-09-30 13:41:58 +01:00
Weblate 184c37077b Merge branch 'origin/develop' into Weblate. 2020-09-30 12:41:06 +00:00
J. Ryan Stinnett 4753a49819
Merge pull request #15325 from resynth1943/patch-3 
Update Riot -> Element in docs/feature-flags.md
 2020-09-30 13:41:02 +01:00
Qt Resynth db08128954
Riot -> Element 2020-09-30 12:04:01 +00:00
Qt Resynth 1d06496bd1
Update Riot -> Element in redeploy.py 2020-09-30 12:00:52 +00:00
Qt Resynth 48f71f26e7
Apply suggestions from code review 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2020-09-30 11:58:44 +00:00
J. Ryan Stinnett 7e404ace8c
Update contribute.json 2020-09-30 12:29:45 +01:00
Weblate f54d265f90 Merge branch 'origin/develop' into Weblate. 2020-09-30 11:29:09 +00:00
J. Ryan Stinnett fe535fc1e3
Merge pull request #15327 from resynth1943/patch-5 
Update Riot -> Element in element.io/README.md
 2020-09-30 12:29:04 +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 e0b05678e5 Merge branch 'origin/develop' into Weblate. 2020-09-30 11:28:01 +00:00
J. Ryan Stinnett 0564f4097b
Merge pull request #15330 from resynth1943/patch-8 
Update Riot -> Element in docs/review.md
 2020-09-30 12:27:57 +01:00
Weblate 313489801d Merge branch 'origin/develop' into Weblate. 2020-09-30 11:27:32 +00:00
J. Ryan Stinnett e65351073e
Merge pull request #15332 from resynth1943/patch-10 
Update Riot -> Element in welcome.html
 2020-09-30 12:27:28 +01:00
Weblate 8892ad9bb0 Merge branch 'origin/develop' into Weblate. 2020-09-30 11:27:00 +00:00
J. Ryan Stinnett c9733c568e
Merge pull request #15333 from resynth1943/patch-11 
Update Riot -> Element in issues-burndown.pl
 2020-09-30 12:26:56 +01:00
Weblate d8dea01ae5 Merge branch 'origin/develop' into Weblate. 2020-09-30 11:26:02 +00:00
J. Ryan Stinnett 8414dbdb99
Merge pull request #15334 from resynth1943/patch-12 
Update Riot -> Element in redeploy.py
 2020-09-30 12:25:58 +01:00
Weblate 4b137b639e Merge branch 'origin/develop' into Weblate. 2020-09-30 11:24:46 +00:00
J. Ryan Stinnett 53c5626bc8
Merge pull request #15335 from resynth1943/patch-13 
Update Riot -> Element in index.ts
 2020-09-30 12:24:42 +01:00
Weblate 3c13a5c6c6 Merge branch 'origin/develop' into Weblate. 2020-09-30 11:24:06 +00:00
J. Ryan Stinnett f703124895
Merge pull request #15324 from resynth1943/patch-2 
Update Riot -> Element Web in issue templates
 2020-09-30 12:24:02 +01:00