Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,726 Commits 206 Branches 552 Tags 518 MiB
b647e35c48
Commit Graph

8726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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