Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,688 Commits 206 Branches 552 Tags 518 MiB
365041c6c3
Commit Graph

8688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RiotRobot
365041c6c3 Merge branch 'master' into develop 2020-03-30 13:52:20 +01:00
RiotRobot
413b26d71b v1.5.14 2020-03-30 13:48:40 +01:00
RiotRobot
45ff2fdcde Prepare changelog for v1.5.14 2020-03-30 13:48:39 +01:00
RiotRobot
5bd155c294 v1.5.14 2020-03-30 13:45:32 +01:00
RiotRobot
51f4327ce1 Upgrade matrix-react-sdk to 2.3.0 2020-03-30 13:45:21 +01:00
RiotRobot
37cebf38cc Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:44:42 +01:00
Michael Telatynski
e895fed180
Merge pull request #12925 from JorikSchellekens/joriks/review-review 
Some grammar and clarifications
 2020-03-30 12:13:00 +01:00
Jorik Schellekens
6ed81eadbf Some grammar and clarifications. 2020-03-30 11:52:23 +01:00
Travis Ralston
d9fbbe1696
Merge pull request #12861 from mnoorenberghe/patch-1 
Don't immediately remove notifications from notification trays
 2020-03-26 09:33:11 -06:00
David Baker
f746c70dc6
Merge pull request #12894 from vector-im/dbkr/kill_riotbot 
Remove welcome user from config
 2020-03-26 15:06:13 +00:00
David Baker
a3d09e6d54 Remove welcome user from config 
Until we update its tutorial videos to the current interface
 2020-03-26 14:51:46 +00:00
RiotRobot
0a83f9c763 v1.5.14-rc.1 2020-03-26 13:31:03 +00:00
RiotRobot
f5c5c1b991 Prepare changelog for v1.5.14-rc.1 2020-03-26 13:31:03 +00:00
RiotRobot
bfcb46c4fd v1.5.14-rc.1 2020-03-26 13:28:13 +00:00
RiotRobot
5b35d6e570 Upgrade matrix-react-sdk to 2.3.0-rc.1 2020-03-26 13:28:04 +00:00
RiotRobot
9269d9b669 Upgrade matrix-js-sdk to 5.2.0-rc.1 2020-03-26 13:27:40 +00:00
J. Ryan Stinnett
ec32abbb89
Merge pull request #12890 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-03-26 12:14:15 +00:00
Weblate
c1884a26aa Merge branch 'origin/develop' into Weblate. 2020-03-26 12:03:29 +00:00
Michael Telatynski
1d109bb067
Merge pull request #12869 from vector-im/t3chguy/app_load_tweaks 
App load tweaks
 2020-03-26 12:03:23 +00:00
Weblate
35e443975d Merge branch 'origin/develop' into Weblate. 2020-03-26 11:43:07 +00:00
Szimszon
1963270d64 Translated using Weblate (Hungarian) 
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/hu/
 2020-03-26 11:43:06 +00:00
Tirifto
3072bbb0d7 Translated using Weblate (Esperanto) 
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/eo/
 2020-03-26 11:43:06 +00:00
J. Ryan Stinnett
1697cdc5a1
Merge pull request #12730 from vector-im/jryans/review-policy 
Add review policy doc
 2020-03-26 11:43:00 +00:00
J. Ryan Stinnett
da249cbc40 Merge remote-tracking branch 'origin/develop' into jryans/review-policy 2020-03-26 11:34:29 +00:00
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