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

28391 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base 
Introduce a concept of UI features, using it for URL previews at first
 2020-09-15 08:53:48 -06:00
Travis Ralston
246b802206 Merge branch 'develop' into travis/3pid-invites 2020-09-15 08:53:32 -06:00
Travis Ralston
d11ce5fade
Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons 
Remove defunct "always show encryption icons" setting
 2020-09-15 08:52:19 -06:00
Michael Telatynski
6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01: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
0cac6874d4 Update i18n 2020-09-14 22:31:45 -06:00
Travis Ralston
f4f30a3274 Introduce a concept of UI features, using it for URL previews at first 
Fixes https://github.com/vector-im/element-web/issues/15176

This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
 2020-09-14 22:28:02 -06:00
Travis Ralston
b177843e45 Remove defunct "always show encryption icons" setting 
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
 2020-09-14 22:03:54 -06:00
Travis Ralston
61e8d3e3d7 Merge branch 'develop' into travis/3pid-invites 2020-09-14 11:50:08 -06:00
Michael Telatynski
ab91ce4b2d
Merge pull request #5206 from matrix-org/t3chguy/fix/15170 
Fix Bridges tab crashing when the room does not have bridges
 2020-09-14 17:09:46 +01:00
RiotRobot
747126950b Merge branch 'master' into develop 2020-09-14 16:07:54 +01:00
RiotRobot
4f930ac50c v3.4.1 2020-09-14 15:49:09 +01:00
RiotRobot
a5d42d1e2a Prepare changelog for v3.4.1 2020-09-14 15:49:09 +01:00
Michael Telatynski
e32cb175cb Fix Bridges tab crashing when the room does not have bridges 2020-09-14 15:44:00 +01:00
Michael Telatynski
e261a18183
Merge pull request #5202 from matrix-org/t3chguy/fix/15140 
Don't count widgets which no longer exist towards pinned count
 2020-09-14 15:38:10 +01:00
Michael Telatynski
c6a3b8b783
Merge pull request #5205 from matrix-org/t3chguy/fix/resizeNotifier-optional 
Fix crashes with cannot read isResizing of undefined
 2020-09-14 15:38:02 +01:00
Michael Telatynski
e6e77633ad Fix crashes with cannot read isResizing of undefined 2020-09-14 15:37:02 +01:00
Michael Telatynski
ca0ad0b7ed Don't count widgets which no longer exist towards pinned count 2020-09-14 15:36:44 +01:00
Michael Telatynski
fa50b31fd2 Fix crashes with cannot read isResizing of undefined 2020-09-14 15:20:06 +01: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
493d3ae288 Don't show Notifications Prompt Toast if user has master rule enabled 2020-09-14 14:35:08 +01:00
Michael Telatynski
73608c4aa9 Don't count widgets which no longer exist towards pinned count 2020-09-14 14:03:51 +01:00
RiotRobot
148cad6ea2 Reset matrix-js-sdk back to develop branch 2020-09-14 13:42:34 +01:00
RiotRobot
c652ca56da Merge branch 'master' into develop 2020-09-14 13:41:29 +01:00
RiotRobot
099f50b10e v3.4.0 2020-09-14 13:36:32 +01:00
RiotRobot
c6eda819f0 Prepare changelog for v3.4.0 2020-09-14 13:36:31 +01:00
RiotRobot
ba73847296 Upgrade matrix-js-sdk to 8.3.0 2020-09-14 13:31:41 +01:00
David Baker
c68a980c59
Merge pull request #5193 from matrix-org/dbkr/remove_jitsi_widget_on_call_button 
Prompt to remove the jitsi widget when pressing the call button
 2020-09-14 09:44:45 +01:00
Travis Ralston
ac300a293e Add jsdoc 2020-09-11 21:09:42 -06: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
763309ae80 Show a spinner when processing a registration email confirmation 
See comment enclosed
 2020-09-11 20:58:10 -06:00
Travis Ralston
525ec6b709 Ensure we obliterate 3pid invites on logout 2020-09-11 20:36:26 -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
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
Travis Ralston
fe0eea84dd
Merge pull request #5196 from matrix-org/travis/e2e-iconography 
[Release] Show verification status in the room summary card
 2020-09-11 10:05:38 -06:00
Travis Ralston
77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update 
Show verification status in the room summary card
 2020-09-11 09:12:46 -06:00
Travis Ralston
652c037380 Use hooks better (from develop) 2020-09-11 09:06:17 -06:00
Travis Ralston
8862b8298c Use hooks better 2020-09-11 09:04:06 -06:00
J. Ryan Stinnett
8f3469237a
Merge pull request #5200 from matrix-org/jryans/userinfo-scroll-release 
Fix user info scrolling in new card view
 2020-09-11 15:48:58 +01:00
J. Ryan Stinnett
acdabe3ca0 Fix user info scrolling in new card view 
Fixes https://github.com/vector-im/element-web/issues/15148
 2020-09-11 15:29:47 +01:00
J. Ryan Stinnett
35e71f4066
Merge pull request #5199 from matrix-org/jryans/stickerpicker-height-release 
Fix sticker picker height
 2020-09-11 15:08:12 +01:00
J. Ryan Stinnett
d53cbecbb1
Merge pull request #5198 from matrix-org/jryans/userinfo-scroll 
Fix user info scrolling in new card view
 2020-09-11 14:52:06 +01:00
David Baker
b633564bea unused import 2020-09-11 13:02:02 +01:00
David Baker
e54d4e665f Don't prompt to remove jitsi widget if the user don't have permission 2020-09-11 12:20:32 +01:00
J. Ryan Stinnett
be3a8613ec Fix sticker picker height 
Fixes https://github.com/vector-im/element-web/issues/15152
 2020-09-11 11:46:25 +01:00
J. Ryan Stinnett
a56a193c2d
Merge pull request #5197 from matrix-org/jryans/stickerpicker-height 
Fix sticker picker height
 2020-09-11 11:45:21 +01:00
J. Ryan Stinnett
e49a657a90 Fix user info scrolling in new card view 
Fixes https://github.com/vector-im/element-web/issues/15148
 2020-09-11 11:39:58 +01:00