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

9862 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Travis Ralston
88459b976c
Merge pull request #15218 from vector-im/toml-docs-suggestion 
Update README.md
 2020-09-16 14:36:33 -06:00
Tom Lant
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
Weblate
60fe779f42 Merge branch 'origin/develop' into Weblate. 2020-09-15 14:58:45 +00:00
Michael Telatynski
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
Michael Telatynski
40813a6b33 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Michael Telatynski
c76a5f2c52 Attempt to fix tests some more 2020-09-15 13:19:47 +01:00
Travis Ralston
85979079f1 Add end-user documentation for UI features 2020-09-14 22:28:57 -06:00
Weblate
fd11b12652 Merge branch 'origin/develop' into Weblate. 2020-09-14 15:13:30 +00:00
RiotRobot
df5cb15cf9 Reset matrix-react-sdk back to develop branch 2020-09-14 16:10:18 +01:00
RiotRobot
82cfc751af Reset matrix-js-sdk back to develop branch 2020-09-14 16:10:08 +01:00
RiotRobot
62bfc35a8d Merge branch 'master' into develop 2020-09-14 16:09:30 +01:00
RiotRobot
2f4299e836 v1.7.7 2020-09-14 16:00:49 +01:00
RiotRobot
3d53908686 Prepare changelog for v1.7.7 2020-09-14 16:00:49 +01:00
RiotRobot
0eccd03a78 Upgrade matrix-react-sdk to 3.4.1 2020-09-14 15:57:32 +01:00
Weblate
ebe0d2469e Merge branch 'origin/develop' into Weblate. 2020-09-14 12:51:48 +00:00
RiotRobot
8b2560dbef Reset matrix-react-sdk back to develop branch 2020-09-14 13:51:40 +01:00
RiotRobot
451842f2bf Reset matrix-js-sdk back to develop branch 2020-09-14 13:51:31 +01:00
Weblate
6879addc7a Merge branch 'origin/develop' into Weblate. 2020-09-14 12:51:13 +00:00
RiotRobot
cd392425a4 Merge branch 'master' into develop 2020-09-14 13:49:30 +01:00
RiotRobot
70febe3109 v1.7.6 2020-09-14 13:46:13 +01:00
RiotRobot
9ed26c66a6 Prepare changelog for v1.7.6 2020-09-14 13:46:13 +01:00
RiotRobot
6d124e6c28 Upgrade matrix-react-sdk to 3.4.0 2020-09-14 13:44:41 +01:00
RiotRobot
c8a0d94b61 Upgrade matrix-js-sdk to 8.3.0 2020-09-14 13:42:53 +01:00
Safa Alfulaij
9f15bc2bbf Translated using Weblate (Arabic) 
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/ar/
 2020-09-13 10:42:56 +00:00
yuuki-san
4cd9560d21 Translated using Weblate (Slovak) 
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/sk/
 2020-09-11 12:42:53 +00:00
Salih Emin
c88ba8e212 Translated using Weblate (Greek) 
Currently translated at 51.5% (17 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.riot.im/projects/element-web/element-web/el/
 2020-09-11 12:42:53 +00:00
J. Ryan Stinnett
f14bd05cfb
Merge pull request #15153 from vector-im/dependabot/npm_and_yarn/node-fetch-2.6.1 
Bump node-fetch from 2.6.0 to 2.6.1
 2020-09-11 12:26:32 +01:00
dependabot[bot]
d1aed25815
Bump node-fetch from 2.6.0 to 2.6.1 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-11 11:02:13 +00:00
J. Ryan Stinnett
743c869055
Merge pull request #15137 from vector-im/jryans/remove-travis-refs 
Remove references to Travis CI
 2020-09-11 09:39:21 +01:00
Michael Telatynski
a700502086
Merge pull request #15127 from vector-im/t3chguy/fix/3543 
Fix onNewScreen to use replace when going from roomId->roomAlias
 2020-09-11 07:29:12 +01:00
J. Ryan Stinnett
fa7eaedaa7
Merge pull request #15136 from vector-im/jryans/langs-2020-09 
Enable Estonian in language menu
 2020-09-10 14:28:27 +01:00
J. Ryan Stinnett
7262b372b3 Remove references to Travis CI 
Also cleans up a Riot reference as well

Part of https://github.com/vector-im/element-web/issues/15098
 2020-09-10 10:16:29 +01:00
J. Ryan Stinnett
6853cabca2 Enable Estonian in language menu 
Fixes https://github.com/vector-im/element-web/issues/15135
 2020-09-10 10:03:13 +01:00
Michael Telatynski
ac447fd318 Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place 2020-09-09 16:52:48 +01:00
RiotRobot
cf448f1f0a v1.7.6-rc.1 2020-09-09 16:00:06 +01:00
RiotRobot
ff2fe80537 Prepare changelog for v1.7.6-rc.1 2020-09-09 16:00:06 +01:00