Commits · fix-docker · Emi / RiotPony

15 Jun, 2020 1 commit
- Merge commit '99ae606c ' into fix-docker · 25ddc734
  Emi Simpson authored Jun 14, 2020
  
  25ddc734
07 Jun, 2020 2 commits
- fixup stuff · 99ae606c
  Sorunome authored Jun 07, 2020
  
  99ae606c
- Merge branch 'master' of https://github.com/vector-im/riot-web into ponies · eea07927
  Sorunome authored Jun 07, 2020
  
  eea07927
06 Jun, 2020 1 commit
- Update default js/react sdks in the Dockerfile to point to ponies.im versions · 680af687
  Emi Simpson authored May 28, 2020
  
  680af687
05 Jun, 2020 4 commits
- v1.6.4 · 3b28ebec
  RiotRobot authored Jun 05, 2020
  
  3b28ebec
- Prepare changelog for v1.6.4 · 758e2d6b
  RiotRobot authored Jun 05, 2020
  
  758e2d6b
- Upgrade matrix-react-sdk to 2.7.1 · 21dd4c99
  RiotRobot authored Jun 05, 2020
  
  21dd4c99
- Upgrade matrix-js-sdk to 6.2.1 · 45fb8adc
  RiotRobot authored Jun 05, 2020
  
  45fb8adc
04 Jun, 2020 5 commits
- v1.6.3 · 97f45723
  RiotRobot authored Jun 04, 2020
  
  97f45723
- Prepare changelog for v1.6.3 · 1942cad1
  RiotRobot authored Jun 04, 2020
  
  1942cad1
- Upgrade matrix-react-sdk to 2.7.0 · 45113861
  RiotRobot authored Jun 04, 2020
  
  45113861
- Upgrade matrix-js-sdk to 6.2.0 · a0ea1bfd
  RiotRobot authored Jun 04, 2020
  
  a0ea1bfd
- Merge pull request #13915 from vector-im/t3chguy/sso-query · a607dc68
  Michael Telatynski authored Jun 04, 2020
```
Fix login loop where the sso flow returns to `#/login` to release
```
  a607dc68
03 Jun, 2020 2 commits

fix loading test for new sso pattern · 1b7accdd
Michael Telatynski authored Jun 03, 2020
```
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
```
1b7accdd

Fix login loop where the sso flow returns to `#/login` · ddf3d92d

Michael Telatynski authored Jun 02, 2020

due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

ddf3d92d

02 Jun, 2020 7 commits
- v1.6.3-rc.1 · 76592720
  RiotRobot authored Jun 02, 2020
  
  76592720
- Prepare changelog for v1.6.3-rc.1 · 403fddcb
  RiotRobot authored Jun 02, 2020
  
  403fddcb
- Add flux types as a dev dependency · f8dad689
  RiotRobot authored Jun 02, 2020
```
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.
```
  f8dad689
- Upgrade matrix-react-sdk to 2.7.0-rc.2 · e37680b6
  RiotRobot authored Jun 02, 2020
  
  e37680b6
- Upgrade matrix-js-sdk to 6.2.0-rc.1 · 94fee233
  RiotRobot authored Jun 02, 2020
  
  94fee233
- Merge pull request #13888 from vector-im/t3chguy/riotbot · e1f264c4
  Michael Telatynski authored Jun 02, 2020
```
Get rid of welcome.html's Chat with Riot Bot button to release
```
  e1f264c4
- Merge pull request #13886 from RiotTranslateBot/weblate-riot-web-riot-web · 9e36e7f9
  J. Ryan Stinnett authored Jun 02, 2020
```
Update from Weblate
```
  9e36e7f9
30 May, 2020 5 commits
- Merge branch 'origin/develop' into Weblate. · 5c6efa43
  Weblate authored May 30, 2020
  
  5c6efa43
- Merge pull request #13864 from vector-im/t3chguy/toasts6_1 · afd0d69a
  Michael Telatynski authored May 30, 2020
```
Allow deferring of Update Toast until the next morning
```
  afd0d69a
- Merge branch 'origin/develop' into Weblate. · 8a971e59
  Weblate authored May 30, 2020
  
  8a971e59
- Merge pull request #13862 from vector-im/t3chguy/toasts6 · e3680072
  Michael Telatynski authored May 30, 2020
```
Give contextual feedback for manual update check instead of banner
```
  e3680072
- make button margin equal all around · c6688f02
  Michael Telatynski authored May 30, 2020
```
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
```
  c6688f02
29 May, 2020 7 commits
- Merge branch 'origin/develop' into Weblate. · d60f1553
  Weblate authored May 29, 2020
  
  d60f1553
- Merge pull request #13834 from vector-im/t3chguy/docs · cb48eb49
  Michael Telatynski authored May 29, 2020
```
Add app-load doc
```
  cb48eb49
- Merge branch 'origin/develop' into Weblate. · a944262b
  Weblate authored May 29, 2020
  
  a944262b
- Merge pull request #13777 from vector-im/t3chguy/modular-utm · 06cc1c45
  Michael Telatynski authored May 29, 2020
```
Update Modular hosting link
```
  06cc1c45
- Allow deferring of Update Toast until the next morning · 66272fc2
  Michael Telatynski authored May 29, 2020
```
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
```
  66272fc2
- Give contextual feedback for manual update check instead of banner · 1fd74f22
  Michael Telatynski authored May 29, 2020
```
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
```
  1fd74f22
- Don't fail when building a Docker image w/ no tags · 61114577
  Emi Simpson authored May 28, 2020
```
Prevents a Docker build from failing if the git repository it's being
built in has not tag specified.  This becomes relevant when projects
fork the main repository, but haven't yet released a tag.
```
  61114577
28 May, 2020 6 commits
- i18n · bc425457
  Michael Telatynski authored May 28, 2020
```
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
```
  bc425457
- Get rid of welcome.html's Chat with Riot Bot button · a6683cec
  Michael Telatynski authored May 28, 2020
```
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
```
  a6683cec
- Merge branch 'origin/develop' into Weblate. · 4252735d
  Weblate authored May 28, 2020
  
  4252735d
- Merge pull request #13776 from vector-im/t3chguy/toasts3_2 · c68f3506
  Michael Telatynski authored May 28, 2020
```
Replace New Version Bar with a Toast
```
  c68f3506
- Merge branch 'origin/develop' into Weblate. · ec995fb1
  Weblate authored May 28, 2020
  
  ec995fb1
- Translated using Weblate (Lithuanian) · 154586f4
  MamasLT authored May 27, 2020
```
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
```
  154586f4