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

6848 commits

Author SHA1 Message Date
Jason Robinson
bc0806581c
Merge pull request #2777 from matrix-org/jaywink/ensure-scalar-token 
Ensure scalar_token is valid before opening integrations manager
 2019-03-13 12:00:04 +02:00
Jason Robinson
02ff1763a2 Ensure scalar_token is valid before opening integrations manager 
Since Scalar (and other integration managers) are loaded as apps into
an iframe, a valid `scalar_token` must exist when loading the app.

It is possible that a scalar_token becomes invalid between the time
when the integration manager button was rendered and the user clicking
the link. Here we make a call to integration manager `/account`
before trying to render the integration manager, which ensures we
have a valid token for the integration manager to work with.

Moving the scalar token revalidation to the cases where it is actually
needed could make it possible to decrease the amount of Scalar /account
calls we do when switching rooms, which is currently 3.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2019-03-13 11:47:00 +02:00
Travis Ralston
09600dcabd
Merge pull request #2775 from matrix-org/travis/auth-escape-hatch 
Provide an escape from the registration process
 2019-03-12 10:56:49 -06:00
Travis Ralston
9b252cace5 Invert to be if(!form) goback 2019-03-12 10:39:38 -06:00
David Baker
b39a7e01d3
Merge pull request #2770 from matrix-org/dbkr/fix_instant_rrs_pt2 
Fix instantly sending RRs
 2019-03-12 10:59:26 +00:00
J. Ryan Stinnett
0791f220fb
Merge pull request #2776 from matrix-org/erikj/fix_null_counter 
Fix simple header counters to correctly handle zero, take two
 2019-03-12 10:46:51 +00:00
Erik Johnston
1a35130869 Fix simple header counters to correctly handle zero, take two 2019-03-12 10:00:10 +00:00
J. Ryan Stinnett
2d074d0de6
Rename 
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
 2019-03-12 09:37:55 +00:00
J. Ryan Stinnett
ea01853233
Rename 
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
 2019-03-12 09:37:38 +00:00
David Baker
63d19a899b Rest of the naming changes 2019-03-12 09:37:00 +00:00
Travis Ralston
7eea62a22b
Merge pull request #2764 from matrix-org/travis/fix-hover 
Fix sticky hover state by listening for hover on the document
 2019-03-11 16:35:25 -06:00
Travis Ralston
9794e32f48 Provide an escape from the registration process 
Fixes https://github.com/vector-im/riot-web/issues/6560

Would be better improved by https://github.com/matrix-org/matrix-doc/pull/1921 or similar in the future.
 2019-03-11 16:32:50 -06:00
Travis Ralston
1165c51c77
Merge pull request #2772 from matrix-org/erikj/fix_null_counter 
Fix header counters to correctly handle zero
 2019-03-11 15:10:53 -06:00
J. Ryan Stinnett
c38a7e6756 Pass correct args when creating event permalink in context menu 
After the permalink API was changed in
https://github.com/matrix-org/matrix-react-sdk/pull/2671, it seems we forgot to
update this call site, so it was creating `<room>/<room>` links, instead of
`<room>/<event>`.

Fixes https://github.com/vector-im/riot-web/issues/9110
 2019-03-11 15:05:05 +00:00
Erik Johnston
03d60e6af2 Fix header counters to correctly handle zero 
Currently if you set the value to zero the counter is not displayed.
 2019-03-11 14:04:15 +00:00
David Baker
ce9f3d8a57 Rename 2019-03-11 11:38:54 +00:00
Bruno Windels
99f82a3de9
Merge pull request #2766 from matrix-org/bwindels/scrolling 
Scroll investigation changes
 2019-03-11 09:57:13 +00:00
Bruno Windels
10496cd4e8 also remove disconnecting from ResizeObserver 2019-03-11 10:32:30 +01:00
Travis Ralston
e1f9482107
Merge pull request #2757 from matrix-org/anoa/accept_all_invites 
Ability to bulk accept all invites (and fix rejecting all invites)
 2019-03-08 14:55:59 -07:00
Travis Ralston
14b3d55a76
Merge pull request #2768 from matrix-org/travis/verify-email-state 
Don't trample over existing sessions when verifying email addresses
 2019-03-08 10:06:59 -07:00
Travis Ralston
47b6356e10
Merge pull request #2767 from matrix-org/travis/misc-status-message-fixes 
Misc fixes to StatusMessageContextMenu
 2019-03-08 08:20:28 -07:00
David Baker
ce1623691e Fix instantly sending RRs 
Splits UserActivity into a tristate of 'active' (last < 1s), 'passive' (lasts a
couple of mins) and neither. Read receipts are sent when 'active', read markers
are sent while 'passive'.

Also fixed a document / window mix-up on the 'blur' handler.

Also adds a unit test for UserActivity because it's quite complex now
(and changes UserActivity to make it testable by accessing the singleton
via sharedInstance() rather than exporting it directly).

Fixes https://github.com/vector-im/riot-web/issues/9023
 2019-03-08 12:46:38 +00:00
J. Ryan Stinnett
d93e97bcd2 Remove span to regain explicit whitespace for country options 
This change restores whitespace between the country name and prefix code in the
country dropdown.
 2019-03-08 10:03:51 +00:00
Travis Ralston
0e16f3a0cc Don't trample over existing sessions when verifying email addresses 
Fixes https://github.com/vector-im/riot-web/issues/6875

Instead of overwriting what we have, we'll load the session we have and try to warn the user that they have verified an address for someone else.
 2019-03-07 17:09:47 -07:00
Travis Ralston
604f8f8b6b Misc fixes to StatusMessageContextMenu 
"waiting" is not a property, and unmount had a typo
 2019-03-07 14:57:30 -07:00
Travis Ralston
241309ab83 Use CSS for hovering the tile 2019-03-07 14:55:17 -07:00
Bruno Windels
96b1b723cd restore scroll position when encrypted download attachment iframe is shown 2019-03-07 17:22:43 +01:00
Bruno Windels
98a3f7db0f remove resizeobserver code 
seems to cause more harm than good in some cases and we shouldn't need
it if we get our calls to onHeightChanged in order.
 2019-03-07 17:22:27 +01:00
Bruno Windels
89b044f5d8 clearer naming in ScrollPanel 2019-03-07 17:02:19 +01:00
Bruno Windels
4e382b1dd9 rename onWidgetLoad to onHeightChanged 
as it's easy to confuse it with room widgets, but has nothing to do with it.
 2019-03-07 17:02:19 +01:00
Andrew Morgan
71261fc7a7 Add 2500 as default delay 2019-03-07 11:12:16 +00:00
J. Ryan Stinnett
5658e96aed
Merge pull request #2756 from jryans/settings-phone-input 
Move country dropdown inside field in Settings
 2019-03-07 09:59:23 +00:00
Travis Ralston
5b49584d79 Fix sticky hover state by listening for hover on the document 2019-03-06 16:27:29 -07:00
David Baker
75f809bf06 Merge branch 'master' into develop 2019-03-06 15:47:48 +00:00
Andrew Morgan
c5198418b0 Use retry_after_ms instead of hardcoded delay 2019-03-06 15:37:06 +00:00
David Baker
3a41206e90 Fix the ctrl+k shortcut 
Fixes https://github.com/vector-im/riot-web/issues/9029
 2019-03-06 14:53:52 +00:00
Andrew Morgan
0f14d89257 Ability to bulk accept all invites 2019-03-06 14:06:53 +00:00
David Baker
1e7af106b0 Merge branch 'master' into develop 2019-03-06 11:28:54 +00:00
J. Ryan Stinnett
13957bb5e7 Move country dropdown inside field in Settings 
This updates the Settings phone input to match the new styling used on auth
flows.

Fixes https://github.com/vector-im/riot-web/issues/9049
 2019-03-06 11:26:05 +00:00
J. Ryan Stinnett
5120ff83be Enable show prefix for phone input in Settings 
This fixes an unrelated bug where the currently selected country's prefix number
wasn't being displayed. Since other country dropdown's show the prefix, and this
is also for phone numbers, it seems good to also show it here as well.
 2019-03-06 11:22:29 +00:00
J. Ryan Stinnett
8bf5e1d19f
Merge pull request #2749 from jryans/auth-field 
Use Field component in auth flows
 2019-03-06 11:18:24 +00:00
J. Ryan Stinnett
35ee9c9ac7 One line for prefix container 2019-03-06 10:58:54 +00:00
J. Ryan Stinnett
df9888614b Normalize whitespace in PasswordLogin 2019-03-06 10:57:38 +00:00
David Baker
23f22617ed Only show hosting link if group admin 2019-03-06 10:32:30 +00:00
Travis Ralston
b9bd8206c1 Patch users not existing when opening settings 
Fixes https://github.com/vector-im/riot-web/issues/9022
 2019-03-05 18:48:41 +00:00
David Baker
cd4e22b3fd Fix media device selectors not updating 
Missed a setState

Fixes https://github.com/vector-im/riot-web/issues/9036
 2019-03-05 18:45:24 +00:00
David Baker
7aa451067e Add utm_campaign to the hosting links 
According to where in the app the link was clicked
 2019-03-05 18:33:22 +00:00
David Baker
dc0eff38fd Lint 2019-03-05 18:33:16 +00:00
David Baker
d888445ec7 Support linking to hosting providers 
From link in app config
 2019-03-05 18:32:56 +00:00
David Baker
c1056025ed
Merge pull request #2748 from matrix-org/dbkr/shameless_plugging 
Support linking to hosting providers
 2019-03-05 18:22:02 +00:00