OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
30,171 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

30171 Commits (be9b68a4dd3d453548b5e1562019998bd28170de)

Author SHA1 Message Date
Weblate 0fe5afa756 Merge branch 'origin/develop' into Weblate. 2020-12-07 12:33:28 +00:00
RiotRobot 7d41604569 Reset matrix-js-sdk back to develop branch 2020-12-07 12:33:18 +00:00
Weblate ed075c7a6d Merge branch 'origin/develop' into Weblate. 2020-12-07 12:32:31 +00:00
RiotRobot 6360bc7a01 Merge branch 'master' into develop 2020-12-07 12:32:20 +00:00
RiotRobot fefe84d101 v3.10.0 2020-12-07 12:31:08 +00:00
RiotRobot ae835fb8a9 Prepare changelog for v3.10.0 2020-12-07 12:31:07 +00:00
RiotRobot 1241b7c335 Upgrade matrix-js-sdk to 9.3.0 2020-12-07 12:13:04 +00:00
Weblate 0747d49912 Merge branch 'origin/develop' into Weblate. 2020-12-07 10:19:12 +00:00
Priit Jõerüüt 51ededb94d Translated using Weblate (Estonian) 
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-12-07 10:19:12 +00:00
XoseM 81c16555f6 Translated using Weblate (Galician) 
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-12-07 10:19:10 +00:00
Tirifto 5178d335ec Translated using Weblate (Czech) 
Currently translated at 77.1% (2084 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2020-12-07 10:19:08 +00:00
waclaw66 fdeeb26cbe Translated using Weblate (Czech) 
Currently translated at 77.1% (2084 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2020-12-07 10:19:08 +00:00
Stanislav Lukeš 5cee82f9d5 Translated using Weblate (Czech) 
Currently translated at 77.1% (2084 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2020-12-07 10:19:08 +00:00
Kaede c491ac6e29 Translated using Weblate (Japanese) 
Currently translated at 50.0% (1352 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2020-12-07 10:19:01 +00:00
strix aluco ed10693fed Translated using Weblate (Ukrainian) 
Currently translated at 53.3% (1442 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2020-12-07 10:18:59 +00:00
Jeff Huang df3fd6baa9 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-12-07 10:18:57 +00:00
LinAGKar 1d1cef97b2 Translated using Weblate (Swedish) 
Currently translated at 98.6% (2666 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2020-12-07 10:18:56 +00:00
Marcelo Filho 88cd776926 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-12-07 10:18:49 +00:00
schwukas de7f2ab2e0 Translated using Weblate (German) 
Currently translated at 99.9% (2701 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2020-12-07 10:18:47 +00:00
J. Ryan Stinnett d967f01055
Merge pull request #5471 from matrix-org/jryans/rm-temp-test-sl 
Remove old app test script path
 2020-12-07 10:18:31 +00:00
Simon Merrick b365d3b27e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink 2020-12-07 10:30:50 +13:00
Simon Merrick 5544ee6408 extract alias handling to separate function 2020-12-06 23:29:11 +13:00
Lukas a856484139 Fix typos in some strings 
This commit fixes some typos that I've stumbled upon.
 2020-12-06 10:32:52 +01:00
Aaron Raimist 32f7e3552c
Remove globally defined flex and set just for group queries 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-05 21:56:17 -06:00
Aaron Raimist 3ec9d93cb0 Merge branch 'develop' into searchbox-fix-width 2020-12-05 19:53:08 -06:00
David Baker ab71547c4c Don't let call room names push out their containers 2020-12-04 20:36:08 +00:00
David Baker 4c50125e9d Don't remove call when we call hangup 
as hopefully explained by comment
 2020-12-04 20:22:01 +00:00
David Baker faf2922b1b Update video element when the call changes in a videoview 
Because that can happen now
 2020-12-04 19:41:48 +00:00
dependabot[bot] 58eaccbba8
Bump highlight.js from 10.1.2 to 10.4.1 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.1.2 to 10.4.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.1.2...10.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-04 17:35:40 +00:00
macekj 0c85cb587d Merge branch 'develop' into emoji_quick_shortcut 2020-12-04 11:05:50 -05:00
Weblate 7bc766e33c Merge branch 'origin/develop' into Weblate. 2020-12-04 15:13:58 +00:00
Priit Jõerüüt 0f1f3d4338 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2701 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-12-04 15:13:58 +00:00
Besnik Bleta 5acb81aa44 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2694 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2020-12-04 15:13:53 +00:00
J. Ryan Stinnett c13891c670
Merge pull request #5260 from orangecms/redact-with-reason 
add support for giving reason when redacting
 2020-12-04 15:13:40 +00:00
J. Ryan Stinnett c63c8540f1 Remove old app test script path 
Now that https://github.com/matrix-org/pipelines/pull/112 has merged, we no
longer need to support this old path for launching app-level tests.
 2020-12-04 11:05:05 +00:00
David Baker 72f858b5bb Empty commit 
as I don't see any other way to make netlify retry
 2020-12-03 19:28:37 +00:00
David Baker 6222ae07ac Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 19:05:21 +00:00
David Baker 02d1249cfc Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 19:01:54 +00:00
David Baker 0b3c7e0972 revert 2 testing commits to replace with real commit from develop 2020-12-03 19:00:57 +00:00
Weblate fc992e99e1 Merge branch 'origin/develop' into Weblate. 2020-12-03 19:00:10 +00:00
David Baker 0154c5aef1
Merge pull request #5469 from matrix-org/dbkr/fetchdep_netlify 
Add support for Netlify to fetchdep script
 2020-12-03 19:00:03 +00:00
David Baker c853085e29 Add support for Netlify to fetchdep script 
and remove support for Jenkins
 2020-12-03 18:40:33 +00:00
David Baker 1ed5fb1f30 Try another variable 
BRANCH is pull/xxxx/head so that doesn't work
 2020-12-03 18:29:23 +00:00
David Baker a8a4d44a57 Try different branch variable to try & get netlify to work 2020-12-03 18:24:19 +00:00
David Baker 6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker 0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 17:56:39 +00:00
David Baker 482c0a2f6a i18n 2020-12-03 17:49:22 +00:00
David Baker 1ce63f0fa7 Line 1 / 2 Support 
Support one active call plus one call on hold
 2020-12-03 17:45:49 +00:00
Weblate 347365db6a Merge branch 'origin/develop' into Weblate. 2020-12-03 16:41:32 +00:00
J. Ryan Stinnett 624e43823e
Merge pull request #5467 from matrix-org/jryans/netlify 
Nest other layers inside on automation
 2020-12-03 16:41:24 +00:00