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
9,214 Commits 3 Branches 492 Tags 100 MiB
55c1f01f4c
Commit Graph

9214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damir Jelić
55c1f01f4c ElectronPlatform: Add support to set and get the index user version. 2020-06-17 17:18:44 +02:00
RiotRobot
59d37ec94b Reset matrix-react-sdk back to develop branch 2020-06-16 12:01:07 +01:00
RiotRobot
6558d6d828 Reset matrix-js-sdk back to develop branch 2020-06-16 12:00:53 +01:00
RiotRobot
754d849055 Merge branch 'master' into develop 2020-06-16 12:00:14 +01:00
RiotRobot
d75045e852 v1.6.5 2020-06-16 11:53:53 +01:00
RiotRobot
fdec64f59c Prepare changelog for v1.6.5 2020-06-16 11:53:53 +01:00
RiotRobot
9ed7c96df6 Upgrade matrix-react-sdk to 2.7.2 2020-06-16 11:51:28 +01:00
RiotRobot
93da1f192b Upgrade matrix-js-sdk to 6.2.2 2020-06-16 11:51:11 +01:00
David Baker
657fa847c6
Merge pull request #14032 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-06-15 09:37:51 +01:00
Weblate
7a237e7045 Merge branch 'origin/develop' into Weblate. 2020-06-11 17:25:49 +00:00
Michael Telatynski
5900c7090f
Merge pull request #13987 from vector-im/t3chguy/fix-decoder-ring 
Attempt to fix decoder ring for relative hosted riots
 2020-06-11 18:25:41 +01:00
Michael Telatynski
c32d3efd52 Add Base URL field to decoder-ring to make it more flexible 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-11 01:37:31 +01:00
Michael Telatynski
2419db5195 Attempt to fix decoder ring for relative hosted riots 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-11 01:24:26 +01:00
Nils Haugen
428f49bb7a Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 54.5% (18 of 33 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nn/
 2020-06-09 20:29:25 +00:00
Slimane Selyan AMIRI
b9560c8cfc Translated using Weblate (Kabyle) 
Currently translated at 18.2% (6 of 33 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/kab/
 2020-06-09 20:29:25 +00:00
Nils Haugen
5b63be6a57 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 54.5% (18 of 33 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nn/
 2020-06-08 13:29:22 +00:00
J. Ryan Stinnett
bf174e3f0f
Merge pull request #13952 from vector-im/jryans/upgrade-deps-2020-06-05 
Upgrade deps
 2020-06-08 10:58:46 +01:00
J. Ryan Stinnett
7d800f9f38 Upgrade deps 2020-06-08 10:16:33 +01:00
Michael Telatynski
3bc6b08cad
Merge pull request #13946 from vector-im/t3chguy/remember-updates 
Fix riot-desktop manual update check getting stuck on Downloading...
 2020-06-08 09:44:22 +01:00
Michael Telatynski
34dab73150 Fix riot-desktop manual update check getting stuck on Downloading... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-07 13:19:29 +01:00
Travis Ralston
59cefb6ac8
Merge pull request #13943 from vector-im/dependabot/npm_and_yarn/websocket-extensions-0.1.4 
Bump websocket-extensions from 0.1.3 to 0.1.4
 2020-06-06 10:50:48 -06:00
dependabot[bot]
e8ebf886e4
Bump websocket-extensions from 0.1.3 to 0.1.4 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-06 13:56:59 +00:00
RiotRobot
6875ffe0d5 Reset matrix-react-sdk back to develop branch 2020-06-05 16:03:24 +01:00
RiotRobot
befc7589cd Reset matrix-js-sdk back to develop branch 2020-06-05 16:03:09 +01:00
RiotRobot
ca632fd2da Merge branch 'master' into develop 2020-06-05 16:02:34 +01:00
RiotRobot
3b28ebecef v1.6.4 2020-06-05 15:57:45 +01:00
RiotRobot
758e2d6bfd Prepare changelog for v1.6.4 2020-06-05 15:57:45 +01:00
RiotRobot
21dd4c99f3 Upgrade matrix-react-sdk to 2.7.1 2020-06-05 15:53:38 +01:00
RiotRobot
45fb8adc5d Upgrade matrix-js-sdk to 6.2.1 2020-06-05 15:52:31 +01:00
RiotRobot
4cf86fd50a Reset matrix-react-sdk back to develop branch 2020-06-04 15:39:07 +01:00
RiotRobot
88bb5a49ed Reset matrix-js-sdk back to develop branch 2020-06-04 15:38:53 +01:00
RiotRobot
5c5e7caacf Merge branch 'master' into develop 2020-06-04 15:38:19 +01:00
RiotRobot
97f45723a3 v1.6.3 2020-06-04 15:34:58 +01:00
RiotRobot
1942cad1f6 Prepare changelog for v1.6.3 2020-06-04 15:34:57 +01:00
RiotRobot
451138617b Upgrade matrix-react-sdk to 2.7.0 2020-06-04 15:23:38 +01:00
RiotRobot
a0ea1bfda8 Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:23:02 +01:00
Michael Telatynski
bf35dd2b46
Merge pull request #13914 from vector-im/t3chguy/e2eedefault 
Add e2ee-default:false docs
 2020-06-04 13:12:22 +01:00
Michael Telatynski
bce0bf1b1d
Apply suggestions from code review 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2020-06-04 12:38:45 +01:00
Michael Telatynski
a607dc6822
Merge pull request #13915 from vector-im/t3chguy/sso-query 
Fix login loop where the sso flow returns to `#/login` to release
 2020-06-04 01:09:32 +01:00
Michael Telatynski
cd829d3c1c Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:vector-im/riot-web into t3chguy/e2eedefault 2020-06-03 22:19:03 +01:00
Michael Telatynski
1b7accddfd fix loading test for new sso pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 22:14:44 +01:00
Michael Telatynski
ddf3d92d43 Fix login loop where the sso flow returns to #/login 
due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 22:14:44 +01:00
Michael Telatynski
faca8799db Add e2ee-default:false docs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 22:10:48 +01:00
Hubert Chathi
d86fd9e753
Merge pull request #13846 from vector-im/uhoreg/keytar 
make IPC calls to get pickle key
 2020-06-03 16:54:40 -04:00
Michael Telatynski
c75e888c90
Merge pull request #13913 from vector-im/t3chguy/sso-query 
fix loading test for new sso pattern
 2020-06-03 20:42:24 +01:00
Michael Telatynski
19ff8dde1f fix loading test for new sso pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 20:35:56 +01:00
Michael Telatynski
801946782b
Merge pull request #13889 from vector-im/t3chguy/sso-query 
Fix login loop where the sso flow returns to `#/login`
 2020-06-03 20:28:04 +01:00
Travis Ralston
5a77025dec
Merge pull request #13905 from arthurlogilab/patch-1 
Fix typo in docs
 2020-06-03 07:47:00 -06:00
Arthur Lutz
d0413f0d15
[docs/config.md] typo fix 2020-06-03 14:59:34 +02:00
Michael Telatynski
d41fee06a1
Merge pull request #13904 from vector-im/t3chguy/remove_cross_signing 
Remove cross-signing from labs
 2020-06-03 13:42:01 +01:00