Skip to content

Commit

Permalink
Merge branch 'master' into 20180205-tos-update
Browse files Browse the repository at this point in the history
  • Loading branch information
@sneak
sneak authored Feb 19, 2018
2 parents c39dfd5 + 76b0a39 commit 431127f
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 59 deletions.
Binary file removed src/app/assets/images/welcome.jpg
View file
Binary file not shown.
91 changes: 42 additions & 49 deletions src/app/components/pages/RecoverAccountStep1.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,59 +242,52 @@ class RecoverAccountStep1 extends React.Component {
)}

{show_social_login && (
<div className="row">
<div className="column large-4">
{email_submitted ? (
tt(
'recoveraccountstep1_jsx.thanks_for_submitting_request_for_account_recovery',
{ APP_NAME }
)
) : (
<form
onSubmit={this.onSubmitEmail}
noValidate
<div className="row">
<div className="column large-4">
{email_submitted ? (
tt(
'recoveraccountstep1_jsx.thanks_for_submitting_request_for_account_recovery',
{ APP_NAME }
)
) : (
<form onSubmit={this.onSubmitEmail} noValidate>
<p>
{tt(
'recoveraccountstep1_jsx.enter_email_toverify_identity'
)}
</p>
<div
className={
email_error
? 'column large-4 shrink error'
: 'column large-4 shrink'
}
>
<p>
{tt(
'recoveraccountstep1_jsx.enter_email_toverify_identity'
)}
</p>
<div
className={
email_error
? 'column large-4 shrink error'
: 'column large-4 shrink'
}
>
<label>
{tt('g.email')}
<input
type="text"
name="email"
autoComplete="off"
onChange={
this.onEmailChange
}
value={email}
/>
</label>
<p className="error">
{email_error}
</p>
<label>
{tt('g.email')}
<input
type="submit"
disabled={email_error || !email}
className="button hollow"
value={tt(
'recoveraccountstep1_jsx.continue_with_email'
)}
type="text"
name="email"
autoComplete="off"
onChange={this.onEmailChange}
value={email}
/>
</div>
</form>
)}
</div>
</label>
<p className="error">{email_error}</p>
<input
type="submit"
disabled={email_error || !email}
className="button hollow"
value={tt(
'recoveraccountstep1_jsx.continue_with_email'
)}
/>
</div>
</form>
)}
</div>
)}
</div>
)}
</div>
);
}
Expand Down
8 changes: 0 additions & 8 deletions src/app/components/pages/Welcome.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ class Welcome extends React.Component {
return (
<div className="row">
<div className="column large-8 medium-10 small-12">
<div className="Welcome__banner">
<div className="Welcome__welcome">Welcome to</div>
<img src={require('app/assets/images/welcome.jpg')} />
<div className="Welcome__caption">
Come for the rewards. Stay for the community.
</div>
</div>
<hr />
<HelpContent path="welcome" />
</div>
</div>
Expand Down
74 changes: 72 additions & 2 deletions src/app/utils/BadActorList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,26 @@ allcoin.com
appreciater
apreciator
ausbitban
ausbltbank
battrex
bbittrex
bcex
bellyrub
berniesandlers
bernieslanders
berniestandards
bernlesanders
bettrex
biitrex
biittrex
binan
binanc
binance
binance.com
binanced
binancee
binances
binanse
bit-z
bitex
bitfinex
Expand Down Expand Up @@ -42,6 +56,7 @@ bitterex
bitterx
bittex
bitthai
bittr
bittrax
bittre
bittrec
Expand All @@ -51,9 +66,11 @@ bittreex
bittrek
bittres
bittresx
bittret
bittrev
bittrex-deposit
bittrex.com
bittrexchange
bittrexe
bittrexs
bittrext
Expand Down Expand Up @@ -123,9 +140,9 @@ boostr
boostre
boostter
boster
btc38
btc-alpha
btc-alpha.com
btc38
btcalpha
btcmarkets
btcmarkets.net
Expand All @@ -145,19 +162,49 @@ changellly
changelly.com
changely
coin-room
coinbas
coinbase
coinbase.com
coinbased
coinegg
coinegg.com
coinpayment
coinpayments
coinpia
coinroom.com
coinsmarkets
coinsmarkets.com
coinspot
coinzest
community-coin
coolcoin.com
curi
curied
curies
curing
d-tube
dcrypto8
decrypto8
deep8
deepcripto8
deepcrpto8
deepcrypo8
deepcrypt8
deepcrypto0
deepcrypto7
deepcrypto9
deepcrypto88
deepcrypto-8
deepcryptoo8
deepcryptos
deepcryptos8
deepcryto8
deepcrytpo8
deepcypto8
deeprypto8
depcrypto8
donkeypon
eepcrypto8
etherdelta
etherdelta.com
exrates
Expand All @@ -177,14 +224,19 @@ hitbtc.com
hitbtcexchange
huobi.pro
idex.market
inance
ittrex
ittrexx
kcx
kevinwon
kocostock
koinex
kraken
kraken.com
kucoi
kucoin
kucoinn
kucoins
linkcoin
litebit
little-pepper
Expand All @@ -205,34 +257,41 @@ minnowbooste
minnowboosted
minnowboosteer
minnowboosterr
minnowboosters
minnowboostr
minnowboostre
minnowbootser
minnowboster
minnowbuster
minnowhelp
minnowpooster
minnows
minnowsuport
minnowsupports
minnowwbooster
minobooster
minowbooster
minowboster
minowhelper
minnows
minowsupport
neraex
neraex.com
nextgencrypted
nextgencryptos
okex.com
olonie
oloniex
openledgerdex
p-funk
paloniex
paypals
pextokens
pfuck
piloniex
plolniex
ploniex
plooniex
pokoniex
polaniex
poleniex
poliniex
Expand Down Expand Up @@ -300,8 +359,11 @@ poolniex
pooloniex
pooniex
poooniex
poponiex
postpromote
pse
ptunk
puloniex
qryptos
qryptos.com
randomwhale
Expand All @@ -318,18 +380,26 @@ steempay
steempays
sweetsj
sweetssj
sweetsss
sweetsssjs
sweetssssj
swetsssj
tdax
tdax.com
teamsteam
techno-comanche
technocommander
thealien
thebiton
therocktrading
tidex.com
topbtc
ttrex
upbbit
upbi
upbit
upbit.com
upbits
upbitt
upm
upmee
Expand Down

0 comments on commit 431127f

Please sign in to comment.