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

9422 Commits

Author SHA1 Message Date
Michael Telatynski c17bcda1ba Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:vector-im/riot-web into t3chguy/toasts3_2 2020-05-27 09:58:08 +01:00
Travis Ralston b9794ea6e4 Remove webpack-build-notifier from lockfile 2020-05-26 13:50:31 -06:00
Jorik Schellekens 492dd42f4d
Merge pull request #13809 from JorikSchellekens/develop 
Fix @types/react conflict in matrix-react-sdk
 2020-05-26 16:12:46 +01:00
Michael Telatynski 29ff40eee5
Merge pull request #13808 from vector-im/t3chguy/arrow-funcs-super 
Fix manual update checking, super in arrow funcs doesn't work
 2020-05-26 10:13:02 +01:00
Michael Telatynski 3ad3c3ca0a Fix super in arrow funcs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-26 10:04:49 +01:00
David Baker 6723e71eb2
Merge pull request #13806 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-05-26 09:43:28 +01:00
Jorik Schellekens 43c0148123 Fix @types/react conflict in matrix-react-sdk 2020-05-25 18:37:30 +01:00
Michael Telatynski f546d8bc15 Update Modular hosting link 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-23 08:48:30 +01:00
Michael Telatynski 48a618264a Replace New Version Bar with a Toast 
discards the `new_version` dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:08:46 +01:00
Weblate 19a19cde2f Merge branch 'origin/develop' into Weblate. 2020-05-22 15:36:04 +00:00
Osoitz 733e38cab1 Translated using Weblate (Basque) 
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/eu/
 2020-05-22 15:36:04 +00: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
Weblate 34e92adf05 Merge branch 'origin/develop' into Weblate. 2020-05-22 13:36:55 +00: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
Weblate 7d517053b1 Merge branch 'origin/develop' into Weblate. 2020-05-22 13:35:49 +00: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
Weblate b7db59eeb2 Merge branch 'origin/develop' into Weblate. 2020-05-22 13:03:35 +00: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
Weblate 26c5cdf2c5 Merge branch 'origin/develop' into Weblate. 2020-05-21 19:30:41 +00:00
yuuki-san af76675552 Translated using Weblate (Slovak) 
Currently translated at 94.4% (34 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2020-05-21 19:30:41 +00:00
MamasLT 134833c7d4 Translated using Weblate (Lithuanian) 
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/
 2020-05-21 19:30:41 +00: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
Weblate 9874c2c455 Merge branch 'origin/develop' into Weblate. 2020-05-20 16:05:35 +00:00
MamasLT 1412d11d67 Translated using Weblate (Lithuanian) 
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/
 2020-05-20 16:05:35 +00:00
Xose M cbbb53cc90 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-20 16:05:34 +00: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
Weblate 199139efff Merge branch 'origin/develop' into Weblate. 2020-05-19 20:53:06 +00: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
yuuki-san 18b5fbaa6e Translated using Weblate (Slovak) 
Currently translated at 88.9% (32 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2020-05-19 17:28:48 +00:00
Weblate 72513697af Merge branch 'origin/develop' into Weblate. 2020-05-19 10:36:26 +00: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
Weblate 4addf64551 Merge branch 'origin/develop' into Weblate. 2020-05-19 10:35:50 +00: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
Weblate 81db5900f0 Merge branch 'origin/develop' into Weblate. 2020-05-19 05:22:41 +00:00