Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 12:45:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,686 Commits 207 Branches 552 Tags 516 MiB
cad03d0c47
Commit Graph

9686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
RiotRobot
2ad02e4feb Upgrade matrix-react-sdk to 3.4.0-rc.1 2020-09-09 15:56:58 +01:00
RiotRobot
fcdda7a956 Upgrade matrix-js-sdk to 8.3.0-rc.1 2020-09-09 15:56:42 +01:00
J. Ryan Stinnett
eaa46d1794
Merge pull request #15125 from RiotTranslateBot/weblate-element-web-element-web 
Update from Weblate
 2020-09-09 14:44:18 +01:00
Weblate
0f633d922e Merge branch 'origin/develop' into Weblate. 2020-09-09 13:37:52 +00:00
TERMICO
5a5be814b6 Translated using Weblate (Spanish) 
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/es/
 2020-09-09 13:37:52 +00:00
riverside6
bbfbef7f24 Translated using Weblate (German) 
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/de/
 2020-09-09 13:37:52 +00:00
Travis Ralston
da0afeda9b
Merge pull request #15114 from vector-im/jaywink/jitsi-openidjwt-auth 
Support usage of Jitsi widgets with "openidtoken-jwt" auth
 2020-09-08 08:19:07 -06:00
Jason Robinson
7018a498a7 Quieten some IDE warnings 2020-09-08 12:52:17 +03:00
Jason Robinson
579650a1dd Move most of the OpenID token flow to WidgetAPI 2020-09-08 12:50:53 +03:00
Jason Robinson
a7abd8599e More usage of constants 2020-09-08 11:44:11 +03:00
Jason Robinson
3309b2ec55 Block on matrix-org/matrix-react-sdk#5172 
And shuffle code around a bit.
 2020-09-08 11:37:50 +03:00
Jason Robinson
151dd5709c
Fix import 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-09-08 11:32:09 +03:00
Jason Robinson
21c862fe2b Remove console.log 2020-09-07 20:47:07 +03:00
Jason Robinson
3b434a70d2 Fix typo 2020-09-07 20:36:26 +03:00
Jason Robinson
acfd7252bd Remove todo 2020-09-07 20:26:05 +03:00
Jason Robinson
4164df647c Improve error messsage of Jitsi widget 
If openidtoken request fails, show
an error. Also render error a bit nicer
in generic widget load errors.
 2020-09-07 19:51:16 +03:00
Jason Robinson
2205f0611e Add some links to the openidtoken-jwt spec 2020-09-07 19:25:44 +03:00
Jason Robinson
0410a6b3be Use Jitsi domain in the JWT issuer 2020-09-07 19:23:36 +03:00
Jason Robinson
8534328921 Implement OpenID token fetch from Jitsi widget 
Using MSC1960 to fetch an OpenID token via postmessage API. This is needed
for Jitsi openidtoken-jwt auth.
 2020-09-07 18:10:19 +03:00
Jason Robinson
5108697ac8 Add support for Jitsi openidtoken-jwt auth 
If the widget URL specifies this auth, generate a JWT token
containing the info needed by the Jitsi backend.
 2020-09-04 13:14:52 +03:00
@a2sc:matrix.org
e608c92506 Translated using Weblate (German) 
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/de/
 2020-09-02 13:42:40 +00:00
RiotRobot
e5a4092adc Reset matrix-react-sdk back to develop branch 2020-09-01 17:51:03 +01:00
RiotRobot
3ed750a9ab Reset matrix-js-sdk back to develop branch 2020-09-01 17:50:49 +01:00
RiotRobot
7f8326e245 Merge branch 'master' into develop 2020-09-01 17:50:12 +01:00