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

9165 Commits

Author SHA1 Message Date
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
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
Michael Telatynski 1fd74f22c8 Give contextual feedback for manual update check instead of banner 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 18:24:45 +01:00
Hubert Chathi fb62f6dfb4 make IPC calls to get pickle key 2020-05-28 14:44:38 -04:00
Michael Telatynski bc4254574d i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 19:08:03 +01:00
Michael Telatynski a6683cec67 Get rid of welcome.html's Chat with Riot Bot button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 18:49:36 +01:00
Weblate 4252735db0 Merge branch 'origin/develop' into Weblate. 2020-05-28 17:30:36 +00:00
Michael Telatynski c68f35060a
Merge pull request #13776 from vector-im/t3chguy/toasts3_2 
Replace New Version Bar with a Toast
 2020-05-28 18:30:31 +01:00
Weblate ec995fb151 Merge branch 'origin/develop' into Weblate. 2020-05-28 16:05:51 +00:00
MamasLT 154586f452 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-28 16:05:50 +00:00
XoseM 40cf610986 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-28 16:05:50 +00:00
Travis Ralston 0f087f7a5a
Merge pull request #13814 from vector-im/travis/cleanup-lockfile 
Remove webpack-build-notifier from lockfile
 2020-05-28 10:05:44 -06:00
Michael Telatynski af8fb33b83 add line 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 14:28:14 +01:00
Michael Telatynski 361cc4ab5c Add app-load doc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 14:26:51 +01:00
Michael Telatynski 57d2026a40 Modernizr check for subtle crypto as we require it all over the place 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 00:31:22 +01:00
Weblate 7185ae17b1 Merge branch 'origin/develop' into Weblate. 2020-05-27 15:04:17 +00:00
Travis Ralston 332be9b4e1
Merge pull request #13818 from TitanNano/9814 
Add media queries and mobile viewport (#12142)
 2020-05-27 09:04:10 -06:00
Jovan Gerodetti 061619929e Integrate requested changes from #12142 2020-05-27 16:50:35 +02:00
Dale Harvey 74f798157f Add media queries and mobile viewport 2020-05-27 16:50:35 +02:00
yuuki-san e7d22fa086 Translated using Weblate (Slovak) 
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/sk/
 2020-05-27 09:43:52 +00:00
Microtus62 a2914cff94 Translated using Weblate (Slovak) 
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/sk/
 2020-05-27 09:43:52 +00:00
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