HomePhabricator

Merge branch 'develop' into bug/T156977

Authored by JoeWalsh on Mar 14 2017, 12:59 PM.

Description

Merge branch 'develop' into bug/T156977

Merged Changes

CommitAuthorDetailsCommitted
27a0f7560a76JoeWalsh/GitHub
Merge pull request #1272 from wikimedia/feature/auth-tweaks/T160133 
Mar 14 2017
41100d5124bdJoeWalsh/GitHub
Merge branch 'develop' into feature/auth-tweaks/T160133 
Mar 14 2017
07d4615d536cmontehurd/GitHub
Merge pull request #1280 from wikimedia/bug/revert_modules 
Mar 12 2017
5066987bb8d3JoeWalsh
Revert "Merge pull request #1275 from wikimedia/bug/modules" 
Mar 12 2017
f611cb66336eMhurd
Adjust MOAR groupings spacing. 
Mar 11 2017
6974e41d195bMhurd
Tighten up captcha string. 
Mar 11 2017
9dfb856dce23Mhurd
Adjust more groupings spacing. 
Mar 11 2017
331d9fc5716aMhurd
Re-tweak string. 
Mar 11 2017
a83e1f825cc0Mhurd
Adjust groupings spacing. 
Mar 11 2017
3fcee88c2035Mhurd
Adjust stackviews' spacing. 
Mar 11 2017
fcc4170a36a2Mhurd
Update bottom spacing. 
Mar 10 2017
8eb2e615b7aeMhurd
Update top spacing. 
Mar 10 2017
0568ea15845eMhurd
Fix collapsible inline alert field height priorities. 
Mar 10 2017
6c8a67483047montehurd/GitHub
Merge branch 'develop' into feature/auth-tweaks/T160133 
Mar 10 2017
1dd99fb912e2Mhurd
Update various label and field heights. 
Mar 10 2017
bf7e6a2e28d4Mhurd
Adjust auth vc simulated metric. 
Mar 10 2017
4e52d5dab16dMhurd
Update localized string. Was missing a colon. 
Mar 10 2017
129ce1cc1be5Mhurd
Update pwd reset "You logged in..." background color. 
Mar 10 2017
1a8af67bdbc1Mhurd
Use new auth title color. 
Mar 10 2017
6a8f2e841376Mhurd
Add auth title color. 
Mar 10 2017
4eb0b5958081Mhurd
Remove unused color. 
Mar 10 2017
d8444fd00955montehurd/GitHub
Merge branch 'develop' into feature/auth-tweaks/T160133 
Mar 10 2017
b6c2c463cf8aMhurd
Better method signature. 
Mar 10 2017
212e71dfbfbbmontehurd/GitHub
Merge branch 'develop' into feature/auth-tweaks/T160133 
Mar 10 2017
7cd2181be08fMhurd
Add fileprivate to new props. 
Mar 10 2017
cc46400d9bd6Mhurd
Clean up WMFAuthLinkLabel a bit. 
Mar 10 2017
18d2dc2255d8Mhurd
Remove now unused UILabel+WMFAuth.swift 
Mar 10 2017
5e36578b9b76Mhurd
Use WMFAuthLinkLabel for auth links showing two strings. 
Mar 10 2017
1897543373b5Mhurd
Let WMFAuthLinkLabel handle compound auth label strings. 
Mar 10 2017
2652a890980cMhurd
Use new Auth UILabel subclass in a couple places. 
Mar 10 2017
1846cdadcba1Mhurd
Auth UILabel subclass configured with custom WMF dynamic type font. 
Mar 10 2017
2c3afcd722c4Mhurd
Update reset pwd and acct creation email title strings. 
Mar 10 2017
168441422d74Mhurd
Add and hook up pwd reset "Or" label. 
Mar 10 2017
49f6b2296fb1Mhurd
New string for pwd reset "Or" label. 
Mar 10 2017
d4c9de1c9e0aMhurd
Tweak 2FA strings. 
Mar 9 2017