Michael Telatynski
eff0e6fcc3
Add facepile to Space landing page and tweak layout slightly
2021-03-26 13:11:57 +00:00
Michael Telatynski
4341dfb314
Iterate facepiles, fix default avatar alignment and sort explicit avatars first
2021-03-26 11:55:22 +00:00
Travis Ralston
8bc2356fd0
Fix crash on login when using social login
...
We weren't passing a matrix client through, and the peg wasn't set at this point. Just need to thread it through to the media endpoints.
Fixes https://github.com/vector-im/element-web/issues/16765
2021-03-25 22:22:43 -06:00
Michael Telatynski
09601f1071
Add display name tooltip to the facepile avatars
2021-03-26 00:05:05 +00:00
Michael Telatynski
ea77ab125e
Show a face pile on a space preview
2021-03-25 16:15:34 +00:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10
...
Improve discovery of rooms in a space
2021-03-22 13:24:23 +00:00
Tulir Asokan
cdf8f09ec2
Remove unused import and run yarn i18n
2021-03-20 13:38:42 +02:00
Tulir Asokan
99717db762
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-03-19 21:58:30 +02:00
Michael Telatynski
d04c8b3fb4
Improve discovery of rooms in a space
2021-03-19 11:54:10 +00:00
Travis Ralston
be8ee1a576
Appease the linter
2021-03-18 21:05:51 -06:00
Travis Ralston
1d9d0cd7be
Convert a bunch more js-sdk imports to absolute paths
...
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
Šimon Brandner
c96d2621a0
Set max-width and MIN_ZOOM
...
This might have some side effects but as far as I can tell they shouldn't be too problematic
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-16 19:57:14 +01:00
Šimon Brandner
8f6f9cd6fa
Remove some unnecessary CSS and set MIN_ZOOM to 95
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-15 20:37:39 +01:00
Šimon Brandner
e45035582d
Add ZOOM_COEFFICIENT with value of 10
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-15 19:28:21 +01:00
Šimon Brandner
7b6d393754
Add a missing space
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-15 19:24:44 +01:00
Šimon Brandner
67a57ead96
Export ZOOM_STEP into a variable
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-15 19:24:00 +01:00
Šimon Brandner
b27a8e3c3a
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-14 08:30:28 +01:00
Tulir Asokan
8c8b46b984
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-03-12 14:18:12 +02:00
Travis Ralston
af9f17219b
Fix MemberAvatar crash from EventTilePreview
2021-03-10 12:32:18 -07:00
Travis Ralston
533c9fed64
Appease the linter
2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca
Convert cases of mxcUrlToHttp to new media customisation
2021-03-10 12:32:18 -07:00
Travis Ralston
5b3367d44e
Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps
2021-03-09 09:33:19 -07:00
Travis Ralston
591ccabab9
Remove a bunch of useless 'use strict' definitions
2021-03-08 20:26:08 -07:00
Travis Ralston
c359dff738
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:34 -07:00
J. Ryan Stinnett
b12cf7912a
Merge pull request #5624 from SimonBrandner/show-room-name
...
Display room name in pills instead of address
2021-03-08 16:27:43 +00:00
J. Ryan Stinnett
fca1639e0e
Merge pull request #5725 from HelderFSFerreira/addClipboardWritePermission
...
Add clipboard write permission for widgets
2021-03-08 14:38:23 +00:00
Helder Ferreira
f545866572
add clipboard write permission
2021-03-08 08:08:02 +00:00
David Baker
e5b03488d8
Fix widget resizing
...
There was a line of CSS that set pointer-events: none on widget
iframes whilst they were being resized to stop iframes swallowing
the mousemove/up events while dragging the resize handle, but a)
all widgets are now in a persisted element wrapper and therefore
not in the right place in the DOM to get that CSS and b) that only
got set when resizing the whole aps drawer vertically, not dragging
the handle between apps to change the width distribution.
Add a pointer events prop to AppTile to allow the pointer-events
style to be set by the parent, and set it when dragging either
resize handle.
Fixes https://github.com/vector-im/element-web/issues/16473
2021-03-05 17:52:51 +00:00
J. Ryan Stinnett
a5ee029c62
Merge pull request #5452 from SimonBrandner/feature-multi-language-spell-check
...
Add multi language spell check
2021-03-02 14:38:21 +00:00
Šimon Brandner
1955fff08c
CSS cleanup
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:50:50 +01:00
Šimon Brandner
dc283241aa
Remove wrapper
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:28:42 +01:00
Šimon Brandner
436a17bcc9
Remove imports
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:26:34 +01:00
Šimon Brandner
4c377ae037
Consistent evs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:23:14 +01:00
Šimon Brandner
80ce4da9b6
Remove onRedactClick
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:21:04 +01:00
Šimon Brandner
fa239e506d
ZOOM shouldn't be a part of the class
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:19:50 +01:00
Šimon Brandner
d0dea91e92
contextMenuDisplay -> contextMenuDisplayed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:16:40 +01:00
Šimon Brandner
b18622efe4
Show full date
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:20:34 +01:00
Šimon Brandner
83de84972e
Close onPermalinkClicked
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:13:27 +01:00
Šimon Brandner
fe8e90f920
Change comment styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 07:51:38 +01:00
Šimon Brandner
d58c17ff3b
Show grabbing cursor
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 07:50:53 +01:00
Travis Ralston
fbe5d17785
sanity
2021-02-24 18:27:59 -07:00
Travis Ralston
e2fb9b3ae8
Clean up widgets when leaving the room
2021-02-24 18:10:35 -07:00
Šimon Brandner
649b87ac11
Make permalink clickable
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 20:14:12 +01:00
Šimon Brandner
6008a6f9fa
Use showTwelveHourTimestamps
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 20:07:41 +01:00
Šimon Brandner
983895289c
Update info
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 20:04:25 +01:00
Šimon Brandner
2021e4e345
Remove ugly workaround
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:33:17 +01:00
Šimon Brandner
9312becee5
Add context menu
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:17:33 +01:00
Šimon Brandner
bd5efc7ceb
Pass permallinkCreator to ImageView
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:11:08 +01:00
Šimon Brandner
fa9ae89b5b
Don't show info if no event
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 18:24:44 +01:00
Šimon Brandner
83e1a7a707
Add more button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 18:13:12 +01:00
Šimon Brandner
b068a4c055
Make download into a button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 16:28:12 +01:00
Šimon Brandner
a6bb203a4b
Redo icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 14:43:33 +01:00
Šimon Brandner
7cd8f1135b
Quit on empty panel click
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 13:02:25 +01:00
Šimon Brandner
3e408b3fcd
Remove unused code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 12:59:40 +01:00
Šimon Brandner
13d766218a
Remove redact button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 11:59:43 +01:00
Šimon Brandner
899ce1f605
Partially fix overflow issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 11:15:59 +01:00
Šimon Brandner
ab79deb88f
Update the looks a bit more
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 08:11:53 +01:00
Šimon Brandner
497131874b
Remove size info
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 07:53:33 +01:00
Šimon Brandner
05e9019bc9
Remove name
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 07:50:10 +01:00
Šimon Brandner
d85ab382f5
Reorganize elements
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 07:47:59 +01:00
Robin Townsend
40b684d7de
Vectorize spinners
...
This replaces most of the GIF spinners used throughout the app with an
SVG that respects the user's theme. However, spinner.gif is still
retained for the room timeline avatar uploader component, since it is
more difficult to replace.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-02-23 20:22:09 -05:00
Šimon Brandner
6cf19e8897
Update icons according to the design
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 21:04:21 +01:00
Šimon Brandner
35663c35d2
Reorder the icons according to the design
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 20:49:31 +01:00
Šimon Brandner
e5d68142c6
Remove zoom icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 20:47:42 +01:00
Šimon Brandner
87d5d73025
Merge branch 'develop' into improve-image-view
2021-02-23 20:42:16 +01:00
Šimon Brandner
6f464feded
Quit sticker picker on m.sticker
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 18:12:46 +01:00
Tulir Asokan
dfcf701449
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-02-19 21:47:10 +02:00
Šimon Brandner
2ebc1252cb
Removed unnecessary functions
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-18 19:54:54 +01:00
Šimon Brandner
5de99c7708
Fix licenses
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-18 19:40:24 +01:00
Michael Telatynski
50252483c6
Remove stale unused components
2021-02-18 18:05:41 +00:00
Šimon Brandner
bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check
2021-02-18 18:16:16 +01:00
Michael Telatynski
e1acf11e67
Create Room Name & Topic HOCs to simplify code elsewhere
2021-02-18 15:16:59 +00:00
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling
2021-02-15 16:12:08 +01:00
Šimon Brandner
d8a9b84af9
Don't show tooltip if there is nothing to display
...
We do this because resource is undefined for @room
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 14:28:39 +01:00
Šimon Brandner
a975de22ef
Fixed buggy tooltip
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 11:27:14 +01:00
Šimon Brandner
f2137fe93f
Merge branch 'develop' into show-room-name
2021-02-12 08:21:40 +01:00
Šimon Brandner
33979b3354
Added a tooltip
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 08:18:27 +01:00
Šimon Brandner
27b2b5b65d
Make componentDidMount async
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 13:19:12 +01:00
Šimon Brandner
98e602f544
Avoid delayed displaying of sources
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 13:07:23 +01:00
David Baker
cf5ec7720c
Merge pull request #5525 from SimonBrandner/fix-screen-sharing
...
Fix desktop Matrix screen sharing and add a screen/window picker
2021-02-08 13:54:51 +00:00
Šimon Brandner
ffc0230ab4
Use resource as a fallback
...
This is useful mainly for the tests they would otherwise fail as there is no room name to display while the tests are run.
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 19:09:34 +01:00
Šimon Brandner
58ab5c36bb
Merge branch 'develop' into show-room-name
2021-02-06 15:27:04 +01:00
Šimon Brandner
cc38bcf333
Display room name
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 15:09:21 +01:00
Šimon Brandner
f2d236d429
Use LayoutPropType
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:17:30 +01:00
Travis Ralston
97584af947
Fix z-index of stickerpicker
2021-02-04 02:50:54 -07:00
Šimon Brandner
022781e9bc
Added a comment about updating thumbnails
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-01 16:03:20 +01:00
Šimon Brandner
28ff4e6955
Move DesktopCapturerSource
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-01 15:53:53 +01:00
J. Ryan Stinnett
89b835dd20
Merge pull request #5575 from matrix-org/jryans/no-event-pills
...
Remove pills from event permalinks with text
2021-02-01 10:53:22 +00:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes
...
Improve SSO auth flow
2021-01-29 13:28:53 +00:00
Michael Telatynski
0167c3cefb
Iterate SSO auth ux styling
2021-01-29 13:04:05 +00:00
Michael Telatynski
1eb88c988c
Add tooltips to mini sso buttons
2021-01-29 12:05:15 +00:00
Travis Ralston
41682fa8d2
Update src/components/views/elements/PersistedElement.js
2021-01-27 20:37:04 -07:00
Michael Telatynski
34ae766893
Wire up MSC2858 brand attribute
...
For better brand adherance.
Also removes old support for https IdP icons.
2021-01-27 16:15:47 +00:00
J. Ryan Stinnett
fa3ace8473
Rework message pilling to ignore event permalinks
...
This removes pills from event permalinks since they hide the text associated
with the link, which can cause nonsensical messages since words have been
removed. In addition, this moves away from fragile regexs to more
straightforward code to parse links and adds a test for this case.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5188
Fixes https://github.com/vector-im/element-web/issues/15159
2021-01-27 11:46:20 +00:00
J. Ryan Stinnett
71921ad705
Remove unused isPillUrl
2021-01-26 14:11:09 +00:00
J. Ryan Stinnett
501c73ae4b
Remove outdated comment
2021-01-26 14:08:39 +00:00
Šimon Brandner
02b552f958
Fixed 15221
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-24 12:56:44 +01:00
Šimon Brandner
972c947049
More generic layout setting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 10:35:35 +01:00
Šimon Brandner
e2abbf9a7c
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 08:12:32 +01:00
Michael Telatynski
bb50cd56ee
Merge pull request #5558 from matrix-org/t3hcguy/socialloginfixup
...
Improve styling of SSO Buttons for multiple IdPs
2021-01-22 10:37:46 +00:00
J. Ryan Stinnett
35bee5c5ea
Merge pull request #5522 from SimonBrandner/room-dialog-fixes
...
Fixes for the general tab in the room dialog
2021-01-22 10:34:37 +00:00
Michael Telatynski
928ddeb718
Improve styling of SSO Buttons for multiple IdPs
2021-01-21 13:33:25 +00:00
J. Ryan Stinnett
6d932e1352
Fix lint errors
2021-01-14 17:38:06 +00:00
J. Ryan Stinnett
658a8dfa99
Use device storage for allowed widgets if account data not supported
...
With guest accounts, account data is not available, so we use device storage to
hold allowed widgets as a good enough place.
Fixes https://github.com/vector-im/element-web/issues/16145
2021-01-14 17:30:25 +00:00
Šimon Brandner
eca8ef3b35
Update thumbnails
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-14 12:44:48 +01:00
Šimon Brandner
8f91b04eb3
Use contextBridge
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-14 08:35:04 +01:00
Šimon Brandner
b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing
2021-01-13 19:47:07 +01:00
Šimon Brandner
20b1720258
Added a line
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 21:08:25 +01:00
Šimon Brandner
b1010189be
Tabbed copyright link
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 20:41:33 +01:00
Šimon Brandner
bb7e76f69e
Hopefully fixed copyrights
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 20:36:54 +01:00
Šimon Brandner
99dc829369
Fixed translation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 20:27:11 +01:00
Šimon Brandner
d497594a6f
Remove unnecessary line
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 19:55:08 +01:00
Šimon Brandner
8652c2e653
Fixed class names
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 19:49:09 +01:00
Šimon Brandner
efd889c09a
Remove commented line
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 19:32:59 +01:00
Šimon Brandner
4185d53468
Disable add button if the field is empty
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-29 16:30:20 +01:00
Šimon Brandner
7912091bc5
Revert "Hide add button when new item field is empty"
...
This reverts commit fa99c2e8c5
.
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-29 16:08:54 +01:00
Šimon Brandner
14a3b88497
Consistent formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-28 08:15:54 +01:00
Michael Telatynski
7af1471052
delint2
2020-12-27 21:46:56 +00:00
Michael Telatynski
ce5b244a24
delint
2020-12-27 21:25:48 +00:00
Michael Telatynski
8ee65258be
Unfloat the MiniAvatarUploader "tooltip"
2020-12-27 21:13:01 +00:00
Michael Telatynski
f4190ccae2
Fix mini avatar uploader "working" even without permissions
2020-12-27 21:01:51 +00:00
Šimon Brandner
5779a543c9
Type cleanup
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 18:10:50 +01:00
Šimon Brandner
322afe6450
Remove log
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 18:00:08 +01:00
Šimon Brandner
675ca58eef
Improve UI
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 16:56:25 +01:00
Šimon Brandner
eae3c1c496
Get screen-sharing working, somehow
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 08:32:51 +01:00
Šimon Brandner
fa99c2e8c5
Hide add button when new item field is empty
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-22 13:14:55 +01:00
Šimon Brandner
997e08f21e
Reorganize buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-21 10:07:46 +01:00
Šimon Brandner
f771b7ac98
Added zoom button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:37:31 +01:00
Šimon Brandner
3d62138cbd
Set max zoom
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:28:19 +01:00
Šimon Brandner
096fb33397
Always allow moving
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:19:32 +01:00
Šimon Brandner
61c5e7e8f1
Reorder label items
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:15:39 +01:00
Šimon Brandner
f0abd52130
Remove the need to press ctrl while zooming
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:09:01 +01:00
Šimon Brandner
776b0e8198
Change comment styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:05:27 +01:00
Šimon Brandner
18de342fa1
Fixed translation issue while the image is rotated
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:00:11 +01:00
Šimon Brandner
6758734593
Remove panel element
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 19:48:24 +01:00
Šimon Brandner
7dd7aeffed
Remove imageBox
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 18:19:11 +01:00
Šimon Brandner
f9884b1cc7
Implement translation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 17:40:16 +01:00
Šimon Brandner
be9b68a4dd
Use height and width properties for scaling again
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 10:07:03 +01:00
Šimon Brandner
ec5fcaf59b
Added a comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 09:51:57 +01:00
Šimon Brandner
ae25ff8216
Switched to scale
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 15:54:26 +01:00
Šimon Brandner
2c5f3f31b1
Fixed Chromium issues - made listner non-passive
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 13:30:56 +01:00
Šimon Brandner
3c306bc54b
Added icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 12:54:55 +01:00
Šimon Brandner
2040815f66
Implement zooming
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 10:20:15 +01:00
Šimon Brandner
8aabe1f330
Reorganized elements
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 09:26:09 +01:00
Michael Telatynski
2567fcd045
add brackets for operator precedence
2020-12-17 12:02:16 +00:00
Michael Telatynski
1b2cfa5f05
Social Login support both https and mxc icons
2020-12-17 10:34:49 +00:00
Michael Telatynski
940fdb8e2f
Better adhere to MSC process
2020-12-16 10:07:07 +00:00
Michael Telatynski
5be65a525d
Improve identifiers and code readability
2020-12-09 11:14:06 +00:00
Michael Telatynski
e896b009f1
Handle manual hs urls better
2020-12-08 10:58:16 +00:00
Travis Ralston
603a1c8ffb
Fix linter
2020-12-07 15:37:26 -07:00
Travis Ralston
550a5220d9
Undocumented linter cleanup
2020-12-07 15:12:26 -07:00
Travis Ralston
2c992c456e
Merge remote-tracking branch 'origin/develop' into feature_confetti#14676
2020-12-07 14:58:56 -07:00
Michael Telatynski
1afece9a14
Fix React complaining about unknown DOM props
2020-12-03 12:20:48 +00:00
Michael Telatynski
0fd9b55b95
Fix SSO buttons for Social Logins
2020-12-03 11:08:16 +00:00
Šimon Brandner
19d9ea3477
Merge branch 'develop' into feature-multi-language-spell-check
2020-12-03 12:06:43 +01:00
Šimon Brandner
db5bc0cb7a
Fix formatting
2020-12-01 20:36:25 +01:00
nurjinn jafar
111515e794
fixed linter problem
2020-12-01 17:37:28 +01:00
Michael Telatynski
eb25c39318
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
...
Conflicts:
src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
Šimon Brandner
e9203d7571
Removed unnecessary imports
2020-12-01 17:21:23 +01:00
nurjinn jafar
1bf7ff8994
null check added
...
path to confetti fixed after refactoring
2020-12-01 17:15:02 +01:00
Šimon Brandner
cf61d50df4
Added SpellCheckLanguagesDropdown
2020-12-01 16:59:21 +01:00
Šimon Brandner
5d9f5ba979
Fix indentation
2020-11-30 08:35:51 +01:00
nurjinn jafar
82023dcf42
Merge branch 'feature_confetti#14676' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676
2020-11-27 16:33:15 +01:00
nurjinn jafar
6ce5d3b044
refactored effects dir and changed effects exported name
2020-11-27 16:32:04 +01:00
Steffen Kolmer
d9c7148182
Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676
2020-11-27 16:20:35 +01:00
Travis Ralston
80f1df6d95
Don't needlessly persist user widgets
...
Fixes https://github.com/vector-im/element-web/issues/15842
We don't have a concept of a stickerpicker staying on screen, so don't make it a thing yet.
2020-11-26 15:09:08 -07:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676
2020-11-26 18:21:28 +01:00
Michael Telatynski
86025459f4
Remove unused dialog, todo comments and other tiny tweaks
2020-11-26 15:01:12 +00:00
Michael Telatynski
1b1c482f9c
Iterate tests
2020-11-25 10:22:16 +00:00
Michael Telatynski
758b47c64d
Replace *ServerConfig and SignInToText with ServerPicker
2020-11-25 09:46:56 +00:00
Michael Telatynski
225d541487
Extend Field and InfoDialog with more configurability
2020-11-25 09:19:08 +00:00
Michael Telatynski
b1ca1eb3f5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
2020-11-24 11:30:51 +00:00
Michael Telatynski
1d53a5cf23
Initial support for MSC2858
2020-11-24 11:18:11 +00:00
Travis Ralston
054560b6a7
Merge pull request #5435 from matrix-org/travis/window-widgets
...
Support arbitrary widgets sticking to the screen + sending stickers
2020-11-23 08:32:46 -07:00
Michael Telatynski
56ffa17b89
Merge pull request #5433 from matrix-org/t3chguy/socials_preamble
...
Auth typescripting and validation tweaks
2020-11-23 14:14:25 +00:00
Michael Telatynski
2263280035
Improve no email warning during registration
2020-11-23 10:25:46 +00:00
Travis Ralston
107fa98180
Support arbitrary widgets sticking to the screen + sending stickers
...
Following https://github.com/matrix-org/matrix-react-sdk/pull/5385 , it is now possible for a widget to request these capabilities without being a video conference or sticker picker. This commit actually enables this support for those kinds of widgets.
This commit also fixes an issue in the URL templating where some variables might get set to 'undefined' - this appears to be a scoping issue, so StopGapWidget now stores the definition alongside the superclass.
Fixes https://github.com/vector-im/element-web/issues/15001
2020-11-20 16:53:15 -07:00
Travis Ralston
5f47077a30
Merge pull request #5385 from matrix-org/travis/msc-send-widget-events
...
Add new widget API actions for changing rooms and sending/receiving events
2020-11-20 09:17:18 -07:00
Michael Telatynski
3dcb58f108
Convert RegistrationForm to Typescript
2020-11-20 13:25:27 +00:00
Michael Telatynski
7397cebbea
Convert PasswordLogin to Typescript
2020-11-20 13:23:10 +00:00
Travis Ralston
0104164d51
Approximate the design as proposed
2020-11-19 12:06:24 -07:00
Michael Telatynski
14391a7295
Post-merge fix
2020-11-19 11:11:57 +00:00
Michael Telatynski
9b2143742a
Merge pull request #5418 from matrix-org/t3chguy/fix/muggle-hustle
...
Small delight tweaks to improve rough corners in the app
2020-11-18 10:07:31 +00:00
Michael Telatynski
56d24fc723
Merge pull request #5419 from matrix-org/t3chguy/fix/15701
...
Fix New Room Intro invite to this room button
2020-11-11 18:32:45 +00:00
Michael Telatynski
bf62960e1a
Merge pull request #5413 from matrix-org/t3chguy/fix/11415
...
Change how we expose Role in User Info and hide in DMs
2020-11-11 18:15:46 +00:00
Michael Telatynski
2adc578d28
mark the onClick prop required on AccessibleButton
2020-11-11 17:31:30 +00:00
Michael Telatynski
d0513406ee
Pass filter text when clicking explore/dm prompt
2020-11-11 17:04:09 +00:00
Matthew Hodgson
cb2ce6f90b
Merge pull request #5403 from matrix-org/matthew/username-tooltip
...
hide some validation tooltips if fields are valid.
2020-11-10 18:29:37 +00:00
Matthew Hodgson
36aa80fb64
Update src/components/views/elements/Validation.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2020-11-10 18:29:28 +00:00
Michael Telatynski
5fb86f74d7
Remove unused IconButton
2020-11-10 12:06:56 +00:00
Michael Telatynski
80bb091cc5
Iterate PR
2020-11-10 10:00:55 +00:00
Matthew Hodgson
99fb62cc68
fix lint yet again
2020-11-09 01:37:17 +00:00
Matthew Hodgson
ef09ff6615
lint again
2020-11-09 01:16:58 +00:00
Matthew Hodgson
2cac5f05a1
lint
2020-11-09 01:16:38 +00:00
Matthew Hodgson
5bde16ccbb
hide some validation tooltips if fields are valid.
...
fixes https://github.com/vector-im/element-web/issues/9683
2020-11-09 01:07:15 +00:00
Michael Telatynski
6aeea3e38e
Extract MiniAvatarUploader into a reusable component
2020-11-05 15:42:45 +00:00
David Baker
7ec1d5a881
Fix a bunch of silly lint errors
...
At some point the script to generate .eslintignore.errorfiles had
been run and added all these files to the ignore list, often because
they lacked a space before a brace or something equally mundane.
These are the easiest bunch.
2020-10-30 18:18:17 +00:00
nurjinn jafar
19395f3c3c
null checks added
2020-10-26 16:37:45 +01:00
MaHa-Nordeck
674060ed93
fixed spacing
2020-10-22 15:28:30 +02:00
MaHa-Nordeck
46eb5cdb1b
Minor improvements
...
* Made color generation dependant on gradient usage.
* Changed a loop to use for of
2020-10-22 14:01:16 +02:00
Steffen Kolmer
1c556c97d3
Added some code documentation
2020-10-21 19:06:10 +02:00
Steffen Kolmer
3ea4560019
Moved effect options to configuration
2020-10-21 17:58:54 +02:00
Michael Telatynski
6196c03c0a
Fix stickerpicker not having correct contexts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:05:20 +01:00
Steffen Kolmer
cb79e38377
Better initialization and check if canvas gets unmounted
2020-10-21 17:04:01 +02:00
Steffen Kolmer
335774b6ff
Fixed more linter errors
2020-10-21 16:03:22 +02:00
Steffen Kolmer
2f83771eab
Fixed more eslint errors
2020-10-21 15:15:26 +02:00
Steffen Kolmer
906686b640
Fixed more linter warnings
2020-10-21 15:06:05 +02:00
Steffen Kolmer
6f4c5d1b08
fixed build error
2020-10-21 14:56:04 +02:00
Steffen Kolmer
8847561795
Added additional module exports
2020-10-21 14:48:11 +02:00
Steffen Kolmer
8728e12242
Some code optimizations
2020-10-21 14:43:09 +02:00
Steffen Kolmer
c7d535d2d3
Fixed some formatting issues
2020-10-21 14:29:25 +02:00
Steffen Kolmer
daa03098f3
Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676
2020-10-21 14:21:25 +02:00
Steffen Kolmer
047c29731b
Added missing translation
2020-10-21 14:15:27 +02:00
Steffen Kolmer
d4ec1dd775
Refactoring
2020-10-21 13:56:58 +02:00
Michael Telatynski
4e12aeca9e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
...
Conflicts:
src/components/views/elements/AppTile.js
2020-10-21 12:48:51 +01:00
nurjinn jafar
1c6d28b861
refactoring roomView / slashCommands / SendMessageComposer with the new effects configurations and fix confetti animation timeout
2020-10-21 13:37:36 +02:00
Michael Telatynski
bec1d718e0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
...
Conflicts:
src/components/views/elements/AppTile.js
src/utils/WidgetUtils.ts
2020-10-19 20:50:16 +01:00
Steffen Kolmer
607e33feba
Extensibility, TypeScript and lazy loading
2020-10-19 21:25:01 +02:00
Michael Telatynski
744a4abd1c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
2020-10-19 13:08:17 +01:00
Steffen Kolmer
41160ff08e
Render confetti the react way
2020-10-19 13:54:09 +02:00
Steffen Kolmer
c86964cd5e
Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676
2020-10-19 13:15:33 +02:00
Steffen Kolmer
6e97baf09f
Added license
2020-10-19 12:53:17 +02:00
Michael Telatynski
a6c81a903c
Iterate with new buttons and resize locking
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 11:14:48 +01:00
Arsh Sharma
49d99c6dc7
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10
2020-10-14 16:58:05 +05:30
Michael Telatynski
d36fafd0c6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
...
Conflicts:
res/css/views/rooms/_AppsDrawer.scss
src/components/views/elements/AppTile.js
src/components/views/rooms/AppsDrawer.js
2020-10-14 10:23:44 +01:00
Travis Ralston
294c35347c
Ensure widgets are destroyed cleanly when minimized
...
Fixes https://github.com/vector-im/element-web/issues/15444 (an artifact of joining a call then minimizing the widget)
Also fixes other issues relating to widgets not loading when being minimized/maximized.
2020-10-13 14:55:44 -06:00
Michael Telatynski
7820f9c28a
Switch to WidgetAvatar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 13:16:55 +01:00
Michael Telatynski
37558f1f0d
Improve the context menu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 09:51:49 +01:00
RinkiyaKeDad
f5a40eff4b
updated TagFilterStore
2020-10-10 18:02:58 +05:30
RinkiyaKeDad
4f8b0afc41
updated TagPanel
2020-10-10 18:00:06 +05:30
Michael Telatynski
317dc68135
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
...
Conflicts:
src/components/views/elements/AppTile.js
2020-10-09 08:45:11 +01:00
Michael Telatynski
ada6d1aa46
Iterate PR
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 08:42:21 +01:00
Travis Ralston
d38b544a42
Use new preparing event for widget communications
...
Fixes https://github.com/vector-im/element-web/issues/15404
We need to make sure we don't accidentally call the widget before its ready, but we can happily show it once it is loaded/prepared.
2020-10-08 15:35:22 -06:00
Travis Ralston
2cd431db1c
Appease the linter
2020-10-08 14:50:17 -06:00
Travis Ralston
d5b264b7a0
Fix parsing issue in event tile preview for appearance tab
...
Fixes https://github.com/vector-im/element-web/issues/15419
2020-10-08 14:21:39 -06:00
Michael Telatynski
0e42fc45e2
Resolve couple of React warnings/errors
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 10:40:20 +01:00
Michael Telatynski
430bceb91d
Merge pull request #5281 from matrix-org/t3chguy/fix/9836
...
Fix editing and redactions not updating the Reply Thread
2020-10-07 00:14:56 +01:00
Michael Telatynski
1bd0d9e02b
Iterate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-06 22:53:34 +01:00
Travis Ralston
3fdefa354e
Merge pull request #5279 from Sorunome/soru/fix-img-rendering
...
fix img tags not always being rendered correctly
2020-10-06 14:36:14 -06:00
Michael Telatynski
17a04f2915
Fix naive pinning limit and app tile widgetMessaging NPE
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-06 10:48:55 +01:00
Michael Telatynski
fbcea7d2cc
Fix editing and redactions not updating the Reply Thread
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-06 08:23:48 +01:00
Sorunome
34c15b5221
fix img tags not always being rendered correctly
2020-10-05 09:50:19 +02:00
Michael Telatynski
6caf53bd1e
Merge pull request #5262 from matrix-org/t3chguy/fix/15286
...
MELS use latest avatar rather than the first avatar
2020-10-02 18:18:36 +01:00
Tulir Asokan
2bb7b6535f
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2020-10-02 17:28:45 +03:00
Travis Ralston
d640490595
Fix iframe reference
2020-10-01 10:03:52 -06:00
Travis Ralston
2ec94e8a69
Appease the linter
2020-09-30 20:49:31 -06:00
Travis Ralston
f27071ee64
Transition all remaining messaging over (delete the old stuff)
2020-09-30 20:20:31 -06:00
Travis Ralston
b46f58274e
Fix the hangup button and other custom actions
2020-09-30 20:09:23 -06:00
Travis Ralston
9b984a35e0
Remove dead AppTile2
2020-09-30 19:58:16 -06:00
Travis Ralston
fc1cbc668c
Get the widget loading again
2020-09-29 14:33:46 -06:00
Travis Ralston
cd93b2c22a
First rough cut of cutting AppTile over to the ClientWidgetApi
2020-09-29 14:14:51 -06:00
Travis Ralston
14766e24b8
Merge branch 'develop' into travis/widget-api
2020-09-29 13:18:18 -06:00
Travis Ralston
c75628844d
Merge pull request #5226 from matrix-org/travis/ft-sep1620/10-pip
...
Make the PIP Jitsi look and feel like the 1:1 PIP
2020-09-29 10:18:30 -06:00
Michael Telatynski
0f10ffa3c5
fix sequence sorting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 11:09:17 +01:00
Michael Telatynski
48d9aa2c3e
MELS use latest avatar rather than the first avatar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:53:04 +01:00
Michael Telatynski
8a9d38b702
convert MemberEventListSummary and ELS to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:51:48 +01:00
Travis Ralston
78a04a6106
Remove unused prop
2020-09-28 21:23:55 -06:00
Travis Ralston
6b2e34dc00
Fix export
2020-09-28 21:14:50 -06:00
Travis Ralston
4ea3376abf
WIP on AppTile2 transformation
2020-09-28 13:34:13 -06:00
Michael Telatynski
1fb4d22233
Merge pull request #5241 from matrix-org/t3chguy/fix/14724
...
Validation improve pattern for derived data
2020-09-23 17:03:32 +01:00
Michael Telatynski
f699be971e
Prepare AppTile to be usable outside of rooms for User Widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-23 11:02:41 +01:00
Travis Ralston
09dd3cea08
Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files
...
Add a note to use the desktop builds when seshat isn't available
2020-09-22 10:25:34 -06:00
Michael Telatynski
ed0e188b4f
Validation improve pattern for derived data
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-21 14:35:35 +01:00
Tulir Asokan
987cdf1bf0
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2020-09-19 19:14:37 +03:00
Travis Ralston
8838bd724b
Update copy for files
2020-09-18 10:58:17 -06:00
Travis Ralston
870c35be6f
Merge branch 'develop' into travis/ft-sep1620/09-enc-files
2020-09-18 10:56:20 -06:00
Michael Telatynski
949b8d9afe
Rename apps back to widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 16:35:42 +01:00
Michael Telatynski
5bf6697e48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:31:00 +01:00
Travis Ralston
8129333dcc
Make the PIP Jitsi look and feel like the 1:1 PIP
...
* Similar sizing
* Fix pointers so the jitsi widget doesn't feel clickable when it's not
* We might want to introduce click-to-visit-room for the Jitsi widget (like the 1:1 call), however the Jitsi widget has many more controls to worry about
* Remove the menu bar from the widget to avoid accidents
2020-09-16 22:38:12 -06:00
Travis Ralston
c3a3754432
Appease the linter
2020-09-16 17:27:45 -06:00
Travis Ralston
bfbbf44dfc
Add a note to use the desktop builds when seshat isn't available
...
Fixes https://github.com/vector-im/element-web/issues/15184
This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
2020-09-16 17:23:37 -06:00
Michael Telatynski
9cc789756b
UI Feature Flag: Hide flair
2020-09-16 11:26:15 +01:00
Michael Telatynski
caef9b27a0
Also hide bug reporting prompts from the Error Boundaries
2020-09-16 10:50:53 +01:00
David Baker
b7058a33ad
lint
2020-09-10 14:37:44 +01:00
David Baker
eeb4c5696f
Don't show 'unpin' for persistent widgets
...
This will mostly fix https://github.com/vector-im/element-web/issues/15139
although it could still break in a race condition.
2020-09-10 14:30:35 +01:00
Travis Ralston
0a7090dd64
Account for via in pill matching regex
...
Fixes https://github.com/vector-im/element-web/issues/15133
Regression first appeared in a80bcaa292
This also affects room IDs.
2020-09-09 14:36:35 -06:00
David Baker
62556c2afe
Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets
...
Always allow widgets when using the local version
2020-09-09 15:52:31 +01:00
David Baker
f9079975a1
write correct jsdoc
2020-09-09 15:42:25 +01:00
David Baker
99b0a0a78e
Always allow widgets when using the local version
...
Since we're not loading the widget URL, there's no need to ask
for permission to load it: it's just another part of the app.
2020-09-09 15:35:05 +01:00
Michael Telatynski
98b59fb217
Consolidate all the work thus far
2020-09-08 15:43:38 +01:00
Michael Telatynski
2527344294
Create name/title Widget utils
2020-09-08 15:42:31 +01:00
Michael Telatynski
87b72de25f
Merge pull request #5176 from matrix-org/t3chguy/dpsah/6785.4
...
Fix WatchManager for global room watchers and tidy widget code a little
2020-09-08 15:24:10 +01:00
Jason Robinson
75518254fb
Merge pull request #5173 from matrix-org/jaywink/jitsi-openidjwt-auth
...
Support creation of Jitsi widgets with "openidtoken-jwt" auth
2020-09-08 17:16:50 +03:00
Michael Telatynski
99cd2dceec
Fix create-react-class regression.
...
Can't call setState in c'tor
2020-09-08 12:07:24 +01:00
Michael Telatynski
48d9c94c88
Extract editWidget into WidgetUtils
2020-09-08 11:12:14 +01:00
Michael Telatynski
667c129ebc
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
...
Conflicts:
src/components/structures/ScrollPanel.js
src/components/views/rooms/AppsDrawer.js
2020-09-07 14:33:57 +01:00
Jason Robinson
13dbfa6b85
Remove debug statement
2020-09-04 12:44:43 +03:00
Jason Robinson
baa6d8a294
Correctly template in Jitsi widget auth if such exists
...
Also add roomId to the widget data and URL template. It's needed by
the Element Web Jitsi code to produce auth for the Jitsi backend.
2020-09-04 12:42:46 +03:00
Tulir Asokan
75a0178dad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2020-09-04 12:41:38 +03:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1
...
Remove create-react-class
2020-09-03 17:21:58 +01:00
Michael Telatynski
97ebfa02c3
Merge pull request #5162 from matrix-org/t3chguy/lodash
...
Consolidate Lodash files in bundle
2020-09-03 15:54:43 +01:00
Michael Telatynski
24006588d5
iterate PR
2020-09-03 10:34:19 +01:00
Michael Telatynski
beb77799f6
Respect user preference for whether pills should have an avatar or not
2020-09-02 17:26:23 +01:00
Michael Telatynski
243af3c9f2
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
2020-09-02 09:27:06 +01:00
Michael Telatynski
7c4a84aae0
Merge pull request #5155 from matrix-org/t3chguy/lint-ts
...
Fix eslint ts override tsx matching and delint
2020-09-01 16:44:22 +01:00
Michael Telatynski
842821b038
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/lodash
2020-09-01 09:09:50 +01:00
Michael Telatynski
656a815991
delint some more
2020-09-01 09:07:46 +01:00
Michael Telatynski
517dee413e
Delint
2020-08-29 12:57:11 +01:00
Michael Telatynski
78812b6f85
Fix some stuff
2020-08-29 12:53:04 +01:00
Michael Telatynski
72498df28f
Remove create-react-class
2020-08-29 12:14:16 +01:00