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

8764 Commits

Author SHA1 Message Date
J. Ryan Stinnett 5b94d8bbd7 Add line about UI for network activity 2020-03-26 11:28:51 +00:00
Weblate 8549755fd5 Merge branch 'origin/develop' into Weblate. 2020-03-25 15:25:17 +00:00
David Baker 5c51063070
Merge pull request #12875 from vector-im/dbkr/fix_artifact_search 
Fix artifact searching in redeployer
 2020-03-25 15:25:12 +00:00
David Baker 758d021f97 Merge remote-tracking branch 'origin/develop' into dbkr/fix_artifact_search 2020-03-25 15:18:20 +00:00
David Baker fea600ba0a Fix artifact searching in redeployer 
Indenting fail
 2020-03-25 15:12:53 +00:00
Michael Telatynski fd385f8450 simplify loadConfig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 14:37:28 +00:00
Michael Telatynski 92d8ee355d merge initial-load.ts into init.ts as its no longer used by Jitsi 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 14:32:37 +00:00
Michael Telatynski 1f94b25d25 Fix copyrights 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 14:28:07 +00:00
Michael Telatynski 8929cd9c08 Merge branches 'develop' and 't3chguy/app_load_tweaks' of github.com:vector-im/riot-web into t3chguy/app_load_tweaks 2020-03-25 14:26:48 +00:00
Weblate 24d85c5cd7 Merge branch 'origin/develop' into Weblate. 2020-03-25 14:26:12 +00:00
Ege 4b7cf489c8 Translated using Weblate (Turkish) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2020-03-25 14:26:12 +00:00
roket1428 990a96b56d Translated using Weblate (Turkish) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2020-03-25 14:26:12 +00:00
Ganzo DG cb23da12cb Translated using Weblate (Mongolian) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/mn/
 2020-03-25 14:26:11 +00:00
Travis Ralston dec2f2a39e
Merge pull request #12845 from vector-im/travis/config-wrapper 
Fix Jitsi wrapper being large by getting the config from elsewhere
 2020-03-25 08:26:06 -06:00
Michael Telatynski 6315907585 Typescript stuff. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 14:07:22 +00:00
Michael Telatynski 6fb9fc4e6f move loadLanguage to init.ts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 13:55:25 +00:00
Michael Telatynski df2b966acd move loadOlm to init.ts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 13:54:02 +00:00
Michael Telatynski b09b47543b Merge branches 'develop' and 't3chguy/app_load_tweaks' of github.com:vector-im/riot-web into t3chguy/app_load_tweaks 2020-03-25 12:45:10 +00:00
Michael Telatynski a808d26764 Enable webpack reuseExistingChunk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 12:41:33 +00:00
Michael Telatynski e669c681e2 Fetch both config.json-s at the same time, first one fails 99% of the time 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 12:39:42 +00:00
Matt N b8ca1f920e
Don't immediately remove notifications from notification trays 
Let the notifications go into browser/OS notification trays so users can click on them from there if they miss the initial notification. Modern Chrome uses OS notifications so the user is in control of the the notification with the OS. This also aligns with the Electron platform version.

Signed-off-by: Matthew Noorenberghe <github@matthew.noorenberghe.com>
 2020-03-24 17:27:14 -07:00
Weblate 4d983f037e Merge branch 'origin/develop' into Weblate. 2020-03-24 16:41:35 +00:00
Michael Telatynski c10732736c
Merge pull request #12832 from vector-im/t3chguy/webpack-stats 
Add webpack stats which will be used by CI and stored to artifacts
 2020-03-24 16:41:30 +00:00
Travis Ralston bde5679d11 Ask for Riot config over postMessage for the Jitsi widget 
Fixes https://github.com/vector-im/riot-web/issues/12839 by not using the app load order that doesn't detect the right platform anyways.
 2020-03-24 09:54:15 -06:00
Weblate 783f3c6955 Merge branch 'origin/develop' into Weblate. 2020-03-24 15:15:39 +00:00
Travis Ralston 4de93a8cdd
Merge pull request #12842 from vector-im/revert-12836-travis/jitsi-wrapper 
Revert "Remove useless app preloading from Jitsi widget wrapper"
 2020-03-24 09:15:34 -06:00
Travis Ralston 4087ba0c5c
Revert "Remove useless app preloading from Jitsi widget wrapper" 2020-03-24 09:14:59 -06:00
Weblate cd399f0284 Merge branch 'origin/develop' into Weblate. 2020-03-24 14:54:59 +00:00
roket1428 b41d318e62 Translated using Weblate (Turkish) 
Currently translated at 96.0% (24 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2020-03-24 14:54:59 +00:00
random 97243e9c59 Translated using Weblate (Italian) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2020-03-24 14:54:58 +00:00
Nathan Follens 3aee541cb9 Translated using Weblate (Dutch) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2020-03-24 14:54:58 +00:00
Travis Ralston da455c2a14
Merge pull request #12836 from vector-im/travis/jitsi-wrapper 
Remove useless app preloading from Jitsi widget wrapper
 2020-03-24 08:54:52 -06:00
Wilco Baan Hofman 679331323a Translated using Weblate (Dutch) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2020-03-24 09:00:37 +00:00
Travis Ralston 350a52b44e Remove useless app preloading from Jitsi widget wrapper 
We should always have conference information, and if we don't then the widget is invalid.
 2020-03-23 10:38:10 -06:00
Michael Telatynski 0620da4351 Add webpack stats which will be used by CI and stored to artifacts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-23 12:07:26 +00:00
David Baker c4bece1fd5
Merge pull request #12829 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-03-23 10:07:32 +00:00
Tentarial 080076e3e4 Translated using Weblate (German) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2020-03-23 09:55:16 +00:00
Kévin C f4ef7ba7e1 Translated using Weblate (French) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2020-03-23 09:55:16 +00:00
Jeff Huang ffb7126582 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2020-03-23 09:55:16 +00:00
Slavi Pantaleev e22ade38f9 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2020-03-23 09:55:16 +00:00
Osoitz ae9c02b456 Translated using Weblate (Basque) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2020-03-23 09:55:15 +00:00
Weblate 9539c14f2f Merge branch 'origin/develop' into Weblate. 2020-03-20 11:53:08 +00:00
Besnik Bleta a560d3586a Translated using Weblate (Albanian) 
Currently translated at 100.0% (25 of 25 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/
 2020-03-20 11:53:08 +00:00
J. Ryan Stinnett ffd155a6aa
Merge pull request #12799 from vector-im/jryans/docker-version-release 
Fix version for Docker builds
 2020-03-20 11:53:02 +00:00
Weblate fbf4437159 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:45:16 +00:00
Michael Telatynski f5ac675379
Merge pull request #12800 from vector-im/t3chguy/shortcuts2 
Register Mac electron specific Cmd+, shortcut to User Settings
 2020-03-20 10:45:07 +00:00
Michael Telatynski 3d266cb237 Register Mac electron specific Cmd+, shortcut to User Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 23:42:10 +00:00
J. Ryan Stinnett 4afe7a73c4 Fix version for Docker builds 
This (should) fix the version script for Docker builds by testing the branch
with a regex instead of single char glob.

Fixes https://github.com/vector-im/riot-web/issues/12777
 2020-03-19 21:00:37 +00:00
Weblate f377dfcad4 Merge branch 'origin/develop' into Weblate. 2020-03-19 17:52:28 +00:00
Travis Ralston 775e1fc4ae
Merge pull request #12780 from vector-im/travis/wrapped-jitsi 
Use a local widget wrapper for Jitsi calls
 2020-03-19 11:52:22 -06:00