Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,990 Commits 3 Branches 492 Tags 100 MiB
bccfd9f93e
Commit Graph

8990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Telatynski
99e5271cb8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/poc_riot_desktop_sso_multi_profile 2020-04-09 21:17:45 +01:00
Michael Telatynski
15bb819c8a Instead of encrypting, pass the HS an opaque token which we locally resolve in a map to our profile data 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 21:17:37 +01:00
Michael Telatynski
c0b4ab9f67
Merge pull request #13095 from vector-im/t3chguy/app_load2 
App load order changes to catch errors better
 2020-04-09 21:11:16 +01:00
Michael Telatynski
4afd29f62c add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 16:23:41 +01:00
Michael Telatynski
6fdeca93b6 Make the riot-desktop callback args more generic and encrypt the args 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 16:21:52 +01:00
Michael Telatynski
c67dcae35e improve comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 11:25:40 +01:00
Michael Telatynski
942ca3b525 make error translatable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 11:19:40 +01:00
Michael Telatynski
83653b3a22 assert rageshake loaded successfully 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 11:14:38 +01:00
Michael Telatynski
e1bdcf2d9e remove debug statement 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 10:49:50 +01:00
Michael Telatynski
8c88e9f0f4 delint and i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 10:42:58 +01:00
Michael Telatynski
0572d62c88 extract app load error handler from app.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 10:32:04 +01:00
J. Ryan Stinnett
121728ba2e
Merge pull request #13080 from vector-im/jryans/upgrade-2020-04-08 
Upgrade deps
 2020-04-09 10:19:34 +01:00
Michael Telatynski
343d4ea641 small tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 21:49:27 +01:00
Michael Telatynski
cc939f9645 extract browser compatibility error handling out of app.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 21:41:22 +01:00
Michael Telatynski
f6ad5bf54c let settled accept multiple proms + i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 20:12:05 +01:00
Michael Telatynski
2837c41ca4 factor out config error handling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 20:03:45 +01:00
Michael Telatynski
4954c732ee extract config error handling out of app.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 19:47:52 +01:00
Michael Telatynski
6a5268f09b fix loadConfig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 19:36:06 +01:00
Michael Telatynski
7633009ddb clean up loadConfig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 19:35:16 +01:00
Michael Telatynski
e267086a17 Parallelize loadSkin 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 19:21:39 +01:00
Michael Telatynski
b3780445d3 fix typescript types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 16:31:58 +01:00
Michael Telatynski
7113fe7e31 comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 16:24:40 +01:00
Michael Telatynski
719865c033 parallel load language and theme 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 16:17:46 +01:00
Michael Telatynski
2c5664b76e move config loading into index for parallelism 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 16:12:36 +01:00
Michael Telatynski
43357fe842 reorder 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 16:10:44 +01:00
Michael Telatynski
6222546e20 prepare platform earlier 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 16:09:47 +01:00
Michael Telatynski
0b032d7434 loadOlm earlier 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 16:08:39 +01:00
J. Ryan Stinnett
a1ef707065 yarn upgrade 2020-04-08 14:55:46 +01:00
RiotRobot
8b6ec2c50b v1.5.16-rc.1 2020-04-08 14:10:59 +01:00
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