Commit graph

3295 commits

Author SHA1 Message Date
RiotRobot
fe0280cbf0 Reset matrix-js-sdk back to develop branch 2022-10-26 16:51:25 +01:00
RiotRobot
3f192f927c Merge branch 'master' into develop 2022-10-26 16:51:07 +01:00
ElementRobot
446d944888
Fix config.json failing to load for Jitsi wrapper in non-root deployment (#23577) (#23615)
(cherry picked from commit a3ece528e5)

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2022-10-26 16:41:58 +01:00
RiotRobot
2f49467152 Reset matrix-react-sdk back to develop branch 2022-10-25 18:07:27 +01:00
RiotRobot
b4399402a6 Reset matrix-js-sdk back to develop branch 2022-10-25 18:06:42 +01:00
RiotRobot
b3ed90a9b3 Merge branch 'master' into develop
# Conflicts:
#	yarn.lock
2022-10-25 18:05:52 +01:00
RiotRobot
5f38137734 Upgrade matrix-react-sdk to 3.59.0 2022-10-25 17:48:39 +01:00
RiotRobot
748c900dce Upgrade matrix-js-sdk to 21.0.0 2022-10-25 17:47:47 +01:00
RiotRobot
d273441596 Reset matrix-js-sdk back to develop branch 2022-10-25 17:42:54 +01:00
RiotRobot
dc43356868 Merge branch 'master' into develop 2022-10-25 17:42:40 +01:00
RiotRobot
7d6614463a Upgrade matrix-js-sdk to 21.0.0 2022-10-25 17:11:23 +01:00
RiotRobot
629341894b Upgrade matrix-react-sdk to 3.59.0-rc.2 2022-10-24 17:05:23 +01:00
RiotRobot
416ca55fa9 Upgrade matrix-js-sdk to 21.0.0-rc.2 2022-10-24 17:04:14 +01:00
RiotRobot
b3f12dc03d Upgrade matrix-js-sdk to 21.0.0-rc.2 2022-10-24 16:26:57 +01:00
Florian Duros
3aead6f944
Update @matrix.org/matrix-wysiwyg dependency 2022-10-24 15:25:03 +02:00
Michael Telatynski
a3ece528e5
Fix config.json failing to load for Jitsi wrapper in non-root deployment (#23577) 2022-10-24 13:48:32 +01:00
renovate[bot]
b924594c19
Update jest monorepo to v29.2.0 (#23544)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-10-21 12:07:56 +00:00
renovate[bot]
663754e7ed
Update typescript-eslint monorepo to v5.40.1 (#23525)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-10-21 12:57:51 +01:00
renovate[bot]
189f4c53b2
Update babel monorepo (#23524)
* Update babel monorepo

* Update yarn.lock

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2022-10-20 15:27:24 +00:00
Andy Balaam
e0ab0ac5c9
Allow pressing Enter to send messages in new composer (#9451)
* Allow pressing Enter to send messages in new composer

* Cypress tests for composer send behaviour
2022-10-19 03:07:21 +00:00
RiotRobot
e4e2738c3c Upgrade matrix-react-sdk to 3.59.0-rc.1 2022-10-18 14:23:41 +01:00
RiotRobot
a7478f58ae Upgrade matrix-js-sdk to 21.0.0-rc.1 2022-10-18 14:21:49 +01:00
RiotRobot
c8a5788bca Upgrade matrix-js-sdk to 21.0.0-rc.1 2022-10-18 14:08:43 +01:00
Travis Ralston
10a429c68d
Include a file-safe room name and ISO date in chat exports (#9440)
* conversation export named after room

* sanitization added for exported file name

* sanitization added for exported file name

* sanitization added for exported file name

* sanitization added for exported file name=>lint error fixed

* sanitization added for exported file name=>lint error fixed

* sanitization added for exported file name=>redundancy removed

* sanitization added for exported file name=>redundancy removed

* reverted to previous commit

* sanitization added for exported file name=>redundancy removed

* exported chat date iso formatted

* conversation export named after room

* conversation export named after room

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* code refacto filename date format

* Add docs to fn

* Bring in a util library for sanitizing

* Extract file naming function and make consistent for all 3 types

Also use the library we dragged in

* Write tests & associated fixes

* Apply linters locally

* Include new date util in index

Co-authored-by: Sinharitik589 <sinharitik18112835@gmail.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: yaya-usman <yayaazeez222@gmail.com>
Co-authored-by: Sinharitik589 <67551927+Sinharitik589@users.noreply.github.com>
2022-10-17 19:54:10 -06:00
Florian Duros
3ecd67aa80
Merge branch 'develop' into feat/add-formating-buttons-to-wysiwyg 2022-10-14 09:44:32 +02:00
Michael Telatynski
a45a662c57
Enable Cypress retries to combat flakiness (#9413) 2022-10-13 19:11:30 +01:00
Florian Duros
ac8397aa0f
Fix test 2022-10-13 16:46:47 +02:00
Michael Telatynski
172f2f3993
Fix tests and convert to RTL (#23474) 2022-10-13 09:22:34 +01:00
Michael Telatynski
1800cb8c71
Remove unused packages and fix invariant violation on AsyncStore onNotReady (#9404)
* Remove traces of browser-request & mocha

* Remove unused matrix-react-test-utils

* Fix dispatcher invariant violation

* Add null-guard

* Improve types

* Fix null-guard

* Fix issue with authed users going directly to /#/login
2022-10-13 09:22:32 +01:00
Michael Telatynski
2ef6abbfb8
Move from browser-request to fetch (#23427) 2022-10-12 18:59:10 +01:00
Michael Telatynski
8b54be6f48
Move from browser-request to fetch (#9345) 2022-10-12 18:59:07 +01:00
RiotRobot
44eeb6fddc Reset matrix-react-sdk back to develop branch 2022-10-11 18:04:37 +01:00
RiotRobot
7afa416ed5 Merge branch 'master' into develop
# Conflicts:
#	package.json
#	yarn.lock
2022-10-11 18:03:36 +01:00
RiotRobot
e356c38948 Upgrade matrix-react-sdk to 3.58.1 2022-10-11 17:55:10 +01:00
RiotRobot
d1f7454dc0 Reset matrix-react-sdk back to develop branch 2022-10-11 14:10:12 +01:00
RiotRobot
3bf3237774 Reset matrix-js-sdk back to develop branch 2022-10-11 14:09:53 +01:00
RiotRobot
f0e6673fec Merge branch 'master' into develop 2022-10-11 14:09:34 +01:00
RiotRobot
2aae3de956 Upgrade matrix-react-sdk to 3.58.0 2022-10-11 14:02:50 +01:00
RiotRobot
c61556e885 Upgrade matrix-js-sdk to 20.1.0 2022-10-11 14:01:39 +01:00
RiotRobot
7c1c49540a Reset matrix-js-sdk back to develop branch 2022-10-11 13:56:23 +01:00
RiotRobot
08a4070666 Merge branch 'master' into develop 2022-10-11 13:56:09 +01:00
RiotRobot
2d64c21c90 Upgrade matrix-js-sdk to 20.1.0 2022-10-11 13:51:54 +01:00
Florian Duros
5bdac78fc7
Merge remote-tracking branch 'origin/develop' into feat/matrix-wysisyg-integration 2022-10-10 17:04:27 +02:00
Florian Duros
77005e2b7d
Update wysiwyg version 2022-10-10 16:55:20 +02:00
Florian Duros
200af78c2a
Use published matrix-wysisyg 2022-10-10 14:28:30 +02:00
Florian Duros
67aab08759
Update yarn.lock 2022-10-07 15:05:29 +02:00
Kerry
3e4f3152bc
Device manager - parse user agent for device information (#9352)
* record device client inforamtion events on app start

* matrix-client-information -> matrix_client_information

* fix types

* remove another unused export

* add docs link

* display device client information in device details

* update snapshots

* integration-ish test client information in metadata

* tests

* fix tests

* export helper

* DeviceClientInformation type

* Device manager - select all devices (#9330)

* add device selection that does nothing

* multi select and sign out of sessions

* test multiple selection

* fix type after rebase

* select all sessions

* rename type

* use ExtendedDevice type everywhere

* rename clientName to appName for less collision with UA parser

* fix bad find and replace

* rename ExtendedDeviceInfo to ExtendedDeviceAppInfo

* rename DeviceType comp to DeviceTypeIcon

* update tests for new required property deviceType

* add stubbed user agent parsing

* setup test cases

* detect device type correctly

* 80% working ua parser

* parse asera gents for device info

* combine clientName/Version into one field, remove debug from tests
2022-10-06 10:06:29 +02:00
RiotRobot
5f355bf25e Upgrade matrix-react-sdk to 3.58.0-rc.2 2022-10-05 14:16:02 +01:00
RiotRobot
1708f7f1b8 Upgrade matrix-js-sdk to 20.1.0-rc.2 2022-10-05 13:48:58 +01:00
RiotRobot
5619de03c4 Upgrade matrix-js-sdk to 20.1.0-rc.2 2022-10-05 13:27:37 +01:00