Andy Balaam
d7f3d2791a
Basic tests for PollCreateDialog ( #7193 )
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-11-24 13:48:07 +00:00
Travis Ralston
08cd8926e6
Fix a couple relative date tests ( #7184 )
2021-11-23 11:29:23 -07:00
Andy Balaam
359962af6c
Prevent text overlapping on poll options ( #7187 )
2021-11-23 11:16:31 +00:00
Andy Balaam
d705fdd6e4
Display and send votes in polls ( #7158 )
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-11-23 10:27:44 +00:00
Travis Ralston
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
Timo
556cfc7ed8
Add maximise widget functionality ( #7098 )
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-11-16 15:43:18 +01:00
Michael Telatynski
27c3153947
Unified room context menus ( #7072 )
2021-11-15 11:39:25 +00:00
Michael Telatynski
5ad3261cb2
Implement more meta-spaces ( #7077 )
2021-11-11 13:07:41 +00:00
Andy Balaam
9c8e1d32e2
Rename mx_RadioButton to mx_StyledRadioButton to match class name ( #7083 )
2021-11-04 12:57:38 +00:00
Germain
7a203461f7
Fix TimeZone to be UTC in Jest tests ( #7082 )
2021-11-04 10:39:49 +00:00
Germain
38750202ee
Design thread list tiles according to mockups ( #7078 )
2021-11-03 18:05:01 +00:00
Germain
2a20d9a7df
Display relative time in thread panel event tile ( #7068 )
...
* Null-guard for missing root event in thread panel
* Add formatRelativeTime date utility
* Display relative time format in thread panel event tiles
2021-11-03 10:16:50 +00:00
Faye Duxovni
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
Andy Balaam
d0bb6e0657
Unit tests for getEffectiveTheme ( #7051 )
...
* Unit tests for getEffectiveTheme
* Unit tests for choosing high-contrast theme
2021-10-29 09:11:55 +01:00
Aaron Raimist
f3867ad0a9
Merge branch 'develop' into sort-imports
2021-10-27 21:50:56 -05:00
Michael Telatynski
04c06b6aa8
Improve RovingTabIndex & Room List filtering performance ( #6987 )
2021-10-26 12:16:50 +01:00
Michael Telatynski
be0fa6da7b
Fix removing a room from a Space and interaction with m.space.parent
( #6944 )
2021-10-25 14:06:00 +01:00
Aaron Raimist
027b3660bb
Manual fixes
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-22 17:49:12 -05:00
Aaron Raimist
bdc56be863
Auto fix
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-22 17:23:37 -05:00
Andy Balaam
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
Andy Balaam
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
Germain
694ec946e2
Allow quote-reply in thread view element-web ( #6959 )
2021-10-19 16:05:34 +01:00
Andy Balaam
2582f6df23
Replace manual mock with jest.mock
2021-10-19 15:45:11 +01:00
Andy Balaam
4ad32b16ea
Break out font size settings to a separate component
2021-10-19 14:50:09 +01:00
Germain
77e6e1c0ab
Merge pull request #6960 from matrix-org/gsouquet/rename-replythread
2021-10-18 17:11:31 +01:00
Germain Souquet
5a7c0d87b6
Rename ReplyThread to ReplyChain to avoid confusion with m.thread
2021-10-15 17:42:44 +01:00
Andy Balaam
a547ee4654
Break 'Cryptography' settings into a separate component
2021-10-15 16:02:44 +01:00
Dariusz Niemczyk
c31bd8c647
Remove unnecessary adapter in ThreadPanel-test.tsx ( #6946 )
2021-10-14 15:42:54 +01:00
Dariusz Niemczyk
562a880c7d
Create room threads list view ( #6904 )
...
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads
In addition:
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
2021-10-14 15:27:35 +02:00
Dariusz Niemczyk
bc336abf47
Fix missing snapshot serializer&enzyme init ( #6932 )
2021-10-13 11:09:43 +01:00
Michael Telatynski
82ad85a974
Mock usage of getRoomUpgradeHistory in SpaceStore tests
2021-10-08 10:30:46 +01:00
Andy Balaam
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
Andy Balaam
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
Dariusz Niemczyk
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
Jaiwanth
94e4fb71c1
Merge branch 'develop' into export-conversations
2021-09-22 18:07:01 +05:30
Eric Eastwood
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
Michael Telatynski
e17318a364
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-16 10:05:20 +01:00
James Salter
839fdbca62
fix tests
2021-09-15 13:55:34 +01:00
James Salter
76c782c64c
Remove all room data from tracking
...
Always redact room fragments entirely; remove room utils
2021-09-15 12:58:26 +01:00
James Salter
79f03dfec3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pseudonymous-analytics-id
2021-09-15 09:52:15 +01:00
James Salter
c2192a78bc
More lint
2021-09-14 18:16:48 +01:00
James Salter
7344a177e3
Fix tests, swallow errors
2021-09-14 17:35:32 +01:00
Michael Telatynski
554c8ba74e
delint
2021-09-10 11:01:01 +01:00
Michael Telatynski
456de355f9
fix e2e test
2021-09-10 10:48:47 +01:00
Michael Telatynski
41118b418f
fix expected number of radios
2021-09-10 09:52:54 +01:00
Michael Telatynski
911ca07da4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-08 15:28:58 +01:00
Michael Telatynski
c915288044
Respect m.space.parent relations if they hold valid permissions
2021-09-06 14:34:06 +01:00
Michael Telatynski
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
Travis Ralston
60e2d61d25
Merge pull request #6489 from psrpinto/better-pinned-messages
...
When pinning or unpinning messages, link to the specific message
2021-09-03 13:27:49 -06:00
David Baker
de01dcfd26
Merge pull request #6700 from SimonBrandner/feature/call-timer/18566
...
Show call length during a call
2021-09-03 17:17:36 +01:00
Germain
9be9e75c13
Merge pull request #6720 from matrix-org/gsouquet/replies-fix-18717
2021-09-02 08:42:54 +01:00
Germain Souquet
95d1b06abb
Make composer able to reply in thread or in room timeline
2021-09-01 12:12:40 +01:00
Michael Telatynski
bbd420096b
don't bother awaiting SpaceStore::setActiveSpace as it is no longer async
2021-08-31 17:03:43 +01:00
Šimon Brandner
9c107ae615
Add tests for formatSeconds()
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-27 16:20:29 +02:00
Jaiwanth
7207329c15
Apply review suggestions
2021-08-13 23:44:07 +05:30
Michael Telatynski
8e7ef39db7
delint
2021-08-13 15:51:02 +01:00
Michael Telatynski
9d909dcdf8
tweaks
2021-08-13 15:44:43 +01:00
Michael Telatynski
2509c864e0
tweak order of e2e tests
2021-08-13 13:46:08 +01:00
Michael Telatynski
6ce518cb8f
add more delay
2021-08-13 13:38:11 +01:00
Michael Telatynski
5e38b8b3b3
try fix tests s'more
2021-08-13 13:29:25 +01:00
Jaiwanth
9cbdc4a613
Use throw error instead of try-catch
2021-08-13 08:34:54 +05:30
Jaiwanth
edfc8af6cf
Apply PR Suggestions
2021-08-13 08:30:50 +05:30
Michael Telatynski
f2becd9698
Fix e2e test
2021-08-12 15:59:24 +01:00
Michael Telatynski
0a209afdc2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
res/css/structures/_SpaceHierarchy.scss
src/components/structures/SpaceHierarchy.tsx
src/i18n/strings/en_EN.json
2021-08-12 11:41:03 +01:00
Michael Telatynski
8216a35a56
remove spurious mxclient stub
2021-08-11 21:02:30 +01:00
Michael Telatynski
29e5a69b7a
delint e2e test
2021-08-11 16:24:32 +01:00
Michael Telatynski
d602dac7ef
Add basic spaces tests to the e2e suite
2021-08-11 16:20:50 +01:00
Michael Telatynski
6b9dc40ad6
delint test
2021-08-11 16:12:08 +01:00
Michael Telatynski
da110855f0
delint and remove groups-specific tests and setups
2021-08-11 15:36:35 +01:00
Paulo Pinto
aaeb9969a4
Handle case where one message is pinned, and another unpinned
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 14:56:59 +01:00
Paulo Pinto
a51b114171
Change order of test cases
...
Just moving test cases so that "generic message" ones are grouped at the bottom.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 14:51:37 +01:00
Paulo Pinto
ca8832f6fa
Fix test case
...
The test case is:
"mentions message when a single message was pinned, with multiple previously pinned messages"
However, the test case was also unpinning messages. That is now fixed.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 14:47:50 +01:00
Paulo Pinto
79cf69bedb
Refactor tests so that snapshots aren't used
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 11:40:33 +01:00
Paulo Pinto
45fd3d83b0
Refactor tests
...
So that there's one top level `describe('TextForEvent')`, followed by a nested
`describe('textForPinnedEvent')`, containting all the `it()`s.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-10 16:06:34 +01:00
Jaiwanth
e396dcfb10
Remove @types/streamsaver
2021-08-10 13:22:40 +05:30
Jaiwanth
ecf0aba97c
Test for different types of events
2021-08-10 12:25:51 +05:30
Jaiwanth
900accd823
Add test for renderToString
2021-08-09 13:25:32 +05:30
Jaiwanth
850b5452a0
Add tests for reply regex
2021-08-09 12:36:06 +05:30
Jaiwanth
45ce352d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-09 10:44:13 +05:30
Šimon Brandner
881cac0d21
Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:30:03 +02:00
James Salter
57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
...
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
Andrew Morgan
c9c8177f58
Start a call immediately after creating a room via the dial pad ( #6529 )
2021-08-04 09:46:39 +01:00
Jaiwanth
c74d6c6fff
Assign replacements
2021-08-04 12:48:32 +05:30
David Baker
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
Šimon Brandner
a18f41ceed
Fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:43:56 +02:00
Šimon Brandner
2a378f30b7
Attempt to fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:38:12 +02:00
James Salter
dc7aad1abf
Revert "Revert "Add support for Posthog Analytics under a labs flag""
...
This reverts commit c5ea253181
.
2021-08-03 11:55:02 +01:00
Jaiwanth
b333612dea
Fix comparing MB -> bytes
2021-08-03 14:53:23 +05:30
Jaiwanth
4824c93707
Add a test file
2021-08-03 14:36:21 +05:30
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag"
2021-08-03 07:30:02 +01:00
Jaiwanth
46e2f67f54
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-03 10:03:16 +05:30
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
...
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
Michael Telatynski
3c436c9617
update setting naming to match style
2021-07-30 12:20:02 +01:00
Michael Telatynski
9eb0986353
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
Jaiwanth
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
Jaiwanth
04edf4103f
Remove unnecessary awaits
2021-07-30 11:46:55 +05:30
Michael Telatynski
d459dbe700
Refactor Space Hierarchy stuff in preparation for pagination
2021-07-29 17:35:15 +01:00
Michael Telatynski
02dbdc5c0a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
Michael Telatynski
6f37e8b223
Use getChildren instead of getSpaceSummary as MSC2946 has moved on
2021-07-29 12:16:59 +01:00
Michael Telatynski
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
James Salter
ecbc536a3e
Add copyright header
2021-07-28 14:15:27 +01:00
James Salter
a09e046c18
Update test/PosthogAnalytics-test.ts
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-28 14:11:55 +01:00
James Salter
df7ebb2e7c
Remove commented out block
2021-07-28 14:00:37 +01:00
James Salter
3ff7de3c96
Mock SHA-256 to avoid problems loading crypto on Node 14
2021-07-28 13:44:06 +01:00
James Salter
7cf28de9c9
take 2 at fixing import
2021-07-28 11:32:17 +01:00
James Salter
7c62386915
lint
2021-07-28 11:28:19 +01:00
James Salter
c697079eb4
Fix import
2021-07-28 11:22:40 +01:00
James Salter
bd7e2dee3d
Merge remote-tracking branch 'origin' into posthog-analytics
2021-07-28 11:13:22 +01:00
James Salter
a6df687196
Tidy up interface and add some comments
2021-07-28 09:54:37 +01:00
James Salter
1d81bdc6f9
Interface changes and anonymity fixes
2021-07-28 09:37:08 +01:00
Michael Telatynski
776435f620
Switch all-rooms toggle for spaces to non-feature settings key
2021-07-27 21:17:24 +01:00
Michael Telatynski
0a9d3302ba
Fix home vs all rooms requiring app reload and change default to home
...
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
Michael Telatynski
ec173e74e6
Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload
2021-07-27 20:15:40 +01:00
Paulo Pinto
400e772594
Fix formatting
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:53:33 +01:00
Paulo Pinto
3f2dadf0fe
When a single message is unpinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
Paulo Pinto
8fe7df9171
When a single message is pinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
Paulo Pinto
40ead34c08
Add test for textForPinnedEvent
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
Michael Telatynski
755007cbee
Conclude labs flags and write more tests
2021-07-27 14:39:14 +01:00
James Salter
474561600e
Fix hash == ""
2021-07-27 13:31:56 +01:00
Michael Telatynski
c8d9294350
Discard unused utility now that we use Object.fromEntries
2021-07-23 18:40:22 +01:00
James Salter
95f4275807
Add Disabled anonymity, improve tests
2021-07-23 16:47:02 +01:00
Michael Telatynski
5ccd02dd6e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/messages/MImageBody.tsx
2021-07-23 10:42:46 +01:00
Michael Telatynski
f5630acea7
Adhere to better eslint rules
2021-07-23 10:35:10 +01:00
James Salter
6737cfd297
remove superflous dnt clear
2021-07-21 16:10:06 +01:00
James Salter
726b4497b2
Remove redactedCurrentLocation and rely on posthog for DNT
...
* Redact and pass the redacted url as a property. redactedCurrentLocation might have issues with concurrent events
* Remove DNT code and rely on posthog
2021-07-21 16:06:09 +01:00
James Salter
4c6b0d35ad
Improve analytics interface
...
* Make it an error to call it before its initialised, and separately track whether its been enabled
* Use anonmity enum in the public interface
* Properly await upstream calls
* Fix accidental test fixture cross-reliance
2021-07-21 14:58:43 +01:00
James Salter
6da3cc8ca1
Redact sensitive data
2021-07-21 13:48:10 +01:00
Michael Telatynski
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
James Salter
4b0cb409a0
Add identifyUser
2021-07-21 08:38:58 +01:00
James Salter
74b0e52f9a
Enforce anon/pseudo-anon via types
2021-07-21 08:23:42 +01:00
James Salter
3135e42586
Add test for silently ignoring messages when not initialised
2021-07-21 07:42:55 +01:00
James Salter
2a48d3c9bc
First pass at a PosthogAnalytics class
2021-07-21 07:40:39 +01:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Michael Telatynski
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
Michael Telatynski
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
Michael Telatynski
f7767bf09c
Merge pull request #6393 from robintown/match-avatar-colors
2021-07-17 14:12:29 +01:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Robin Townsend
eefadf6a46
Fix tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 15:30:26 -04:00
Michael Telatynski
831c482371
Stub out MatrixClient::isUserIgnored for tests
2021-07-15 18:17:07 +01:00
Michael Telatynski
316b21408d
Fix tests
2021-07-15 10:59:52 +01:00
Michael Telatynski
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
Paulo Pinto
6884b2aa6d
Standardise spelling of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Paulo Pinto
7a8400e5c7
Standardise spelling and casing of homeserver
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Travis Ralston
0e2bcb474d
delint
2021-07-12 13:52:10 -06:00
Travis Ralston
ec0f940ef0
Adjust recording waveform behaviour for voice messages
...
Fixes https://github.com/vector-im/element-web/issues/17683
2021-07-12 13:48:01 -06:00
Michael Telatynski
f5f4be88f0
Update tests to expect LinkPreviewGroup behaviour
2021-07-12 08:34:26 +01:00
Šimon Brandner
a90b8f32f1
Add some tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 16:45:04 +02:00
Michael Telatynski
f412fb44a7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/SlashCommands.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
2021-07-09 08:13:39 +01:00
Michael Telatynski
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