Arsh Sharma
49d99c6dc7
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10
2020-10-14 16:58:05 +05:30
Arsh Sharma
f705796477
fixing errors
2020-10-14 16:04:41 +05:30
Michael Telatynski
d36fafd0c6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
...
Conflicts:
res/css/views/rooms/_AppsDrawer.scss
src/components/views/elements/AppTile.js
src/components/views/rooms/AppsDrawer.js
2020-10-14 10:23:44 +01:00
Travis Ralston
f9ac390842
Appease the linter
2020-10-13 14:56:27 -06:00
Travis Ralston
294c35347c
Ensure widgets are destroyed cleanly when minimized
...
Fixes https://github.com/vector-im/element-web/issues/15444 (an artifact of joining a call then minimizing the widget)
Also fixes other issues relating to widgets not loading when being minimized/maximized.
2020-10-13 14:55:44 -06:00
Travis Ralston
40038a6100
Run templating on the popout URL too
...
Fixes https://github.com/vector-im/element-web/issues/15443
2020-10-13 14:54:02 -06:00
Michael Telatynski
758a4b79ce
stash
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:18:02 +01:00
Michael Telatynski
a1d25efceb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
...
Conflicts:
src/components/structures/RoomView.tsx
2020-10-13 13:45:22 +01:00
Michael Telatynski
7be5ff0fe6
First cut of app drawer tiled resizing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:29:12 +01:00
Michael Telatynski
37558f1f0d
Improve the context menu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 09:51:49 +01:00
RinkiyaKeDad
f5a40eff4b
updated TagFilterStore
2020-10-10 18:02:58 +05:30
RinkiyaKeDad
4f8b0afc41
updated TagPanel
2020-10-10 18:00:06 +05:30
Travis Ralston
1af8d96db9
Fix templating for v1 jitsi widgets
...
Fixes https://github.com/vector-im/element-web/issues/15427
2020-10-09 09:26:52 -06:00
Michael Telatynski
317dc68135
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
...
Conflicts:
src/components/views/elements/AppTile.js
2020-10-09 08:45:11 +01:00
Travis Ralston
d38b544a42
Use new preparing event for widget communications
...
Fixes https://github.com/vector-im/element-web/issues/15404
We need to make sure we don't accidentally call the widget before its ready, but we can happily show it once it is loaded/prepared.
2020-10-08 15:35:22 -06:00
Michael Telatynski
b8080a7d2d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
2020-10-08 13:04:59 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration
...
Convert auth lifecycle to TS, remove dead ILAG code
2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
f2b72efe39
Remove various remaining bits of ILAG flows
...
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
2020-10-07 12:53:59 +01:00
Michael Telatynski
67193b0ea7
Fix StopGapWidget infinitely recursing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 10:39:52 +01:00
Michael Telatynski
c784039cf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
...
Conflicts:
src/components/views/right_panel/WidgetCard.tsx
src/stores/WidgetStore.ts
2020-10-07 10:04:45 +01:00
Michael Telatynski
17a04f2915
Fix naive pinning limit and app tile widgetMessaging NPE
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-06 10:48:55 +01:00
Michael Telatynski
1e34365caa
Merge pull request #5268 from matrix-org/t3chguy/fix/15349
...
Fix right panel for peeking rooms
2020-10-06 00:32:05 +01:00
Travis Ralston
0570deffa2
Fix iterableUnion types
2020-10-01 10:01:13 -06:00
Michael Telatynski
a9cee7cf70
Fix right panel for peeking rooms
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-01 12:30:41 +01:00
Travis Ralston
2ec94e8a69
Appease the linter
2020-09-30 20:49:31 -06:00
Travis Ralston
f27071ee64
Transition all remaining messaging over (delete the old stuff)
2020-09-30 20:20:31 -06:00
Travis Ralston
b46f58274e
Fix the hangup button and other custom actions
2020-09-30 20:09:23 -06:00
Travis Ralston
b710d42832
Fix stickerpicker to use new messaging
2020-09-30 16:12:00 -06:00
Michael Telatynski
edfef2df0b
Increase max pinned widgets to 3
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-30 17:09:45 +01:00
Travis Ralston
9190c921d2
Clean up failed experiment
2020-09-29 15:35:04 -06:00
Travis Ralston
ca76ba5cf1
Fix widget persistence
2020-09-29 15:09:52 -06:00
Travis Ralston
cd93b2c22a
First rough cut of cutting AppTile over to the ClientWidgetApi
2020-09-29 14:14:51 -06:00
Travis Ralston
14766e24b8
Merge branch 'develop' into travis/widget-api
2020-09-29 13:18:18 -06:00
Travis Ralston
5534206e77
Merge pull request #5223 from matrix-org/travis/ft-sep1620/04-jitsi-hangup
...
Make the hangup button do things for conference calls
2020-09-29 11:06:21 -06:00
Travis Ralston
9df175212e
Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup
2020-09-28 13:43:47 -06:00
Travis Ralston
42955856d5
Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious
2020-09-28 13:41:48 -06:00
Travis Ralston
4ea3376abf
WIP on AppTile2 transformation
2020-09-28 13:34:13 -06:00
Travis Ralston
96fa34eecf
Add stop functions
2020-09-26 18:40:26 -06:00
Travis Ralston
634ffb0140
Add structure for widget messaging layer
2020-09-25 09:39:21 -06:00
Michael Telatynski
e3b0bf1915
Fix url encoding issue for modal widgets widgetId
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-25 15:03:54 +01:00
Michael Telatynski
fbbba75f81
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
2020-09-25 14:31:44 +01:00
Michael Telatynski
44bc8fc67e
Initial Modal Widget work tweaks MSC2790
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-25 14:08:27 +01:00
Michael Telatynski
2e6bad8b07
Convert WidgetUtils to TS and improve typing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-23 11:01:19 +01:00
Travis Ralston
342f1d5b43
Extremely bad support for "temporary widgets"
2020-09-21 14:36:24 -06:00
Travis Ralston
26b18811ce
Add some permission checks to the communities v2 prototype
...
Prototype behaviour:
* If you can't create a room in the community, say so.
* The UX for this could probably be improved, but for now the intention is to not break muscle memory by hiding the create room option.
* If you can't change settings in the community, or can't invite people, don't show those respective options.
* Breaking muscle memory here is moderately okay.
2020-09-18 16:04:19 -06:00
Michael Telatynski
1ca20dffc8
Merge pull request #5204 from matrix-org/t3chguy/fix/15164
...
Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT
2020-09-17 13:34:07 +01:00
Travis Ralston
e849cd8fe5
Null-check the widget before continuing
...
Deleted widgets should return isPinned=false
2020-09-16 22:51:39 -06:00
Travis Ralston
1ffc6d5bd3
Make the hangup button do things for conference calls
...
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
* If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
* If you're not able to modify widgets in the room, hang up.
For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
2020-09-16 14:35:55 -06:00
Travis Ralston
61e8d3e3d7
Merge branch 'develop' into travis/3pid-invites
2020-09-14 11:50:08 -06:00
Michael Telatynski
229967aa33
Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT
2020-09-14 15:16:29 +01:00
Michael Telatynski
73608c4aa9
Don't count widgets which no longer exist towards pinned count
2020-09-14 14:03:51 +01:00
Travis Ralston
fc2173a789
Appease the linter
...
It's almost like I copy/pasted some stuff
2020-09-11 21:05:54 -06:00
Travis Ralston
803badba1b
Show the user's 3PID invite after they've reloaded the page
...
This is a step towards https://github.com/vector-im/element-web/issues/13430
Since we've stored the invite, we can send the user to it once they reload the page or revisit Element. We currently only support one invite at a time, but this should be fine for most cases.
We only do this restoration if the next screen isn't set to avoid breaking the user out of an expected flow.
As an added touch, this also ensures that the email address is pre-filled on the registration page if needed, just in case the user refreshes before getting to the submit button.
2020-09-11 20:20:33 -06:00
Travis Ralston
dc44b9ef59
Store and thread 3pid invite through the app
...
This doesn't do anything with the stored value (yet), but enables us to do something with it in a future commit.
2020-09-11 19:49:48 -06:00
Michael Telatynski
04d2f93902
Fix WidgetStore handler bindings
2020-09-09 13:15:19 +01:00
Michael Telatynski
a17b2ba1e5
use constant
2020-09-08 17:38:13 +01:00
Michael Telatynski
1532048f33
Fix behaviour WidgetStore for new/unknown rooms
2020-09-08 16:49:50 +01:00
Michael Telatynski
8d14d26e2b
do the todos
2020-09-08 16:27:09 +01:00
Michael Telatynski
ef0843d4ad
Iterate to match design
2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217
Consolidate all the work thus far
2020-09-08 15:43:38 +01:00
Michael Telatynski
31cca5e0f2
Create new right panel cards
2020-09-08 15:42:31 +01:00
Michael Telatynski
eb7f6f4c4b
Create new WidgetStore to track all widgets stuff
2020-09-08 15:42:31 +01:00
Michael Telatynski
8f94a42daf
Update Right Panel phase recall behaviour
2020-09-08 15:42:31 +01:00
Michael Telatynski
b75e2aa299
WidgetEchoStore improve update event to include roomId and widgetId
2020-09-08 11:01:55 +01:00
J. Ryan Stinnett
7b1031d6a6
Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup
...
Prep work for Settings changes with cross-signing deferral
2020-09-04 12:51:25 +01:00
Michael Telatynski
368571bcff
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.2
2020-09-03 16:07:37 +01:00
Michael Telatynski
8b4250c142
expose RightPanelStore in window
2020-09-03 15:04:49 +01:00
J. Ryan Stinnett
fb2bde94fa
Rename CrossSigningManager to SecurityManager
...
The file encompasses bits of cross-signing and also secret storage / secure
backup.
2020-09-03 14:50:49 +01:00
Travis Ralston
6d62d85ad2
Merge branch 'develop' into travis/communities/proto/userinfo
2020-09-02 10:33:52 -06:00
J. Ryan Stinnett
dd87e9a2f1
During verification, only check user trust status
...
As part of new device verification, we were waiting for "cross-signing ready"
which means _both_ the public keys are trusted by this device _and_ private keys
are available. There's no guarantee that the private keys will ever arrive, so
it's too strict to wait for this as a blocking flow. This relaxes things to wait
only for the current device to trust public keys.
Fixes https://github.com/vector-im/element-web/issues/14970
2020-09-02 14:13:36 +01:00
Travis Ralston
b4f62e9c88
use valid jsdoc
2020-08-31 11:07:29 -06:00
Travis Ralston
7f7414ed5a
Appease the linter
2020-08-31 10:59:37 -06:00
Travis Ralston
fdbaddbace
Add a simple edit dialog for communities
2020-08-31 10:52:08 -06:00
Travis Ralston
133f981fa8
Run the tag selection behaviour through the prototype store too
2020-08-31 10:22:29 -06:00
Travis Ralston
724e3f6905
Run all selected prototype community logic through one store
2020-08-31 10:19:05 -06:00
Travis Ralston
93d67a6689
Wire up members button to member view
...
Ideally this would open up the group members panel, but that's exceedingly difficult. Instead, we switch to the general chat and rename the button to be a bit more helpful.
2020-08-31 10:12:12 -06:00
Travis Ralston
281e2ab27b
Null guard new function to reduce error spam
2020-08-28 20:13:26 -06:00
Travis Ralston
90d9d7128d
Use FlairStore's cache for group naming
...
Turns out GroupStore doesn't really know much.
2020-08-28 14:56:59 -06:00
Travis Ralston
fd71bca7c0
Change menu label if in a community
2020-08-26 10:33:05 -06:00
Travis Ralston
b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher
...
Communities v2 prototype: Tag panel selection changes
2020-08-26 10:22:50 -06:00
Travis Ralston
55001f3193
Select the general chat for a community when viewing it
2020-08-25 21:52:48 -06:00
Travis Ralston
2d4ac548d0
Override invite metadata if the server wants a group profile
2020-08-25 21:03:11 -06:00
Travis Ralston
ae04c5ce9d
Appease the linter
2020-08-20 19:59:44 -06:00
Travis Ralston
beb5c2627c
Disable CTRL+Click and SHIFT+Click actions on tag panel
2020-08-20 19:45:22 -06:00
Travis Ralston
96087d61f6
Convert feature setting usages to regular settings
2020-08-17 13:12:18 -06:00
Michael Telatynski
50b9da7597
Put message previews for Emoji behind Labs
2020-08-13 16:40:18 +01:00
J. Ryan Stinnett
7748e3ae1a
Merge pull request #5083 from matrix-org/jryans/riot-to-element
...
Replace Riot with Element in docs and comments
2020-08-05 12:25:45 +01:00
Michael Telatynski
9ce96bc28d
delint
2020-08-04 21:35:42 +01:00
Michael Telatynski
80dff8706c
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/13981
...
Conflicts:
src/@types/global.d.ts
src/stores/RoomViewStore.tsx
2020-08-04 21:33:27 +01:00
J. Ryan Stinnett
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
Travis Ralston
7022d86a3c
Handle tag changes in sticky room updates
...
Fixes https://github.com/vector-im/element-web/issues/14848
When we're filtering the sticky room will be excluded from the filtered set, and thus won't even appear in the `getOrderedRoomsWithoutSticky()` result. Further, we will likely have to update the position ourselves to ensure the sticky room can be placed appropriately in the list.
2020-07-31 16:26:03 -06:00
J. Ryan Stinnett
e9fcbfe3c8
Merge pull request #5075 from matrix-org/jryans/rm-tslint
...
Remove leftover bits of TSLint
2020-07-31 20:30:51 +01:00
Travis Ralston
e8d1024c45
Merge pull request #5076 from matrix-org/travis/cleanup/1
...
Clean up documentation of Whenable + fix other code concerns
2020-07-31 11:27:19 -06:00
Travis Ralston
3443761007
Merge pull request #5062 from matrix-org/travis/settings/ts
...
Convert SettingsStore to TypeScript
2020-07-31 11:07:07 -06:00
Travis Ralston
c888b1f401
It's a Context Transaction (ctxn) now
2020-07-31 10:00:53 -06:00
Travis Ralston
7645fe6b23
Update context transaction states
2020-07-31 10:00:02 -06:00
J. Ryan Stinnett
40cba3b3a7
Remove leftover bits of TSLint
2020-07-31 14:36:18 +01:00
J. Ryan Stinnett
af49639bd8
Merge pull request #5065 from matrix-org/travis/echo/audit
...
Add local echo for notifications in the new room list
2020-07-31 12:20:20 +01:00
Travis Ralston
49abfc1fb2
Ensure sublists are updated when rooms are removed from them
...
Fixes https://github.com/vector-im/riot-web/issues/14798 (part 2)
This is in two parts itself: The `RoomSublist` needs to break its references to the `RoomListStore`, so it now clones the room arrays. The `Algorithm` is the other part, which is slightly more complicated.
It turns out that we weren't handling splicing as a change in the `ImportanceAlgorithm`, therefore the `Algorithm` wasn't really feeling like it needed to change anything. Further, the `Algorithm` was using the wrong reference to where it should be dumping rooms (`this.cachedRooms` is a getter which returns a different object depending on conditions), so having fixed that we need to ensure that the filtered and sticky maps are also updated when we remove a room. Because we send the new tag through a Timeline update, we'll end up updating the tag later on and don't need to update the filter and sticky collections.
2020-07-30 15:06:04 -06:00
Travis Ralston
da05cac1b6
Listen for our own membership changes on notification states
...
Fixes https://github.com/vector-im/riot-web/issues/14798 (part 1)
When we transition from invite to not-invite we need to ensure we clear the invite notification state.
2020-07-30 14:33:38 -06:00