7b94e13a84
Merge branch 'develop' into sort-imports
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-12-09 08:34:20 +00:00
2b52e17a80
Allow ending polls ( #7305 )
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-12-08 14:56:48 +00:00
494af883f3
Hide votes in a poll until you voted ( #7269 )
2021-12-03 10:26:28 +00:00
141950d9e6
Ensure my votes from a different device show up ( #7233 )
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-12-02 17:12:18 +00:00
0afe141266
Fix textual message stripping new line ( #7239 )
2021-12-02 09:25:12 +00:00
4a6d46b76a
Replace breadcrumbs with recently viewed menu ( #7073 )
2021-12-01 10:50:06 +00:00
1c6703356d
Highlight my vote even if it was made on another device ( #7202 )
2021-11-26 09:24:34 +00:00
ea97c416f5
Test for showing a spinner after submitting a new poll ( #7194 )
2021-11-24 16:24:19 +00:00
d7f3d2791a
Basic tests for PollCreateDialog ( #7193 )
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-11-24 13:48:07 +00:00
359962af6c
Prevent text overlapping on poll options ( #7187 )
2021-11-23 11:16:31 +00:00
d705fdd6e4
Display and send votes in polls ( #7158 )
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-11-23 10:27:44 +00:00
3c06e7f7a0
Add option to change the size of images/videos in the timeline ( #7017 )
...
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: Timo K <toger5@hotmail.de>
2021-11-17 15:19:30 +00:00
27c3153947
Unified room context menus ( #7072 )
2021-11-15 11:39:25 +00:00
9c8e1d32e2
Rename mx_RadioButton to mx_StyledRadioButton to match class name ( #7083 )
2021-11-04 12:57:38 +00:00
71244f3b3c
Add more checkbox styles ( #7058 )
...
Add a "kind" param for StyledCheckbox, allowing designers to choose different styles of checkbox as needed. In addition to the preexisting default kind (now called Solid), there's an Outline kind with a green checkmark and a transparent fill. This is used in the device trust view, since the default checkbox style looks too much like the green "verified" shield and it's awkward to have those next to each other.
2021-10-29 21:57:32 -04:00
027b3660bb
Manual fixes
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-22 17:49:12 -05:00
bdc56be863
Auto fix
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-22 17:23:37 -05:00
4b903b9fbd
Break ThemeChoicePanel into a separate component ( #6998 )
...
* Break ThemeChoicePanel into a separate component
* Tests for ThemeChoicePanel
* i18n fixes
* Fix copyright for ThemeChoicePanel
2021-10-20 14:58:27 +00:00
96bd052ecf
Improve visibility of font size chooser ( #6988 )
...
* Improve visibility of font size chooser
* Move slider dot sizes into variables
* Use a standard font size instead of percentage in Slider
* Use shorthand for padding in FontScalingPanel
* Change Slider text pos to px to be consistent when font changes
* Cleaner dot size for Slider selection
2021-10-20 13:41:27 +01:00
694ec946e2
Allow quote-reply in thread view element-web ( #6959 )
2021-10-19 16:05:34 +01:00
2582f6df23
Replace manual mock with jest.mock
2021-10-19 15:45:11 +01:00
4ad32b16ea
Break out font size settings to a separate component
2021-10-19 14:50:09 +01:00
77e6e1c0ab
Merge pull request #6960 from matrix-org/gsouquet/rename-replythread
2021-10-18 17:11:31 +01:00
5a7c0d87b6
Rename ReplyThread to ReplyChain to avoid confusion with m.thread
2021-10-15 17:42:44 +01:00
a547ee4654
Break 'Cryptography' settings into a separate component
2021-10-15 16:02:44 +01:00
bc336abf47
Fix missing snapshot serializer&enzyme init ( #6932 )
2021-10-13 11:09:43 +01:00
e8dba59b42
Fix review comments from Šimon Brandner.
...
Rename test->it; Rename users->userIds; Un-break a line.
Signed-off-by: Andy Balaam <andyb@element.io>
2021-10-04 11:41:09 +01:00
226131409f
Unit tests for room avatars in DM and non-DM rooms
...
Signed-off-by: Andy Balaam <andyb@element.io>
2021-10-01 15:08:19 +01:00
1331e960fa
Add ability to properly edit messages in Threads. ( #6877 )
...
* Fix infinite rerender loop when editing message
* Refactor "edit_event" to Action.EditEvent
* Make up-arrow edit working in Threads
* Properly handle timeline events edit state
* Properly traverse messages to be edited
* Add MatrixClientContextHOC
* Refactor RoomContext to use AppRenderingContext
* Typescriptify test
Co-authored-by: Germain <germains@element.io>
2021-10-01 15:35:54 +02:00
9c3439a1aa
Show updated relation reply from edited message - v2 ( #6817 )
...
Part of https://github.com/vector-im/element-web/issues/10391
When `m.relates_to` -> `m.in_reply_to` is provided in `m.new_content`
for an edited message, use the updated reply.
ex.
```json
{
"type": "m.room.message",
"content": {
"body": " * foo bar",
"msgtype": "m.text",
"m.new_content": {
"body": "foo bar",
"msgtype": "m.text",
"m.relates_to": {
"m.in_reply_to": {
"event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
}
}
},
"m.relates_to": {
"rel_type": "m.replace",
"event_id": "$lX9MRe9ZTFOOvnU8PRVbvr1wqGtYvNQ1rSot-iUTN5k"
}
}
}
```
2021-09-17 15:18:52 -05:00
a688e5b8b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/structures/LoggedInView.tsx
src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
95d1b06abb
Make composer able to reply in thread or in room timeline
2021-09-01 12:12:40 +01:00
6b9dc40ad6
delint test
2021-08-11 16:12:08 +01:00
da110855f0
delint and remove groups-specific tests and setups
2021-08-11 15:36:35 +01:00
28f5dc483b
Update eslint plugin & fix silly indenting
...
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00
eefadf6a46
Fix tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 15:30:26 -04:00
f5f4be88f0
Update tests to expect LinkPreviewGroup behaviour
2021-07-12 08:34:26 +01:00
00a3f5d469
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494
2021-07-08 13:29:10 +01:00
4a6af5a4d7
fix test missing required prop
2021-07-07 18:12:31 +01:00
b36a727a09
Fourth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 18:15:05 +02:00
b17d72c399
fix duplicate import
2021-07-02 14:54:10 +01:00
82119a08f7
Merge branch 'develop' into t3chguy/ts/11
2021-07-02 11:03:54 +01:00
88f691776f
Use sleep from js-sdk as no point duplicating it
2021-07-01 22:55:27 +01:00
543fe6382d
Fix linting in tests
...
Or in the case of one test, disbale just the one rule it breaks
2021-07-01 20:54:04 +01:00
ee9be5438e
eslint --fix
2021-07-01 20:43:05 +01:00
e768ecb3d0
Typescript conversion of Composer components and more
2021-06-30 13:01:26 +01:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
0df6200dd0
Convert MemberList-test to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:13 +02:00
a52dd57eb2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529
...
Conflicts:
package.json
yarn.lock
2021-06-15 13:59:54 +01:00
6e0a908c59
Merge branch 'develop' into gsouquet/react-17
2021-06-09 12:01:35 +01:00
d492ee4d8a
Update Enzyme adapter name
2021-06-09 11:57:29 +01:00
e891d18fa2
Add my email to my copyright notices
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04:00
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
d7a5547d80
use Intl.Collator over String.prototype.localeCompare for better performance
2021-06-02 10:42:17 +01:00
0b7d3f007a
Remove react-beautiful-dnd
2021-06-01 17:35:31 +01:00
121ed5eba9
Pass Matrix client around as matrixClient
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:51:04 -04:00
400917623c
Make myself the copyright holder for forward dialog code
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:33:28 -04:00
7a04502151
Iterate on forward dialog design feedback
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-21 12:41:29 -04:00
678b298bab
Merge branch 'develop' into improved-forwarding-ui
2021-05-19 12:39:48 -04:00
506a798961
Add getMember mock
2021-05-19 15:19:56 +05:30
503301aa89
Make rooms in ForwardDialog clickable
...
…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
5c10e1e574
Fix lints
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:16:37 -04:00
eb779cd3d8
Test that forward buttons are disabled for rooms without permission
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:10:41 -04:00
35cf0e1c7e
Find components by name rather than class in ForwardDialog test
...
It makes things shorter and more readable!
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:10:39 -04:00
eb07f1fb86
Test that ForwardDialog can render replies
...
Previously ForwardDialog was not giving its EventTile message preview
the information it needed to render a ReplyThread. This was a bit tricky
to fix since we were pulling a fake event out of thin air, so this
ensures it doesn't regress.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 00:54:00 -04:00
74925b2c6d
Test ForwardDialog
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
232b87a3b4
Improve formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
46bfbbadf9
Enable indent rule and fix indent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
a53696ff5e
Fix tests
2021-04-21 16:53:29 -06:00
a0049f956d
Patch over legacy Groups test
2021-03-31 23:51:17 -06:00
5d9b36afc1
Fix tests
2021-03-25 23:47:41 -06:00
6ab235f10c
Fix tests for new call path
...
We have to mock `fetch` for the caching of the download icon, and then mock out all the function calls used by components to feed a Media object.
2021-03-11 09:42:55 -07:00
375ffafda6
Fix tests failing to load skin
...
We should find a better way to do this, but this works well enough.
2021-03-09 10:13:16 -07:00
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
f45510ed25
Fix test assuming too much about the underlying calls
2021-02-19 13:08:30 +00:00
a075568e89
Fixed tests
...
In the previous commits I have removed the native title/tooltip so it needs to be removed from the tests as well
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 11:34:09 +01:00
474c029db5
Fix permalink via parsing for rooms
...
This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.
Fixes https://github.com/vector-im/element-web/issues/16345
2021-02-03 15:18:19 +00:00
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
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
e49a931588
Merge pull request #5533 from aaronraimist/security-key
...
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
2021-01-21 17:46:02 +00:00
97a551c04a
Fix test
2021-01-14 17:39:58 +00:00
6371a4abd1
Fix tests
...
Remove stray file extensions in includes and update shared instance
name.
2021-01-13 16:02:35 +00:00
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-01-04 19:17:17 -06:00
0c85cb587d
Merge branch 'develop' into emoji_quick_shortcut
2020-12-04 11:05:50 -05:00
ba8d02a808
add quick shortcut emoji feature and tests
...
Signed-off-by: macekj <macekj@umich.edu>
2020-11-17 17:36:58 -05:00
3f9f1d03c8
stubbed isGuest for unit tests
2020-10-29 13:22:09 +00:00
b2d04deb83
fix tests for the new sessionStorage key
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-08 10:04:01 +01:00
a8d88e01fb
Write Enzyme tests for SendMessageComposer state/history persistence behaviour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:10:40 +01:00
7bd5e3fa31
Move security-related dialogs to a common directory
2020-09-16 15:03:06 +01:00
ce226ab534
Replace Riot with Element in docs and comments
...
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.
Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
38e93469d3
Fix broken test
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-23 09:01:44 +01:00
2dfd636a9e
Appease the linter
2020-07-17 16:28:49 -06:00
c9b0b3b31d
RoomSublist2 -> RoomSublist
2020-07-17 15:46:46 -06:00
96065ae982
RoomTile2 -> RoomTile
2020-07-17 15:43:29 -06:00
a7c18bfbfa
RoomList2 -> RoomList
2020-07-17 15:27:49 -06:00
2b15ba21dd
Rename RoomListStore file
2020-07-17 15:11:34 -06:00
209a5d2220
Rename RoomListStore2 class name
...
We use `RoomListStore` as a singleton, and don't want the ugly `2` at the end of the actual store instance, so here we rename it to something half-decent.
2020-07-17 15:10:30 -06:00
3826d81358
Enable test mode
2020-07-10 11:05:56 -06:00
bba8197592
Use the new layout store
2020-07-09 22:40:34 -06:00
75dbd5f1d4
Merge branch 'develop' into travis/room-list/enable
2020-07-09 22:28:16 -06:00
Aaron Raimist