OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,172 Commits
202 Branches
546 Tags
420 MiB
Commit Graph

23172 Commits (2ae6f18464cdc7ac8780b96da075891249ae84cb)

Author SHA1 Message Date
Travis Ralston c0ffa8b59a Fix merge conflict between react warnings and SSO 2020-04-01 11:32:13 -06:00
Weblate 329762d6a2 Merge branch 'origin/develop' into Weblate. 2020-04-01 17:14:31 +00:00
Travis Ralston 36ccb7e752
Merge pull request #4315 from matrix-org/travis/react-warnings/3-componentCannotDidMount 
Label and use UNSAFE_componentWillMount to minimize warnings
 2020-04-01 11:14:26 -06:00
Travis Ralston 07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount 2020-04-01 11:14:19 -06:00
Weblate c157f02fef Merge branch 'origin/develop' into Weblate. 2020-04-01 17:13:51 +00:00
Travis Ralston 0fcbe40bec
Merge pull request #4314 from matrix-org/travis/react-warnings/2-code-quality 
Fix a number of minor code quality issues
 2020-04-01 11:13:46 -06:00
Weblate 1f00ddff43 Merge branch 'origin/develop' into Weblate. 2020-04-01 17:13:09 +00:00
rkfg 72badf3b6a Translated using Weblate (Russian) 
Currently translated at 84.0% (1896 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 17:13:09 +00:00
Travis Ralston 59a99bbad8
Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount 
Use componentDidMount in place of componentWillMount where possible
 2020-04-01 11:13:04 -06:00
Travis Ralston 8f04746e4e Revert to UNSAFE_componentWillMount where componentDidMount will not work 2020-04-01 11:05:49 -06:00
Weblate 7010b5599c Merge branch 'origin/develop' into Weblate. 2020-04-01 16:52:56 +00:00
Damir Jelić 47ee7e6ec2 Merge branch 'poljar/eventindex-initial-full-crawl' into develop 2020-04-01 18:52:35 +02:00
Weblate df45e0068a Merge branch 'origin/develop' into Weblate. 2020-04-01 16:47:10 +00:00
Michael Telatynski 544bd09667
Merge pull request #4320 from matrix-org/t3chguy/user_info_buttons 
Fix UserInfo e2e buttons to match Figma
 2020-04-01 17:47:05 +01:00
Weblate b3b72af879 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:46:46 +00:00
Michael Telatynski 7143c91d16
Merge pull request #4316 from matrix-org/t3chguy/room-tile-auto-scroll 
Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
 2020-04-01 17:46:41 +01:00
Weblate 2a4c173b49 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:27:30 +00:00
rkfg f295bb6c12 Translated using Weblate (Russian) 
Currently translated at 84.5% (1896 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 16:27:30 +00:00
Travis Ralston 094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia 
Support SSO for interactive authentication
 2020-04-01 10:27:24 -06:00
Michael Telatynski 0d8fd83e4d move aria-label and title so that it doesn't wrap the e2e icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-01 17:16:28 +01:00
Weblate e5fa41a246 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:02:53 +00:00
call_xz dabf8f3870 Translated using Weblate (Japanese) 
Currently translated at 54.8% (1229 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-04-01 16:02:52 +00:00
Michael Telatynski 138d280e4e
Merge pull request #4328 from matrix-org/t3chguy/slashcommands 
fix /invite Slash Command
 2020-04-01 17:02:47 +01:00
rkfg d520af255e Translated using Weblate (Russian) 
Currently translated at 84.4% (1893 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 15:59:59 +00:00
Michael Telatynski 8736867dcf fix /invite Slash Command 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-01 16:53:25 +01:00
Michael Telatynski 430a9ef948 tweak e2e icon margins 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-01 15:09:19 +01:00
Weblate 9970fa8649 Merge branch 'origin/develop' into Weblate. 2020-04-01 14:00:14 +00:00
RiotRobot 84da483264 Reset matrix-js-sdk back to develop branch 2020-04-01 15:00:05 +01:00
Weblate 283f103653 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:59:42 +00:00
call_xz 2ae83526dc Translated using Weblate (Japanese) 
Currently translated at 54.8% (1229 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-04-01 13:59:42 +00:00
RiotRobot d8d48275c3 Merge branch 'master' into develop 2020-04-01 14:59:01 +01:00
RiotRobot adb2fc89e2 v2.3.1 2020-04-01 14:57:53 +01:00
RiotRobot abb8564c5d Prepare changelog for v2.3.1 2020-04-01 14:57:53 +01:00
rkfg 66bf5b6fc4 Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:55:28 +00:00
i47320673 3e09c8b32f Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:50:00 +00:00
rkfg b9d07738b4 Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:50:00 +00:00
i47320673 814adb8d5d Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:46:15 +00:00
rkfg 1f35343d90 Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:46:15 +00:00
i47320673 436126362f Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:45:35 +00:00
rkfg 46aa022942 Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:45:35 +00:00
David Baker c027c5da41
Merge pull request #4327 from matrix-org/dbkr/template_popout_url_rel 
Fix jitsi popout URL
 2020-04-01 14:45:02 +01:00
Weblate ed7dae20e3 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:44:27 +00:00
rkfg 53987b093e Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:44:27 +00:00
call_xz 6ced71443c Translated using Weblate (Japanese) 
Currently translated at 54.6% (1225 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-04-01 13:44:27 +00:00
J. Ryan Stinnett 4be08a901a
Merge pull request #4326 from matrix-org/dbkr/template_popout_url 
Fix jitsi popout URL
 2020-04-01 14:44:22 +01:00
David Baker 53c854efba Fix jitsi popout URL 
Needs the template variables filled in
 2020-04-01 14:44:01 +01:00
Valex e1bc7493a7 Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:42:54 +00:00
rkfg 666f4201da Translated using Weblate (Russian) 
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-01 13:42:54 +00:00
David Baker 8aa24f8987 Fix jitsi popout URL 
Needs the template variables filled in
 2020-04-01 14:42:17 +01:00
J. Ryan Stinnett 3f93bdb329
Merge pull request #4324 from matrix-org/jryans/conf-under-release 
Remove underscore from Jitsi conference names
 2020-04-01 14:24:09 +01:00