OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,077 Commits
219 Branches
561 Tags
468 MiB
Commit Graph

9077 Commits (03414d92d00feafc8035c86710fd94c3a7e1f480)

Author SHA1 Message Date
Michael Telatynski 8ca9e4ccb1 Fix Electron SSO handling to support multiple profiles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-04 00:22:15 +01:00
Travis Ralston abf475ee80 Add some docs about Jitsi widgets and Jitsi configuration 2020-04-03 13:25:33 -06:00
Weblate 62528253ec Merge branch 'origin/develop' into Weblate. 2020-04-03 12:23:18 +00:00
Michael Telatynski a377ca7b85
Merge pull request #13020 from vector-im/t3chguy/fix_mac_shortcut 
Fix Electron mac-specific shortcut being registered on Web too.
 2020-04-03 13:23:13 +01:00
Michael Telatynski c1da3bf537 Fix Electron mac-specific shortcut being registered on Web too. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-03 13:01:28 +01:00
Weblate a8911e7f85 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:54:11 +00:00
Travis Ralston ab29ec123e
Merge pull request #12968 from vector-im/travis/jitsi-errors 
Add a console warning that errors from Jitsi Meet are fine
 2020-04-01 10:54:06 -06:00
Weblate ca444d36aa Merge branch 'origin/develop' into Weblate. 2020-04-01 14:35:34 +00:00
RiotRobot cb8319ea2d Reset matrix-react-sdk back to develop branch 2020-04-01 15:35:13 +01:00
RiotRobot af35696db9 Reset matrix-js-sdk back to develop branch 2020-04-01 15:35:02 +01:00
Weblate 3af825db91 Merge branch 'origin/develop' into Weblate. 2020-04-01 14:34:25 +00:00
RiotRobot ccd998d709 Merge branch 'master' into develop 2020-04-01 15:34:02 +01:00
RiotRobot 0cfdc7b66a v1.5.15 2020-04-01 15:28:24 +01:00
RiotRobot 7fb6c1e117 Prepare changelog for v1.5.15 2020-04-01 15:28:24 +01:00
RiotRobot 97586aa5c3 v1.5.15 2020-04-01 15:10:52 +01:00
RiotRobot 5f5d46eb11 Upgrade matrix-react-sdk to 2.3.1 2020-04-01 15:08:57 +01:00
David Baker 511d18abec
Merge pull request #12980 from vector-im/dbkr/jitsi_fix_popout_rel 
Fix popout support for jitsi widgets
 2020-04-01 13:59:48 +01:00
David Baker 24fe98a78c Make widget API use optional 
So we can work when popped out into a browser
 2020-04-01 13:36:57 +01:00
David Baker 51c675c6fe Give the jitsi wrapper its own external api script 2020-04-01 13:36:51 +01:00
Weblate 01dc43aa09 Merge branch 'origin/develop' into Weblate. 2020-04-01 10:57:35 +00:00
Esteve Soria ea0825c226 Translated using Weblate (Spanish) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2020-04-01 10:57:35 +00:00
rkfg ac3e3ba1e4 Translated using Weblate (Russian) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2020-04-01 10:57:35 +00:00
avvalcode c16341b3b3 Translated using Weblate (Persian) 
Currently translated at 68.0% (17 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fa/
 2020-04-01 10:57:35 +00:00
Daniel Løvbrøtte Olsen 4334d1540b Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
 2020-04-01 10:57:35 +00:00
Imre Kristoffer Eilertsen dbed65985d Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
 2020-04-01 10:57:35 +00:00
Dvir Berebi fe7f708e80 Translated using Weblate (Hebrew) 
Currently translated at 68.0% (17 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/he/
 2020-04-01 10:57:34 +00:00
Märt Põder 72aefecab0 Translated using Weblate (Estonian) 
Currently translated at 20.0% (5 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/et/
 2020-04-01 10:57:34 +00:00
David Baker 432098ddd2
Merge pull request #12975 from vector-im/dbkr/jitsi_fix_popout 
Fix popout support for jitsi widgets
 2020-04-01 11:57:29 +01:00
David Baker 0bf05e3c7b Make widget API use optional 
So we can work when popped out into a browser
 2020-04-01 11:08:53 +01:00
David Baker 421fcb115f Give the jitsi wrapper its own external api script 2020-04-01 10:38:49 +01:00
Märt Põder b85f1629b3 Added translation using Weblate (Estonian) 2020-03-31 19:33:19 +00:00
Travis Ralston 13a7b71e08 Add a console warning that errors from Jitsi Meet are fine 
See diff for info.

We use the fragment to avoid sending conference information to the web server where possible.
 2020-03-31 12:19:17 -06:00
Weblate 12968bec26 Merge branch 'origin/develop' into Weblate. 2020-03-30 12:54:18 +00:00
RiotRobot d4f75e4e1b Reset matrix-react-sdk back to develop branch 2020-03-30 13:54:09 +01:00
RiotRobot 4a4df94339 Reset matrix-js-sdk back to develop branch 2020-03-30 13:53:58 +01:00
Weblate d7b278bc65 Merge branch 'origin/develop' into Weblate. 2020-03-30 12:53:39 +00:00
RiotRobot 365041c6c3 Merge branch 'master' into develop 2020-03-30 13:52:20 +01:00
RiotRobot 413b26d71b v1.5.14 2020-03-30 13:48:40 +01:00
RiotRobot 45ff2fdcde Prepare changelog for v1.5.14 2020-03-30 13:48:39 +01:00
RiotRobot 5bd155c294 v1.5.14 2020-03-30 13:45:32 +01:00
RiotRobot 51f4327ce1 Upgrade matrix-react-sdk to 2.3.0 2020-03-30 13:45:21 +01:00
RiotRobot 37cebf38cc Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:44:42 +01:00
Weblate a2d6f8fec0 Merge branch 'origin/develop' into Weblate. 2020-03-30 11:13:06 +00:00
Michael Telatynski e895fed180
Merge pull request #12925 from JorikSchellekens/joriks/review-review 
Some grammar and clarifications
 2020-03-30 12:13:00 +01:00
Jorik Schellekens 6ed81eadbf Some grammar and clarifications. 2020-03-30 11:52:23 +01:00
Kenneth Larsson c756eda805 Translated using Weblate (Swedish) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
 2020-03-27 20:27:18 +00:00
Stanislav Lukeš 43707a9389 Translated using Weblate (Czech) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2020-03-27 20:27:18 +00:00
Travis Ralston d9fbbe1696
Merge pull request #12861 from mnoorenberghe/patch-1 
Don't immediately remove notifications from notification trays
 2020-03-26 09:33:11 -06:00
David Baker f746c70dc6
Merge pull request #12894 from vector-im/dbkr/kill_riotbot 
Remove welcome user from config
 2020-03-26 15:06:13 +00:00
David Baker a3d09e6d54 Remove welcome user from config 
Until we update its tutorial videos to the current interface
 2020-03-26 14:51:46 +00:00