mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 03:51:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
28294 commits 219 branches 562 tags 474 MiB
Commit graph

4440 commits

Author SHA1 Message Date
Michael Telatynski
9cc789756b UI Feature Flag: Hide flair 2020-09-16 11:26:15 +01:00
Travis Ralston
246b802206 Merge branch 'develop' into travis/3pid-invites 2020-09-15 08:53:32 -06:00
Michael Telatynski
9a3c30b1f1
Merge pull request #5203 from matrix-org/t3chguy/fix/15150 
Don't show Notifications Prompt Toast if user has master rule enabled
 2020-09-15 14:09:38 +01:00
Michael Telatynski
6b5426bddd Rename toolbar Notifier methods to prompt 2020-09-15 13:58:29 +01:00
Travis Ralston
61e8d3e3d7 Merge branch 'develop' into travis/3pid-invites 2020-09-14 11:50:08 -06:00
Michael Telatynski
fa50b31fd2 Fix crashes with cannot read isResizing of undefined 2020-09-14 15:20:06 +01: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
a5d7b24805 Add a note for why oob_data isn't threaded yet 
See https://github.com/vector-im/element-web/issues/15157
 2020-09-11 19:57:16 -06:00
Travis Ralston
b1cdf1bc9a Redirect to the registration page if there's a 3PID invite 
Fixes https://github.com/vector-im/element-web/issues/15130
 2020-09-11 19:53:52 -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
c26f3b8a97 Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place 2020-09-09 16:52:46 +01:00
Michael Telatynski
a1f1334250 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3 
 Conflicts:
	src/components/structures/RoomView.tsx
 2020-09-09 15:16:19 +01:00
Michael Telatynski
29c2a0ef35 Fix FilePanel and NotificationPanel overscroll issues 2020-09-09 09:50:08 +01:00
Michael Telatynski
517b594edc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1 
 Conflicts:
	src/components/structures/RightPanel.js
 2020-09-08 18:04:24 +01:00
Michael Telatynski
83c2ae2479
Merge pull request #5180 from matrix-org/t3chguy/fix/15123 
null-guard roomId in RightPanel and pass Room to UserView
 2020-09-08 17:46:02 +01:00
Michael Telatynski
27a65fff2b null-guard roomId in RightPanel and pass Room to UserView 2020-09-08 17:34:32 +01:00
Michael Telatynski
8d03799ffe Fix create-react-class regression. 
Can't call setState in c'tor
 2020-09-08 16:51:55 +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
8f94a42daf Update Right Panel phase recall behaviour 2020-09-08 15:42:31 +01:00
Michael Telatynski
9d85d0436c iterate PR 2020-09-08 15:22:23 +01:00
Michael Telatynski
3bc42d7470 delint 2020-09-08 11:05:33 +01:00
Michael Telatynski
906d4defd5 Convert RoomView and RoomContext to TS 2020-09-08 10:52:37 +01:00
Michael Telatynski
6a304ce16e Remove ancient RoomView props.eventPixelOffset 2020-09-08 10:52:27 +01:00
Michael Telatynski
667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
 2020-09-07 14:33:57 +01:00
Michael Telatynski
a713c9763b
Merge pull request #5168 from matrix-org/t3chguy/dpsah/6785.2 
Small code clean ups and tweaks
 2020-09-04 12:25:46 +01:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1 
Remove create-react-class
 2020-09-03 17:21:58 +01:00
Michael Telatynski
05c3f5c381 remove redundant key 2020-09-03 17:05:33 +01:00
Michael Telatynski
bdfb77077a Fix RightPanel propTypes 2020-09-03 16:08:10 +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
97ebfa02c3
Merge pull request #5162 from matrix-org/t3chguy/lodash 
Consolidate Lodash files in bundle
 2020-09-03 15:54:43 +01:00
Michael Telatynski
6d4de4d22b tidy up ScrollPanel comments 2020-09-03 15:05:35 +01:00
Michael Telatynski
1479690ac4 RightPanel use room instead of roomId 2020-09-03 15:03:47 +01:00
Michael Telatynski
cffe902504 Add feature to ResizeNotifier to maintain isResizing state and use it to skip onScroll handling 2020-09-02 12:00:35 +01:00
Michael Telatynski
6178b3c0e2 Wire up resizeNotifier 2020-09-02 11:13:00 +01:00
Michael Telatynski
243af3c9f2 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 2020-09-02 09:27:06 +01:00
Travis Ralston
92c184385c Merge branch 'develop' into travis/communities/proto/userinfo 2020-09-01 10:51:42 -06:00
Michael Telatynski
7c4a84aae0
Merge pull request #5155 from matrix-org/t3chguy/lint-ts 
Fix eslint ts override tsx matching and delint
 2020-09-01 16:44:22 +01:00
Michael Telatynski
842821b038 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/lodash 2020-09-01 09:09:50 +01:00
Travis Ralston
fdbaddbace Add a simple edit dialog for communities 2020-08-31 10:52:08 -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
Michael Telatynski
85f2f46d13 fix tests 2020-08-29 13:38:28 +01:00
Michael Telatynski
646c9f1a83 Fix this contexts 2020-08-29 13:19:05 +01:00
Michael Telatynski
517dee413e Delint 2020-08-29 12:57:11 +01:00
Michael Telatynski
78812b6f85 Fix some stuff 2020-08-29 12:53:04 +01:00
Michael Telatynski
34b960d8cb fix naming conflict 2020-08-29 12:17:50 +01:00
Michael Telatynski
72498df28f Remove create-react-class 2020-08-29 12:14:16 +01:00
Michael Telatynski
672d0fe97b Remove redundant components and devDependencies 2020-08-29 12:09:07 +01:00
Travis Ralston
275ff6b41e Wire up the invite button 2020-08-28 20:08:12 -06:00