Commit graph

157 commits

Author SHA1 Message Date
Aaron Raimist
5b293dd6df Remove files created by merge
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-12-09 09:21:12 +00:00
Aaron Raimist
2e8a93834b Auto fix
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-12-09 09:10:23 +00:00
Aaron Raimist
7b94e13a84 Merge branch 'develop' into sort-imports
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-12-09 08:34:20 +00:00
James Salter
d4813f7a1a
Convert end-to-end tests to Typescript (#7206) 2021-12-06 09:59:06 +11:00
James Salter
5219b6be80
Analytics opt in for posthog (#6936)
* Add a new flag pseudonymousAnalyticsOptIn replacing analyticsOptIn, stored at account level, so people only need to opt in once.

* Show a toast in login to users that have analyticsOptIn set but not yet pseudonymousAnalyticsOptIn prompting them confirm the new method is okay. Update the copy of the existing opt-in toast. Don't notify users that previously opted out.

* Update the copy in settings

* Add a new learn more dialog

* Support a new config flag analyticsOwner which is used in these toasts when explaining which entity the data is sent to ("Help improve %(analyticsOwner)"). If unset, display brand. This allows deployments whose brand differs from the receiver of the analytics to explain the situation to their users (e.g. AcmeCorp badges their app, but explains the data is sent to Element, not them)

* The new opt-in and flags are only used when posthog is configured; prior to that there are no changes to UX or tracking behaviour.
2021-12-06 09:39:33 +11:00
David Baker
25c119dd5a
Revert https://github.com/matrix-org/matrix-react-sdk/pull/7246 (#7268)
This is apprently fixed on synapse, so reverting the workaround
2021-12-02 16:31:23 +00:00
Germain
2e82887dc2
Make e2e tests pass in CI by using an older Synapse version (#7246) 2021-12-01 09:53:57 +00:00
Michael Telatynski
8fe582b094
Tweaks to informational architecture 1.1 (#7052)
* Move user avatar to Space panel

* Add room list header for 'Home' or 'Space Name' to room list
Add existing Space context menus to room list header

* Re-add pending room join spinner

* Iterate RoomListHeader plus context menu

* Iterate space context menu

* Iterate room list + interactions

* Move DND to new iA model

* Replace composer custom status management with usermenu one

* Cull Quick Actions

* Iterate minimized room list state

* delint

* Merge the RoomListNumResults into the RoomListHeader

* Make the search shortcut prompt semi-bold

* Iterate RoomListHeader based on design review

* Iterate UserMenu based on feedback

* Add name to expanded spacepanel usermenu button

* i18n

* Make room sub list aux button components more generic

* Change left panel explore button to only refer to room directory

* Iterate RoomListHeader

* Fix custom user status input field width in Chrome

* Bring back Notification settings button

* delint

* i18n

* post-merge fix

* iterate pr

* Remove unused state

* update copy

* Apply suggestions from PR review

* delint

* Update invite iconography

* Iterate Space context menu to match Figma

* Fix chevron alignment

* Fix edge case for RoomListHeader on metaspaces

* Wire up general rageshake-driven feedback mechanism

* Add IA1.1 info toast

* add missing alt attribute

* delint

* delint

* tweak ia toast priority

* e2e test account for new toast

* autofocus feedback field and remove old subheading

* tweak copy

* Iterate space panel colours to match Figma

* Iterate PR

* delint

* Fix feedback submission with object setting values

* iterate based on review

* Tweak colours and update splash image

* Tweaks based on review

* Remove room list prompt, made redundant by the big fat `+`

* Fix edge cases around User Menu positioning and dnd

* Add missing import, bad merge?

* Update aria label in e2e test

* Fix room list space rooms context menu explore button behaviour

* Tweak copy

* Revert order of options in the UserMenu

* Tweak copy

* i18n
2021-11-30 18:08:46 +00:00
Michael Telatynski
138f6685d4
re-enable Spaces e2e tests (#7207) 2021-11-26 11:45:31 +00:00
Aaron Raimist
bdc56be863
Auto fix
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-22 17:23:37 -05:00
Andy Balaam
a547ee4654 Break 'Cryptography' settings into a separate component 2021-10-15 16:02:44 +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
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
Michael Telatynski
f2becd9698 Fix e2e test 2021-08-12 15:59:24 +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
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
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
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
Germain Souquet
5fb7dbee3e Do not generate a lockfile when running in CI 2021-07-07 16:11:47 +02:00
Michael Telatynski
06284fe73d Update e2e tests 2021-07-06 12:05:06 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Telatynski
b60c2c5d55 Fix e2e test right panel back behaviour 2021-06-29 10:37:30 +01:00
Germain
53a6089cc9
Merge pull request #6268 from matrix-org/gsouquet/upgrade-puppeteer 2021-06-28 10:28:56 +01:00
Germain Souquet
96857ab7f7 Fix end-to-end tests rejectToast 2021-06-28 09:01:04 +01:00
Germain Souquet
2672516b6a Upgrade puppeteer to use newer version of Chrome 2021-06-25 14:47:16 +01:00
Travis Ralston
c316eb841a
Merge pull request #6179 from aaronraimist/open-local-addresses
Open local addresses section by default when there are no existing local addresses
2021-06-22 14:48:02 -06:00
Germain
48e090abcc
Remove unnecessary comment 2021-06-17 10:20:43 +01:00
Germain Souquet
9f8d04ab9a Fix passing variable down to evaluate context 2021-06-16 11:39:04 +01:00
Germain Souquet
19cae42161 Benchmark multiple common user scenario 2021-06-15 15:06:00 +01:00
Germain Souquet
7310d35d7f Merge branch 'develop' into gsouquet/benchmark-tracking 2021-06-15 11:45:11 +01:00
Michael Telatynski
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Germain Souquet
7000176572 Add workflow steps to track measurements 2021-06-14 14:53:22 +01:00
Aaron Raimist
b8458c0ae3
fix test maybe
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-11 23:58:20 -05:00
Šimon Brandner
025148d9fc
Merge branch 'develop' into show-username
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
dependabot[bot]
c24b239478
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-05 13:36:25 +00:00
Germain
f7d0afcd28
Performance monitoring measurements (#6041) 2021-05-19 10:07:02 +01:00
dependabot[bot]
137189932e
Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 01:13:47 +00:00
Šimon Brandner
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
Šimon Brandner
55365e632b
Use the correct selector in E2EE tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-22 07:52:39 +02:00
Germain Souquet
de5ca92e4e add e2e session.delay explainer 2021-04-19 18:01:19 +01:00
Germain Souquet
db646d5987 Fix end to end tests for DM creation 2021-04-19 15:07:11 +01:00
J. Ryan Stinnett
cf4ed1bcdf Fix tests 2021-03-26 11:56:58 +00:00