Commit graph

9096 commits

Author SHA1 Message Date
Jorik Schellekens
43c0148123 Fix @types/react conflict in matrix-react-sdk 2020-05-25 18:37:30 +01:00
Michael Telatynski
b4284b4c68
Merge pull request #13756 from vector-im/t3chguy/toasts2
Convert platforms to Typescript
2020-05-22 16:35:57 +01:00
RiotRobot
ef60265bb6 Reset matrix-react-sdk back to develop branch 2020-05-22 14:36:23 +01:00
RiotRobot
aed4568882 Reset matrix-js-sdk back to develop branch 2020-05-22 14:36:11 +01:00
RiotRobot
b9ea0af44c Merge branch 'master' into develop 2020-05-22 14:35:27 +01:00
RiotRobot
075299a7eb v1.6.2 2020-05-22 14:21:24 +01:00
RiotRobot
55cba2caa3 Prepare changelog for v1.6.2 2020-05-22 14:21:23 +01:00
RiotRobot
9e88a7d1c0 Upgrade matrix-react-sdk to 2.6.1 2020-05-22 14:17:58 +01:00
Michael Telatynski
6c92b26875
Merge pull request #13764 from vector-im/t3chguy/toasts3
Fix EventEmitter typescript signature in node typings
2020-05-22 14:03:29 +01:00
Michael Telatynski
3bbd3e246a Fix EventEmitter typescript signature in node typings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 13:52:40 +01:00
Travis Ralston
42a2f83603
Merge pull request #13675 from vector-im/travis/room-list-2
Add docs and labs flag for new room list implementation
2020-05-21 13:30:35 -06:00
Travis Ralston
6f7570d877
Merge branch 'develop' into travis/room-list-2 2020-05-21 13:29:20 -06:00
Michael Telatynski
d7ee8e13cc make ts happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 18:25:52 +01:00
Michael Telatynski
cb0e3bba38 mark VectorBasePlatform as an abstract class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-21 18:07:01 +01:00
Michael Telatynski
706972eff2 tidy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-20 20:01:51 +01:00
Michael Telatynski
6ec613c2c2 Convert various things to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-20 19:56:54 +01:00
Travis Ralston
03414d92d0
Merge pull request #13352 from vector-im/revert-13351-revert-13199-joriks/font-sclaing-slider
Add font scaling labs setting.
2020-05-20 10:05:28 -06:00
Travis Ralston
aae5e4c234
Merge pull request #13350 from JorikSchellekens/joriks/font-sclaing-slider
Add labs flag for alternate message layouts
2020-05-19 14:53:01 -06:00
Jorik Schellekens
3a7578b7ee Remove avatar flag 2020-05-19 18:30:30 +01:00
RiotRobot
16ecc007d6 Reset matrix-react-sdk back to develop branch 2020-05-19 11:36:17 +01:00
RiotRobot
92b94af9ed Reset matrix-js-sdk back to develop branch 2020-05-19 11:36:07 +01:00
RiotRobot
ef0076bd83 Merge branch 'master' into develop 2020-05-19 11:34:45 +01:00
RiotRobot
482d6a7fb3 v1.6.1 2020-05-19 11:31:35 +01:00
RiotRobot
02784379f8 Prepare changelog for v1.6.1 2020-05-19 11:31:35 +01:00
RiotRobot
a9fbc190bf Upgrade matrix-react-sdk to 2.6.0 2020-05-19 11:28:08 +01:00
RiotRobot
f35ec09b54 Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:27:41 +01:00
Travis Ralston
6d99c08e59
Merge pull request #13666 from vector-im/travis/dispatcher-types
Move dispatcher references in support of TypeScript conversion
2020-05-18 23:22:35 -06:00
David Baker
1f1c1279ea
Merge pull request #13704 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2020-05-18 10:23:46 +01:00
Michael Telatynski
c565af1ade
Merge pull request #13649 from vector-im/t3chguy/favico
Replace favico.js dependency with simplified variant grown from it
2020-05-18 10:19:23 +01:00
Weblate
4e92d09cca Merge branch 'origin/develop' into Weblate. 2020-05-17 21:45:07 +00:00
Xose M
c442a89253 Translated using Weblate (Galician)
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/gl/
2020-05-17 21:45:07 +00:00
J. Ryan Stinnett
96a550b88a
Merge pull request #13688 from vector-im/jryans/rm-electron-scripts
Remove Electron packaging scripts
2020-05-17 22:45:00 +01:00
Reinis Mednis
0da3534ef5 Translated using Weblate (Latvian)
Currently translated at 86.1% (31 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
2020-05-16 07:22:11 +00:00
Tuomas Hietala
7a17172f50 Translated using Weblate (Finnish)
Currently translated at 97.2% (35 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2020-05-16 07:22:05 +00:00
Besnik Bleta
343f19f3b0 Translated using Weblate (Albanian)
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/sq/
2020-05-16 07:22:01 +00:00
J. Ryan Stinnett
40f40251f1 Remove Electron packaging scripts
These tasks are handled by riot-desktop now.
2020-05-15 17:56:23 +01:00
Travis Ralston
429494aad4 Enable room list labs flag
For the intrepid testers who don't care about losing room list features.
2020-05-14 14:26:09 -06:00
Travis Ralston
81010a4f2f Add docs for room list labs flag 2020-05-14 14:24:34 -06:00
Travis Ralston
e3f2e97b9f Merge branch 'travis/dispatcher-types' into travis/room-list-2 2020-05-14 14:21:43 -06:00
Michael Telatynski
5feadbc18e Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/favico 2020-05-14 21:20:04 +01:00
Michael Telatynski
4532ddbb2d Add support for badge override opts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 21:19:54 +01:00
Michael Telatynski
5b59c67012
Merge pull request #13674 from vector-im/t3chguy/progress_colour
Fix postcss order to allow mixin variables to work
2020-05-14 20:37:49 +01:00
Michael Telatynski
99df2d3126 Fix postcss order to allow mixin variables to work
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 18:46:16 +01:00
Michael Telatynski
7246d9f2d6
Merge pull request #13650 from vector-im/t3chguy/sso_hash
Pass screenAfterLogin through SSO in the callback url
2020-05-14 17:30:32 +01:00
RiotRobot
f56ee6df34 v1.6.1-rc.1 2020-05-14 16:53:00 +01:00
RiotRobot
475e7d0f31 Prepare changelog for v1.6.1-rc.1 2020-05-14 16:53:00 +01:00
RiotRobot
8bf9635fc8 Remove Electron steps from release script 2020-05-14 16:40:25 +01:00
RiotRobot
fe32590e30 Upgrade matrix-react-sdk to 2.6.0-rc.1 2020-05-14 16:35:02 +01:00
RiotRobot
710dc18f2c Upgrade matrix-js-sdk to 6.1.0-rc.1 2020-05-14 16:33:28 +01:00
J. Ryan Stinnett
4682b093a9
Merge pull request #13673 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2020-05-14 16:00:08 +01:00