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 |
|
Michael Telatynski
|
bbe9a73266
|
Merge pull request #13890 from vector-im/t3chguy/pwa-platform
Add PWA Platform with PWA-specific badge controls
|
2020-06-03 11:19:45 +01:00 |
|
Michael Telatynski
|
c29dc0bad8
|
Remove cross-signing from labs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-06-03 10:44:42 +01:00 |
|
Michael Telatynski
|
41738c322a
|
Add PWA Platform with PWA-specific badge controls
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-06-02 16:58:05 +01:00 |
|
Michael Telatynski
|
d18b0f87d4
|
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-02 16:26:08 +01:00 |
|
RiotRobot
|
765927203d
|
v1.6.3-rc.1
|
2020-06-02 15:55:48 +01:00 |
|
RiotRobot
|
403fddcb99
|
Prepare changelog for v1.6.3-rc.1
|
2020-06-02 15:55:47 +01:00 |
|
RiotRobot
|
f8dad68958
|
Add flux types as a dev dependency
This is not the right thing to do, since we don't directly use Flux at this
layer, but for the moment we need it to get distribution builds working.
|
2020-06-02 15:53:11 +01:00 |
|
RiotRobot
|
e37680b6c1
|
Upgrade matrix-react-sdk to 2.7.0-rc.2
|
2020-06-02 14:41:44 +01:00 |
|
RiotRobot
|
94fee233a8
|
Upgrade matrix-js-sdk to 6.2.0-rc.1
|
2020-06-02 14:40:00 +01:00 |
|
Michael Telatynski
|
e1f264c481
|
Merge pull request #13888 from vector-im/t3chguy/riotbot
Get rid of welcome.html's Chat with Riot Bot button to release
|
2020-06-02 14:29:56 +01:00 |
|
Michael Telatynski
|
3869a4d22e
|
Merge pull request #13842 from vector-im/t3chguy/riotbot
Get rid of welcome.html's Chat with Riot Bot button
|
2020-06-02 13:58:49 +01:00 |
|
Michael Telatynski
|
d0679efe5d
|
Merge pull request #13828 from vector-im/t3chguy/modernizr-subtleCrypto
Modernizr check for subtle crypto as we require it all over the place
|
2020-06-02 13:46:05 +01:00 |
|
J. Ryan Stinnett
|
9e36e7f966
|
Merge pull request #13886 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2020-06-02 13:34:24 +01:00 |
|
Weblate
|
5c6efa4316
|
Merge branch 'origin/develop' into Weblate.
|
2020-05-30 12:02:08 +00:00 |
|
Michael Telatynski
|
afd0d69ab5
|
Merge pull request #13864 from vector-im/t3chguy/toasts6_1
Allow deferring of Update Toast until the next morning
|
2020-05-30 13:02:03 +01:00 |
|
Weblate
|
8a971e59b9
|
Merge branch 'origin/develop' into Weblate.
|
2020-05-30 11:54:32 +00:00 |
|
Michael Telatynski
|
e368007274
|
Merge pull request #13862 from vector-im/t3chguy/toasts6
Give contextual feedback for manual update check instead of banner
|
2020-05-30 12:54:27 +01:00 |
|
Michael Telatynski
|
c6688f0245
|
make button margin equal all around
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-30 12:52:21 +01:00 |
|
Weblate
|
d60f1553b1
|
Merge branch 'origin/develop' into Weblate.
|
2020-05-29 19:40:47 +00:00 |
|
Michael Telatynski
|
cb48eb4933
|
Merge pull request #13834 from vector-im/t3chguy/docs
Add app-load doc
|
2020-05-29 20:40:43 +01:00 |
|
Weblate
|
a944262bb5
|
Merge branch 'origin/develop' into Weblate.
|
2020-05-29 19:16:23 +00:00 |
|
Michael Telatynski
|
06cc1c45bf
|
Merge pull request #13777 from vector-im/t3chguy/modular-utm
Update Modular hosting link
|
2020-05-29 20:16:18 +01:00 |
|
Michael Telatynski
|
66272fc226
|
Allow deferring of Update Toast until the next morning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-29 19:59:48 +01:00 |
|