Commit Graph

11822 Commits (ce9f3d8a57a16810e61d08c70edb64028bd16f40)

Author SHA1 Message Date
David Baker ce9f3d8a57 Rename 2019-03-11 11:38:54 +00:00
David Baker 999ebe6a19 Missed the removes
also fix more indenting
2019-03-08 21:51:14 +00:00
David Baker b404d21bba PR feedback 2019-03-08 17:41:04 +00:00
David Baker 7e424ce95b Fix call to stop() 2019-03-08 15:09:44 +00: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
David Baker 2e081982ee
Merge pull request #2769 from matrix-org/dbkr/fix_instant_rrs
Fix erroneously sending RRs, pt1.
2019-03-08 11:53:10 +00:00
David Baker de1ec06110 oops, didn't mean to leave this in 2019-03-08 10:44:48 +00:00
David Baker 89eb321ace copyright 2019-03-08 10:31:30 +00:00
David Baker 1cb6c3f3cf Fix erroneously sending RRs, pt1.
Firefox fires the blur event on both document and window. Chrome
only fires it on window, so on chrome we were not seeing the window
being un-focused. window seems to be the standard so just use that.

This isn't the end of the story though since wer can get mousemove
events without the window ever having gained focus, in which case
we'll continue to think the user is active for another 2 mins when
in fact all they did was pass their cursor over the window.

https://github.com/vector-im/riot-web/issues/9023
2019-03-08 10:23:18 +00:00
J. Ryan Stinnett b0863768e4
Merge pull request #2765 from jryans/dropdown-redesign
Tweak country dropdown for redesign
2019-03-08 10:08:45 +00:00
J. Ryan Stinnett 109b912699
Merge pull request #2745 from matrix-org/anoa/emoji_with_spaces
Prevent space characters from stopping big emoji messages
2019-03-08 10:06:35 +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
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 bd887e177f Fix i18n: Missing strings 2019-03-06 10:42:58 -07:00
David Baker 75f809bf06 Merge branch 'master' into develop 2019-03-06 15:47:48 +00:00
Travis Ralston 2cd6d1ec6a Don't duplicate direct chats from other tags
Fixes https://github.com/vector-im/riot-web/issues/8971
2019-03-06 15:38:31 +00:00
Travis Ralston ff72c3ba63 Include tag name when warning about rooms running off lists 2019-03-06 15:37:06 +00:00
Travis Ralston 2ad11437d5 More clearly fix issues with room insertion to lists
Instead of having a catch-all insert, try and fix the common cases with a bit more care.
2019-03-06 15:35:35 +00:00
Travis Ralston a34f3780f3 Always insert rooms into lists when they get lost
Room upgrades, direct chats, etc all end up being lost in these scenarios. Instead of losing them to the list, try and put them into a relevant spot of the list.

Fixes https://github.com/vector-im/riot-web/issues/9020
2019-03-06 15:35:29 +00:00
Andrew Morgan 79b7592dd5 Convert whitespace regex to const 2019-03-06 14:55:21 +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
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
David Baker 051e5d392c
Merge pull request #2755 from matrix-org/dbkr/hosting_link_only_if_group_admin
Only show hosting link if group admin
2019-03-06 10:58:01 +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
David Baker 610a6d935a Only show hosting link if domain == matrix.org
Fixes https://github.com/vector-im/riot-web/issues/9059
2019-03-06 10:22:19 +00:00
Matthew Hodgson e8d7609199
Merge pull request #2660 from chr-1x/add-shrug-command
Add /shrug command
2019-03-05 23:36:59 +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
J. Ryan Stinnett bc54ea5623 Convert login type to Field component
This converts the login type Dropdown on the login flow to also use the Field
component so that every presents a similar visual style.
2019-03-05 17:58:42 +00:00
J. Ryan Stinnett 5a491ac053 Convert login inputs to Field component
As with other auth flows, this converts inputs on the login page to use the
Field component for consistent styling. The login type dropdown is left as-is
for now.
2019-03-05 17:58:42 +00:00
J. Ryan Stinnett 302e601fa1 Convert forgot password to Field component
This converts all fields in the forgot password form to use the Field component.
2019-03-05 17:58:42 +00:00
J. Ryan Stinnett 5b1d361577 Convert registration phone number to Field component
Now that we have prefix support in the Field component, we can also convert the
phone number with country dropdown on registration.
2019-03-05 17:58:42 +00:00
Travis Ralston 6eaaa8b687
Merge pull request #2728 from matrix-org/travis/encryption-warning
Get confirmation before enabling encryption
2019-03-05 10:15:32 -07:00
David Baker 0244990731 Add utm_campaign to the hosting links
According to where in the app the link was clicked
2019-03-05 16:42:22 +00:00
David Baker b68a71b294 Lint 2019-03-05 16:20:18 +00:00
David Baker 57d8f6d8a2 Support linking to hosting providers
From link in app config
2019-03-05 16:12:02 +00:00
J. Ryan Stinnett 26b2aa174b Add prefix support to Fields
This allows Fields to have an optional prefix component which is placed inside
the border of the Field and to the left of the input. Since this label animation
would be complex to get right for this case, it is instead fixed to the top left
if there is a prefix component.

This canonical example of this today would be a phone number field which
includes a country dropdown.
2019-03-05 15:25:43 +00:00
J. Ryan Stinnett bfe120fbf4 Convert registration to Field component
This converts most fields in the registration form to use the Field component,
except for the phone number, which is a left as a separate task because of the
country dropdown menu.
2019-03-05 15:25:42 +00:00
Bruno Windels 66b9363466 clear min-height for typing notifs when the timeline viewport changes size 2019-03-05 16:14:38 +01:00
Bruno Windels 96196d8c3d
Merge pull request #2746 from matrix-org/bwindels/flairnolayout
Prevent flair pushing timeline downwards
2019-03-05 15:34:09 +01:00
Travis Ralston 534ca0e18a
Merge pull request #2741 from matrix-org/travis/rls-debugging
Include tag name when warning about rooms running off lists
2019-03-05 07:31:13 -07:00