gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,161 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

9161 Commits

Author SHA1 Message Date
RiotRobot f9647ed48d Prepare changelog for v1.5.16-rc.1 2020-04-08 14:10:59 +01:00
RiotRobot c8e284e26f v1.5.16-rc.1 2020-04-08 14:06:05 +01:00
RiotRobot 48018b33cc Upgrade matrix-react-sdk to 2.4.0-rc.1 2020-04-08 14:06:02 +01:00
RiotRobot 83af795358 Upgrade matrix-js-sdk to 5.3.0-rc.1 2020-04-08 14:03:43 +01:00
J. Ryan Stinnett ee5d39a001
Merge pull request #13078 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-04-08 13:15:31 +01:00
Weblate 989be64c38 Merge branch 'origin/develop' into Weblate. 2020-04-07 16:02:58 +00:00
Travis Ralston 80866305d4
Merge pull request #13047 from vector-im/travis/jitsi/wellknown 
Mention Jitsi support at the .well-known level in Jitsi docs
 2020-04-07 10:02:52 -06:00
Weblate deddd1b51c Merge branch 'origin/develop' into Weblate. 2020-04-07 13:47:08 +00:00
Michael Telatynski b647e35c48
Merge pull request #13049 from vector-im/t3chguy/default_home 
Add new default home page fallback
 2020-04-07 14:47:01 +01:00
Michael Telatynski 7932ef6087 add missing assets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 11:03:49 +01:00
Michael Telatynski e58cd1f73a Add new default home page fallback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 10:48:56 +01:00
Weblate 9f23dc1d00 Merge branch 'origin/develop' into Weblate. 2020-04-07 08:48:22 +00:00
Michael Telatynski 06bd9d1bf4
Merge pull request #13032 from vector-im/t3chguy/app_load1 
App load order tweaks for code splitting
 2020-04-07 09:48:17 +01:00
Travis Ralston 83088961d0 Mention Jitsi support at the .well-known level in Jitsi docs 
For https://github.com/matrix-org/matrix-react-sdk/pull/4348
 2020-04-06 16:12:36 -06:00
Weblate 547533e568 Merge branch 'origin/develop' into Weblate. 2020-04-06 21:03:23 +00:00
wps0 338a8c204a Translated using Weblate (Polish) 
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/pl/
 2020-04-06 21:03:23 +00:00
Slavi Pantaleev 99f940a87e Translated using Weblate (Bulgarian) 
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/bg/
 2020-04-06 21:03:23 +00:00
Travis Ralston cb39edbfd7
Merge pull request #13027 from vector-im/travis/jitsi-docs 
Add some docs about Jitsi widgets and Jitsi configuration
 2020-04-06 15:03:17 -06:00
Travis Ralston 99f8019aa2 Update docs per suggestions 2020-04-06 14:50:06 -06:00
Michael Telatynski 1b9112b876 Revert "Combine two async imports into one by way of skin.ts" 
This reverts commit e788433c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-06 12:24:56 +01:00
Michael Telatynski e788433c24 Combine two async imports into one by way of skin.ts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-06 12:22:20 +01:00
Weblate ea934a1e3d Merge branch 'origin/develop' into Weblate. 2020-04-06 11:06:25 +00:00
J. Ryan Stinnett 244538c0d2
Merge pull request #13030 from vector-im/dependabot/npm_and_yarn/electron_app/minimist-1.2.3 
Bump minimist from 1.2.2 to 1.2.3 in /electron_app
 2020-04-06 12:06:20 +01:00
MamasLT 6ab1ca67a4 Translated using Weblate (Lithuanian) 
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/lt/
 2020-04-05 21:27:32 +00:00
Michael Telatynski b1575524aa Switch things to typescript, use @types/modernizr, fix global.d.ts. Move mobile_guide redirect to index.ts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-05 00:55:36 +01:00
Michael Telatynski 093b7bbf72 convert index.js to typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-05 00:27:59 +01:00
Michael Telatynski 20442413bf remove future error handling path 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-05 00:12:37 +01:00
Michael Telatynski d429756094 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-05 00:08:31 +01:00
Michael Telatynski b5318b4ebc fix global.d.ts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-05 00:05:59 +01:00
Michael Telatynski 4b6164d823 iterate app load order tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-04 23:42:19 +01:00
dependabot[bot] 97fdb559fb
Bump minimist from 1.2.2 to 1.2.3 in /electron_app 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.2...1.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-04 16:36:41 +00:00
Michael Telatynski 37ed89c25f move rageshake init into init.ts to allow for code-splitting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-04 17:34:33 +01:00
Michael Telatynski 7b930da343 Make app load more async 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-04 17:21:59 +01:00
Michael Telatynski 67cf1e7536 rejig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-04 00:48:26 +01:00
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