OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,708 Commits
206 Branches
552 Tags
439 MiB
Commit Graph

8708 Commits (abf475ee80f3600dde5cd14afb07adfd3a9983d0)

Author SHA1 Message Date
Travis Ralston abf475ee80 Add some docs about Jitsi widgets and Jitsi configuration 2020-04-03 13:25:33 -06: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
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
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
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
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
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
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
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
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
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
RiotRobot 0a83f9c763 v1.5.14-rc.1 2020-03-26 13:31:03 +00:00
RiotRobot f5c5c1b991 Prepare changelog for v1.5.14-rc.1 2020-03-26 13:31:03 +00:00
RiotRobot bfcb46c4fd v1.5.14-rc.1 2020-03-26 13:28:13 +00:00
RiotRobot 5b35d6e570 Upgrade matrix-react-sdk to 2.3.0-rc.1 2020-03-26 13:28:04 +00:00
RiotRobot 9269d9b669 Upgrade matrix-js-sdk to 5.2.0-rc.1 2020-03-26 13:27:40 +00:00
J. Ryan Stinnett ec32abbb89
Merge pull request #12890 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-03-26 12:14:15 +00:00
Weblate c1884a26aa Merge branch 'origin/develop' into Weblate. 2020-03-26 12:03:29 +00:00
Michael Telatynski 1d109bb067
Merge pull request #12869 from vector-im/t3chguy/app_load_tweaks 
App load tweaks
 2020-03-26 12:03:23 +00:00
Weblate 35e443975d Merge branch 'origin/develop' into Weblate. 2020-03-26 11:43:07 +00:00
Szimszon 1963270d64 Translated using Weblate (Hungarian) 
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/hu/
 2020-03-26 11:43:06 +00:00
Tirifto 3072bbb0d7 Translated using Weblate (Esperanto) 
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/eo/
 2020-03-26 11:43:06 +00:00
J. Ryan Stinnett 1697cdc5a1
Merge pull request #12730 from vector-im/jryans/review-policy 
Add review policy doc
 2020-03-26 11:43:00 +00:00
J. Ryan Stinnett da249cbc40 Merge remote-tracking branch 'origin/develop' into jryans/review-policy 2020-03-26 11:34:29 +00:00
J. Ryan Stinnett 5b94d8bbd7 Add line about UI for network activity 2020-03-26 11:28:51 +00:00
Weblate 8549755fd5 Merge branch 'origin/develop' into Weblate. 2020-03-25 15:25:17 +00:00
David Baker 5c51063070
Merge pull request #12875 from vector-im/dbkr/fix_artifact_search 
Fix artifact searching in redeployer
 2020-03-25 15:25:12 +00:00
David Baker 758d021f97 Merge remote-tracking branch 'origin/develop' into dbkr/fix_artifact_search 2020-03-25 15:18:20 +00:00
David Baker fea600ba0a Fix artifact searching in redeployer 
Indenting fail
 2020-03-25 15:12:53 +00:00
Michael Telatynski fd385f8450 simplify loadConfig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 14:37:28 +00:00