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

8820 Commits

Author SHA1 Message Date
RiotRobot 15922f6656 v1.6.0-rc.3 2020-04-17 17:58:57 +01:00
RiotRobot 393d701ee9 Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:58:52 +01:00
RiotRobot ef5d1f421d Upgrade matrix-react-sdk to 2.5.0-rc.3 2020-04-17 17:57:33 +01:00
RiotRobot c71338852e v1.6.0-rc.2 2020-04-16 20:09:16 +01:00
RiotRobot 033a462015 Prepare changelog for v1.6.0-rc.2 2020-04-16 20:09:15 +01:00
RiotRobot 3fd726af5e v1.6.0-rc.2 2020-04-16 20:06:06 +01:00
RiotRobot 6ca2f4c87d Upgrade matrix-react-sdk to 2.5.0-rc.2 2020-04-16 20:06:01 +01:00
RiotRobot 0c12630b89 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 20:04:19 +01:00
RiotRobot d3bc7fb400 v1.6.0-rc.1 2020-04-15 19:27:55 +01:00
RiotRobot 5333c9ec29 Prepare changelog for v1.6.0-rc.1 2020-04-15 19:27:55 +01:00
RiotRobot 09b171c1de v1.6.0-rc.1 2020-04-15 19:24:25 +01:00
RiotRobot 2cd585cd6c Upgrade matrix-react-sdk to 2.5.0-rc.1 2020-04-15 19:24:18 +01:00
RiotRobot 0b32f7c87f Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:22:38 +01:00
RiotRobot 08ef4ff3b1 Merge branch 'release-v1.5.16' into release-v1.6.0 2020-04-15 19:08:28 +01:00
J. Ryan Stinnett b5e8e5cf75
Merge pull request #13179 from vector-im/jryans/enable-cross-signing 
Enable cross-signing / E2EE by default for DM on release
 2020-04-15 18:54:02 +01:00
J. Ryan Stinnett cd19af4003 Enable cross-signing / E2EE by default for DM on release 
Fixes https://github.com/vector-im/riot-web/issues/13178
 2020-04-15 18:36:22 +01:00
Travis Ralston 1a4fe2ac3b
Merge pull request #13128 from dannycolin/inotify-watch-limit 
Add instruction to resolve the inotify watch limit issue
 2020-04-15 09:47:54 -06:00
Travis Ralston 8ed8840b63
Merge pull request #13149 from xobs/labs-config-reference 
docs: labs: add a pointer to config.md
 2020-04-15 09:46:50 -06:00
Michael Telatynski 3cbc9997b9
Merge pull request #13028 from vector-im/t3chguy/poc_riot_desktop_sso_multi_profile 
Fix Electron SSO handling to support multiple profiles
 2020-04-14 17:09:14 +01:00
Michael Telatynski a77ed6e844
Merge branch 'develop' into t3chguy/poc_riot_desktop_sso_multi_profile 2020-04-14 17:03:00 +01:00
Michael Telatynski 24dbbfa002
Merge pull request #13133 from vector-im/t3chguy/electron-forward-back 
Add riot-desktop shortcuts for forward/back matching browsers&slack
 2020-04-14 16:12:24 +01:00
Michael Telatynski 4354c508c7
Merge pull request #13164 from vector-im/t3chguy/soft-fail-rageshake 
Allow rageshake to fail in init
 2020-04-14 14:51:09 +01:00
Michael Telatynski 36f55c1630 Allow rageshake to fail in init 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 14:44:12 +01:00
Sean Cross e536b07874 docs: labs: add a pointer to config.md 
The documentation mentions that Labs features can be manipulated by
opening the Settings menu and selecting Labs.  This feature is normally
disabled, so for most users this is not the case.

Add a link to the `config.md` file and a note that the Labs features
must be enabled in order to manipulate them.

Signed-off-by: Sean Cross <sean@xobs.io>
 2020-04-13 13:48:10 +08:00
Michael Telatynski 2346829055 Add riot-desktop shortcuts for forward/back matching browsers&slack 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-11 18:58:00 +01:00
Danny Colin 1dbbdb252c Add instruction to resolve the inotify watch limit issue 
On Linux, it's common that the system limit the number of files that can be monitored. If
this limit is too low then the build script will fail.

Signed-off-by: Danny Colin <contact@dannycolin.com>
 2020-04-10 20:09:29 -04:00
Travis Ralston 6e15684a04
Merge pull request #13125 from cheryllium/fix_yarn_install_link 
Fix broken yarn install link in README.md
 2020-04-10 15:54:07 -06:00
C. Yang 2514a33892 Fix broken yarn install link in README.md 2020-04-10 17:43:54 -04:00
Travis Ralston 302105163d
Merge pull request #13122 from dannycolin/fix-build-jitsi 
fix build:jitsi scripts crash caused by a missing folder
 2020-04-10 15:02:14 -06:00
Danny Colin c128e75f5d fix build:jitsi scripts crash caused by a missing folder 
On a freshly install of the developer environment, the build:jitsi try
to create a file in ./webapp with the cURL command. However, ./webapp
folder doesn't exist and the build script crash. This patch makes sure
the appropriate folder is created if it doesn't already exist

Signed-off-by: Danny Colin <contact@dannycolin.com>
 2020-04-10 14:14:19 -04:00
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