Germain Souquet
458f860a26
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-17 11:14:21 +01:00
Germain Souquet
e5024c4b71
Adapt threading UI to new backend
2021-08-17 10:38:09 +01:00
David Baker
3528d87f30
Remove old version
2021-08-12 18:39:11 +01:00
David Baker
657dcaf989
Fix video call persisting when widget removed
...
Fixes https://github.com/vector-im/element-web/issues/15703
Type: defect
2021-08-12 18:36:57 +01:00
Germain Souquet
d971802789
Create ThreadView phase in RightPanel
2021-08-10 14:30:12 +02:00
Michael Telatynski
2d3211ccf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-04 12:14:29 +01:00
Michael Telatynski
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
Michael Telatynski
152c7dc865
Merge pull request #6523 from aaronraimist/fix-mjolnir
2021-08-02 13:48:43 +01:00
RiotRobot
81b767ed89
Merge branch 'master' into develop
2021-08-02 13:08:09 +01:00
Travis Ralston
0923dd37ab
Sanitize untrusted variables from message previews before translation
...
Fixes https://github.com/vector-im/element-web/issues/18314
2021-07-31 11:43:05 -06:00
Aaron Raimist
cf2a4ddde7
Fix typo which broke feature_mjolnir
...
Regressed in b2d9dd7214
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-07-31 02:11:49 -05:00
Michael Telatynski
3c436c9617
update setting naming to match style
2021-07-30 12:20:02 +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
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
ac800ad94d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
2021-07-28 19:24:26 +01:00
Travis Ralston
b8781b7552
Merge pull request #6455 from matrix-org/travis/widget-customisation
...
Add customisation point for declaring widget variables
2021-07-28 07:15:45 -06: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
Michael Telatynski
8c073a6439
RoomListStore removeFilter skip triggering update if nothing changed
2021-07-27 17:53:03 +01:00
Michael Telatynski
12461a79e1
Move SettingsStore setting_updated
dispatch to action enum
2021-07-27 17:19:45 +01:00
Michael Telatynski
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
Michael Telatynski
755007cbee
Conclude labs flags and write more tests
2021-07-27 14:39:14 +01:00
Šimon Brandner
40947a2a68
Simplifie toast handling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
Šimon Brandner
379101e3ff
Remove an unused member
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:09:00 +02:00
Šimon Brandner
07be6dd780
Allow suppliing whole body to toasts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:35:54 +02:00
Travis Ralston
2c4ab507d6
Merge pull request #6453 from matrix-org/travis/voice-messages/code-cleanup-1
...
Clean up voice messages code
2021-07-23 09:09:12 -06:00
Travis Ralston
bb0be4ba72
Add customisation point for declaring widget variables
...
Fixes https://github.com/vector-im/element-web/issues/18035 (indirectly; issue is on a non-standard version of Element).
This has an isReady() step because the variable usage code path cannot be made async, so instead we let the async loading state happen in the prepare() stage. This is required for the intended usecase.
2021-07-22 15:43:18 -06:00
Travis Ralston
eec63574e6
Move src/voice to src/audio for better naming
...
Many of these files are used by Audio and Voice messages.
Fixes https://github.com/vector-im/element-web/issues/18131
2021-07-22 09:26:26 -06:00
Michael Telatynski
18bb4bce35
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
Jaiwanth
517e8951ee
Apply suggestions from review
2021-07-22 08:30:18 +05:30
Jaiwanth
76040c652c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room
2021-07-22 08:25:24 +05:30
David Baker
a6c432d66f
fix types
...
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
Michael Telatynski
d147aaa984
delint and fix min-height issue
2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +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
Michael Telatynski
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01: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
e54a7f0997
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
2021-07-19 09:36:25 +01:00
Šimon Brandner
c9a11af26b
Give singletonRoomViewStore a type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:53 +02:00
Michael Telatynski
05028f1997
remove unused import
2021-07-16 09:22:25 +01:00
Michael Telatynski
191591e807
Make the critical sections of the RLS synchronous to avoid needing to mutex everything
2021-07-16 09:15:56 +01:00
Michael Telatynski
32cc48ff7a
Fix issue with room duplication caused by filtering and selecting room using keyboard
...
Wrap sticky room updates in lock to prevent setStickyRoom running in middle of setKnownRooms
2021-07-16 08:49:19 +01:00
Michael Telatynski
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console
2021-07-15 13:50:13 +01:00
Michael Telatynski
59feff3763
Silence RoomListStore possible memory leak warning
2021-07-15 11:49:15 +01:00
Michael Telatynski
50b6c5c557
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-07-15 10:19:04 +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
Michael Telatynski
90d380c8ae
Cache value of feature_spaces* flags as they cause page refresh so are immutable
2021-07-15 08:26:49 +01:00