Commit Graph

14503 Commits

Author SHA1 Message Date
David Baker
1e7af106b0 Merge branch 'master' into develop 2019-03-06 11:28:54 +00:00
David Baker
ce1a985233 v1.0.2 2019-03-06 11:26:42 +00:00
David Baker
4a785263e2 Prepare changelog for v1.0.2 2019-03-06 11:26:41 +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
David Baker
d83bce15a6 releaseed js-sdk 2019-03-06 11:19:06 +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
dde36459e6 Simplify field row / field styles 2019-03-06 11:11: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
9a57e5c2f6
Merge pull request #2754 from matrix-org/dbkr/hosting_link_only_matrix_org
Only show hosting link if domain == matrix.org
2019-03-06 10:38:08 +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
Hubert Chathi
390138326a add dependency on qs, which is used by utils/HostingLink.js 2019-03-05 16:47:21 -05:00
David Baker
a9402beb8f v1.0.2-rc.4 2019-03-05 19:17:52 +00:00
David Baker
2b2cb1504e Prepare changelog for v1.0.2-rc.4 2019-03-05 19:17:51 +00:00
David Baker
647260b1ab js-sdk rc.2 2019-03-05 19:07:22 +00:00
David Baker
52e5d15a5a
Merge pull request #2752 from matrix-org/dbkr/fix-user-not-existing
Patch users not existing when opening settings
2019-03-05 18:49:49 +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
4c333f8c5f
Merge pull request #2751 from matrix-org/dbkr/devices_toggle_update_2
Fix media device selectors not updating
2019-03-05 18:46:05 +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
ff4963e662
Merge pull request #2750 from matrix-org/dbkr/shameless_plugging_2
Support linking to hosting providers
2019-03-05 18:34:54 +00:00
David Baker
b6579131b8 Add the image 2019-03-05 18:33:28 +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
2055be36f1 Add the image 2019-03-05 16:49:12 +00: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
Bruno Windels
3802ddbfa8
Merge pull request #2747 from matrix-org/bwindels/clearminheightonresize
clear min-height for typing notifs when the timeline viewport changes size
2019-03-05 16:35:23 +01: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
ae5c32d28b Lift border up to the Field root
By placing the Field's border on the Field component root instead of the input,
it's easier to wrap it around additional elements that we'll soon stuff inside
the field.
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
Bruno Windels
624572daa9 show flair container when no profiles loaded to ensure same height 2019-03-05 14:50:39 +01:00
Bruno Windels
18d897298d ensure flair is 16px high
so it doesn't push the message down
2019-03-05 14:49:07 +01:00
Andrew Morgan
0516556be9 Prevent space characters from stopping big emoji messages 2019-03-05 13:07:11 +00:00
J. Ryan Stinnett
b6351f2607
Merge pull request #2740 from jryans/reorg-field-props
Reorganise props handling in Field
2019-03-05 11:30:06 +00:00
J. Ryan Stinnett
d4a148d56c Use oneOf to check the input element 2019-03-05 11:18:58 +00:00