Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 13:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,306 Commits 206 Branches 552 Tags 518 MiB
dc914774fb
Commit Graph

20306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
187e755799 Merge branch 'origin/develop' into Weblate. 2019-12-26 18:05:53 +00:00
ferhad.necef
c1c0c36008 Translated using Weblate (Azerbaijani) 
Currently translated at 22.4% (448 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
 2019-12-26 18:05:53 +00:00
Michael Telatynski
115e773317
Merge pull request #3780 from ps0305/ps0305-patch-1 
Fix spelling and grammar in README
 2019-12-26 18:05:47 +00:00
Michael Telatynski
73800c9a92 Fix UserInfo promote user inverted buttons 2019-12-26 18:04:58 +00:00
Pankaj Kumar Singh
a9cae90a52 Signed-off-by Pankaj Singh <singh.pankaj@live.com 2019-12-26 23:11:17 +05:30
Weblate
2a36bdf1eb Merge branch 'origin/develop' into Weblate. 2019-12-25 22:16:28 +00:00
catborise
7043453d3e Translated using Weblate (Turkish) 
Currently translated at 44.7% (894 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2019-12-25 22:16:27 +00:00
ferhad.necef
a0e816d134 Translated using Weblate (Russian) 
Currently translated at 90.8% (1816 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-12-25 22:16:19 +00:00
Szimszon
5e4f341cd8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-12-25 22:16:18 +00:00
Samu Voutilainen
b8dbd32363 Translated using Weblate (Finnish) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-12-25 22:16:18 +00:00
Jeff Huang
b4a569dfc7 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-12-25 22:16:15 +00:00
ferhad.necef
abb5ea2df8 Translated using Weblate (Azerbaijani) 
Currently translated at 22.3% (447 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
 2019-12-25 22:16:15 +00:00
Travis Ralston
e7eac2ec85
Merge pull request #3776 from matrix-org/travis/fix-resizer 
Reintroduce working resizer code for right panel
 2019-12-25 15:16:03 -07:00
Travis Ralston
58f169be92
Merge pull request #3769 from matrix-org/travis/babel7-wp-lang-dropdown 
Define getLanguageFromBrowser() for LanguageDropdown
 2019-12-25 15:15:55 -07:00
Travis Ralston
9cb810e55f
Merge pull request #3768 from matrix-org/travis/babel7-wp-bbl-pl 
Introduce babel's export-default-from plugin to fix build errors
 2019-12-25 15:15:41 -07:00
Travis Ralston
8a8b23eaed
Merge pull request #3770 from matrix-org/travis/babel7-wp-skin-dbg 
Add a bit of debugging to incorrect components in the Skinner
 2019-12-25 15:15:34 -07:00
Travis Ralston
92ea1157be Reintroduce working resizer code for right panel 
Fixes https://github.com/vector-im/riot-web/issues/11674

This re-introduces and adapted version of what was there before, but fixed for the new collapsed logic: https://github.com/matrix-org/matrix-react-sdk/pull/3703/files#diff-633a0248e235d7446a8868a9145efce2L77-L93

We no longer have a collapsedRhs variable and only set the panel when it is opened, so we can accurately track expanded/collapsed state through presence of a panel.
 2019-12-23 19:26:59 -07:00
Weblate
602aee02f6 Merge branch 'origin/develop' into Weblate. 2019-12-23 19:40:08 +00:00
Michael Telatynski
8c70eda517
Merge pull request #3775 from matrix-org/t3chguy/fix_TopLeftMenu_help 
Fix wrong scope binding on openHelp for TopLeftMenu
 2019-12-23 19:40:02 +00:00
Michael Telatynski
25d864c39d Fix wrong scope binding on openHelp for TopLeftMenu 2019-12-23 19:29:43 +00:00
Weblate
6a148050e3 Merge branch 'origin/develop' into Weblate. 2019-12-23 18:33:11 +00:00
Michael Telatynski
23b9b98f7b
Merge pull request #3774 from matrix-org/t3chguy/userinfo_tweaks 
UserInfo hide kick/mute buttons if they make no sense
 2019-12-23 18:33:05 +00:00
Michael Telatynski
0497ef228d UserInfo hide kick/mute buttons if they make no sense 2019-12-23 18:20:59 +00:00
Weblate
746522358f Merge branch 'origin/develop' into Weblate. 2019-12-23 18:10:56 +00:00
Kévin C
178dbdca5b Translated using Weblate (French) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-12-23 18:10:56 +00:00
Michael Telatynski
659644e612
Merge pull request #3773 from matrix-org/t3chguy/fix_incoming_call_dup 
Fix duplicate Incoming Call prompt on Community Invite sublist
 2019-12-23 18:10:51 +00:00
Michael Telatynski
e552195701 Fix duplicate Incoming Call prompt on Community Invite sublist 2019-12-23 17:57:53 +00:00
Weblate
566e825e0b Merge branch 'origin/develop' into Weblate. 2019-12-23 17:18:13 +00:00
Michael Telatynski
6e9791c950
Merge pull request #3755 from matrix-org/t3chguy/tags_changes 
Apply new design to highlighted tags and add toggle mechanic
 2019-12-23 17:18:07 +00:00
Weblate
da37d02215 Merge branch 'origin/develop' into Weblate. 2019-12-23 17:16:53 +00:00
Michael Telatynski
1098fc939a
Merge pull request #3771 from matrix-org/t3chguy/ReactDOM.findDOMNode 
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
 2019-12-23 17:16:47 +00:00
Weblate
398f772e6c Merge branch 'origin/develop' into Weblate. 2019-12-23 17:16:11 +00:00
catborise
131ecfe912 Translated using Weblate (Turkish) 
Currently translated at 36.8% (736 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2019-12-23 17:16:11 +00:00
random
4d61e0bbe7 Translated using Weblate (Italian) 
Currently translated at 99.9% (1999 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-12-23 17:16:07 +00:00
Samu Voutilainen
e47ac5fbb5 Translated using Weblate (Finnish) 
Currently translated at 97.0% (1940 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-12-23 17:16:06 +00:00
Michael Telatynski
1da55c530b
Merge pull request #3772 from matrix-org/t3chguy/alts 
Add alt="" to presentational images
 2019-12-23 17:15:58 +00:00
Michael Telatynski
8018097e56 Add alt="" to presentational images 2019-12-23 14:13:56 +00:00
Michael Telatynski
207045e979 fix ReadReceiptMarker ref 2019-12-23 12:54:31 +00:00
Michael Telatynski
17f5849985 stop using ReactDOM.findDOMNode in componentWillUnmount, use refs 2019-12-23 12:24:49 +00:00
Michael Telatynski
84eb72b0e0 fix alignment 2019-12-23 11:38:52 +00:00
Michael Telatynski
afcbb218fa match padding on CustomRoomTagPanel and fix colour of Communities btn 2019-12-23 11:31:30 +00:00
Michael Telatynski
661701f7ca Merge branches 'develop' and 't3chguy/tags_changes' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/tags_changes 
 Conflicts:
	src/components/views/elements/TagTile.js
 2019-12-23 11:00:42 +00:00
Travis Ralston
3eb3be45d1 Fix import of language index 
This is a similar fix to 18ac2db2ea
 2019-12-22 21:44:29 -07:00
Travis Ralston
56adb8244b Add a bit of debugging to incorrect components in the Skinner 2019-12-22 21:41:01 -07:00
Travis Ralston
cfa21cbb8c Define getLanguageFromBrowser() for LanguageDropdown 
Without it we can't compile, so we should define it. It looks like it's never been defined, and LanguageDropdown seems to use it as a last resort - it should be safe to land.
 2019-12-22 21:38:44 -07:00
Travis Ralston
23e5333935 Introduce babel's export-default-from plugin to fix build errors 
We do a lot of default exporting, so we kinda need this. It even asks for it to be installed when it is missing.
 2019-12-22 21:36:56 -07:00
Travis Ralston
69424f4b42 Add package.json fields for riot-web's webpack 
See a1c9551bc8
 2019-12-22 21:34:39 -07:00
Travis Ralston
d8da634c8b Cosmetic updates to package.json 2019-12-22 21:34:27 -07:00
Travis Ralston
539a33c722 Fix naming conflict in VectorConferenceHandler 2019-12-22 21:26:10 -07:00
Travis Ralston
18ac2db2ea Fix Notifier imports in NotificationControllers 
require() is a bit weird for riot-web's webpack, so we fork it out to its own function to reduce the weirdness. 

The added weirdness is that require() is sync though exports a module instead. If we use import(), we get a promise which doesn't help us here. We therefore have to require() and pull out the default export, though this is only a problem for webpack - babel (our chosen compiler for exporting ES6) doesn't need this, hence the if statement.
 2019-12-22 21:25:47 -07:00