PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
20337 commits 1 branch 0 tags 338 MiB
Commit graph

20337 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Travis Ralston
615648af13 Fix tabbed view export for component index 2019-12-22 21:23:14 -07:00
Travis Ralston
0d2cb6e731 Import haveTileForEvent() from the right place 2019-12-22 21:23:07 -07:00
Travis Ralston
2461993ad1 Merge branch 'travis/sourcemaps-es6' into travis/babel7-wp-es6-fixes 2019-12-22 21:22:52 -07:00
Travis Ralston
d002c2ccde Merge branch 'travis/babel7-wp-es6-export' into travis/sourcemaps-es6 2019-12-22 21:20:13 -07:00
Travis Ralston
0c11e03039 Merge branch 'travis/babel7-wp-es6-imports-2' into travis/sourcemaps-es6 2019-12-22 21:20:05 -07:00
Travis Ralston
f1ac3d2f64 Convert imports to ES6 from CommonJS 
This is needed because `require()` means something different in webpack - it ends up importing the module as something we didn't expect (and is occasionally async)
 2019-12-22 21:16:06 -07:00
Travis Ralston
042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston
5a17406fe9 Merge branch 'travis/babel7-wp-es6-js-sdk' into travis/babel7-wp-es6-mcp 2019-12-22 21:15:40 -07:00
Travis Ralston
806d728d59 Import from the js-sdk's src/ directory 
Because ES6 and such.
 2019-12-22 21:14:33 -07:00
Travis Ralston
be4eeb5e07 Fix js-sdk imports for new module 2019-12-22 21:10:26 -07:00
Travis Ralston
7993515099 Merge branch 'travis/babel7-wp-es6-imports' into travis/babel7-wp-es6-js-sdk 2019-12-22 21:10:03 -07:00
Travis Ralston
d56f0f2a25 Convert many imports to handle ES6 exports 
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
 2019-12-22 21:04:42 -07:00
Travis Ralston
4aec432b30 Convert the more complicated CommonJS exports to ES6-style 2019-12-22 21:01:03 -07:00
Travis Ralston
344dac4fb9 Convert CommonJS exports to ES6-compatible exports 
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
 2019-12-22 21:01:02 -07:00
Travis Ralston
0b0fe92b17 Convert resizer to ES6 2019-12-22 20:57:46 -07:00
Travis Ralston
e7928e8def Use flex-start instead of start for postcss 
This is just something the loaders complain about - apparently `start` is old and we should feel bad.
 2019-12-22 20:56:19 -07:00
Weblate
245d83af43 Merge branch 'origin/develop' into Weblate. 2019-12-21 20:59:35 +00:00
Michael Telatynski
0b62f8a62f
Merge pull request #3759 from matrix-org/t3chguy/fix_room_list_filtering 
Fix room list filtering weird case sensitivity
 2019-12-21 20:59:29 +00:00
Michael Telatynski
24a1017d6d
Fix typo in comment 2019-12-21 20:26:32 +00:00
Weblate
69a077df29 Merge branch 'origin/develop' into Weblate. 2019-12-21 17:41:10 +00:00
Weblate
652998245c Merge branch 'origin/develop' into Weblate. 2019-12-21 17:41:08 +00:00
catborise
3dcef53b93 Translated using Weblate (Turkish) 
Currently translated at 33.8% (677 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2019-12-21 17:41:08 +00:00
Peter Vágner
9a51b41846 Translated using Weblate (Slovak) 
Currently translated at 77.8% (1556 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2019-12-21 17:41:03 +00:00
David Baker
25f59ed43d
Merge pull request #3758 from matrix-org/dbkr/hide_verify_if_verified 
Don't show the 'verify' button if the user is verified
 2019-12-21 17:41:01 +00:00
Szimszon
fef19c510c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-12-21 17:40:59 +00:00
Kévin C
0e7949d73e Translated using Weblate (French) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-12-21 17:40:57 +00:00
Jeff Huang
21dcf65858 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-12-21 17:40:57 +00:00
David Baker
8fbd35f1e9
Merge pull request #3757 from matrix-org/dbkr/switch_to_checkdevicetrust 
Switch to using checkDeviceTrust
 2019-12-21 17:40:50 +00:00
Michael Telatynski
e936f7eb09 Fix room list filtering weird case sensitivity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-21 11:13:37 +00:00
David Baker
376bf7e213 i18n 2019-12-20 16:56:38 +00:00
David Baker
a928b33f27 Don't show the 'verify' button if the user is verified 
Which is more in keeping with the designs (and we can do this now
that the new user info panel is only enabled with cross signing).
 2019-12-20 16:51:50 +00:00
David Baker
b998e6ffe8 Switch to using checkDeviceTrust 
In the UserInfo panel. This means we now use cross-signing
verifications in the UserInfoPanel so we can see our cross-signing
verifications working!

Lots more to do here: the remaining device.isVerified() calls in
UserInfoPanel are where it needs to be switched to verifying users
rather than devices, and of course we need to replace all the calls
to device.isVerified() with checkDeviceTrust everywhere else.
 2019-12-20 11:31:11 +00:00
Michael Telatynski
3a36d61fab delint 2019-12-19 21:10:22 +00:00
Michael Telatynski
d9ea9b4ad3 Iterate to match design on Zeplin 2019-12-19 20:53:34 +00:00
Weblate
970f16df3d Merge branch 'origin/develop' into Weblate. 2019-12-19 20:32:18 +00:00