Commit graph

8,393 commits

Author SHA1 Message Date
Jamal Jackson
fdb5e467b9 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_push_notifications
# Conflicts:
#	public/views/onboarding/notifications.html
#	src/js/controllers/onboarding/collectEmail.js
2016-09-14 11:42:33 -04:00
Jamal Jackson
df30370e67 removed cat margin bottom at certain height 2016-09-14 11:40:04 -04:00
Gustavo Maximiliano Cortez
e8c242992a Merge pull request #110 from gabrielbazan7/feat/lockOrientation
lock orientation when screen width < 768
2016-09-14 11:50:20 -03:00
Gustavo Maximiliano Cortez
a1fe2d4a69 Merge pull request #109 from isocolsky/fix/wallet-filter
Filter out unavailable wallets
2016-09-14 11:49:17 -03:00
Gustavo Maximiliano Cortez
f7c19265d1 Merge pull request #108 from gabrielbazan7/feat/activityFilter
1 of X wallets should not produce proposals
2016-09-14 11:48:48 -03:00
Gabriel Bazán
d6e78b00f7 lock orientation when screen width < 768 2016-09-14 11:20:49 -03:00
Gabriel Bazán
caeac6045c fixes 2016-09-14 11:18:03 -03:00
Ivan Socolsky
e69ceffb59
filter unavailable wallets 2016-09-14 11:03:43 -03:00
Gabriel Bazán
2f8227ff27 1 of X wallets should not produce proposals 2016-09-14 11:00:59 -03:00
Gustavo Maximiliano Cortez
3424894a11 Merge pull request #107 from gabrielbazan7/fix/importNewScss
import new scss
2016-09-14 10:36:25 -03:00
Gabriel Bazán
f007fb305d import new scss 2016-09-14 10:26:38 -03:00
Gustavo Maximiliano Cortez
d4b9fa99f2 Merge pull request #106 from gabrielbazan7/feat/avatarSendView
avatar in send view
2016-09-14 10:13:32 -03:00
Gustavo Maximiliano Cortez
9f88d9a3cb Merge pull request #105 from cmgustavo/ref/design-28
Fix Address book directive. Adds gravatar
2016-09-14 10:06:50 -03:00
Gustavo Maximiliano Cortez
c4411961af Merge pull request #104 from gabrielbazan7/fix/onboarding-02
Fix/onboarding 02
2016-09-14 10:06:30 -03:00
Gabriel Bazán
c21d447031 avatar in send view 2016-09-14 10:05:02 -03:00
Gabriel Bazán
8080e0b856 fix skip button on email view 2016-09-13 23:25:50 -03:00
Gustavo Maximiliano Cortez
9b440078f3 Merge pull request #101 from cmgustavo/ref/design-27
Fix addressbook directive
2016-09-13 17:40:42 -03:00
Gustavo Maximiliano Cortez
d6601637f9
Adds gravatar 2016-09-13 17:39:01 -03:00
Gabriel Bazán
431058baec fix save last state 2016-09-13 17:31:29 -03:00
Gabriel Bazán
a8567eabb4 fixes 2016-09-13 17:13:53 -03:00
Gabriel Bazán
3d927267bc onboarding - disable scroll - skip notification view on android 2016-09-13 17:12:17 -03:00
Jamal Jackson
4a1ea6d3ea updating on boarding button classes on tour page 2016-09-13 15:55:08 -04:00
Jamal Jackson
390a7deecf finish adding styles for push notifications view(initial testing for iPhone5 size devices only) 2016-09-13 15:45:56 -04:00
Jamal Jackson
ee046cde4e increased modal backdrop opacity with what found in zeplin 2016-09-13 14:35:27 -04:00
Jamal Jackson
d39f69531d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_backup_phrase
# Conflicts:
#	public/views/includes/confirmBackupPopup.html
#	src/js/controllers/backup.js
2016-09-13 14:26:25 -04:00
Jamal Jackson
13c56798fe updated language and position on confirm on backup file 2016-09-13 14:15:51 -04:00
Jamal Jackson
8b24adb53c added basic modal class styling, styled success modal 2016-09-13 14:05:49 -04:00
Gustavo Maximiliano Cortez
32a9c208b7
Fix addressbook directive 2016-09-13 11:12:18 -03:00
Gustavo Maximiliano Cortez
6b571e64ec Merge pull request #100 from cmgustavo/ref/design-26
Updates bwc
2016-09-13 10:00:57 -03:00
Gustavo Maximiliano Cortez
ff0e407e19
Updates bwc 2016-09-13 09:58:54 -03:00
Gustavo Maximiliano Cortez
058f790ebd Merge pull request #99 from gabrielbazan7/ref/code
code refactor
2016-09-13 09:55:26 -03:00
Gustavo Maximiliano Cortez
1e628d9704 Merge pull request #97 from JDonadio/feat/tips
First-tips
2016-09-13 09:54:43 -03:00
Gustavo Maximiliano Cortez
c90e58a958 Merge pull request #96 from cmgustavo/ref/design-25
Address book as a view (not modal)
2016-09-13 09:50:51 -03:00
Gustavo Maximiliano Cortez
9a7e274485
Fix tab-send 2016-09-12 18:04:56 -03:00
Javier
11865c25ef not available for mobile 2016-09-12 17:59:36 -03:00
Gustavo Maximiliano Cortez
62433d8fb9
Fix link to add 2016-09-12 17:54:09 -03:00
Gustavo Maximiliano Cortez
64f9219b33 Merge pull request #98 from gabrielbazan7/fix/hideTabs
hide tabs when native keyboard is open
2016-09-12 17:49:59 -03:00
Gabriel Bazán
50434d7ab6 code refactor 2016-09-12 16:53:12 -03:00
Gustavo Maximiliano Cortez
b814db5a30 Merge pull request #95 from gabrielbazan7/fix/hardwareButtonAndroid
fix transitions with android hardware button
2016-09-12 16:48:46 -03:00
Gustavo Maximiliano Cortez
d9b8211639 Merge pull request #93 from gabrielbazan7/fix/persistState
persist state if force quit app in onboarding
2016-09-12 16:42:55 -03:00
Gustavo Maximiliano Cortez
bc27ee298f Merge pull request #92 from gabrielbazan7/fix/onboarding
onboarding process details
2016-09-12 16:42:34 -03:00
Javier
091ae73e2d show scan tips 2016-09-12 16:41:04 -03:00
Gabriel Bazán
d834d56104 hide tabs when native keyboard is open 2016-09-12 16:26:07 -03:00
Javier
3c353fdbcb show receive tips 2016-09-12 15:48:46 -03:00
Gabriel Bazán
8eac86d32a fix showconfirm calls 2016-09-12 15:12:28 -03:00
Gabriel Bazán
d28c837fcf onboarding process details 2016-09-12 15:12:22 -03:00
Gustavo Maximiliano Cortez
0f4cdfbb32 Merge pull request #94 from JDonadio/fix/sweep-flag
Fix/sweep paper wallet
2016-09-12 14:02:53 -03:00
Jamal Jackson
294b4200f4 reduced spring between words in phrase 2016-09-12 12:39:29 -04:00
Jamal Jackson
576cf04138 completed second step in backup 2016-09-12 12:25:15 -04:00
Gustavo Maximiliano Cortez
b4b06f393b
Fix route 2016-09-12 12:19:08 -03:00