Jamal Jackson
|
30f8a641b1
|
Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_push_notifications
|
2016-09-14 14:46:23 -04:00 |
|
Gustavo Maximiliano Cortez
|
1e0424ad29
|
Merge pull request #103 from jamal-jackson/feature/onboarding_backup_phrase
Added design and styling needed for backup phrase view
|
2016-09-14 15:15:33 -03:00 |
|
Jamal Jackson
|
a20802b3c5
|
Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_backup_phrase
|
2016-09-14 12:58:25 -04:00 |
|
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 |
|
Jamal Jackson
|
ca6b6c058b
|
removed overflow-y hidden when elect-phrase element is relative
|
2016-09-14 11:26:00 -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 |
|
Jamal Jackson
|
31d5a370bd
|
Merge branch 'feature/onboarding_backup_phrase' of https://github.com/jamal-jackson/bitpay-wallet into feature/onboarding_backup_phrase
|
2016-09-14 10:40:53 -04:00 |
|
Jamal Jackson
|
fe96fc41d1
|
updated text for different scenarios where backup phrase might not be readily available to create.
|
2016-09-14 10:40:33 -04: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 |
|
Jamal Jackson
|
7308883010
|
Merge pull request #1 from JDonadio/jamal/backup-phrase
Fix backup flow
|
2016-09-14 08:34:38 -04:00 |
|
Jamal Jackson
|
2a55e3f232
|
backup view when header is present fixes
|
2016-09-14 08:29:57 -04:00 |
|
Gabriel Bazán
|
8080e0b856
|
fix skip button on email view
|
2016-09-13 23:25:50 -03:00 |
|
Javier
|
da5b7d6aff
|
clean unused services
|
2016-09-13 17:51:05 -03:00 |
|
Javier
|
88c9e48ad9
|
fix title
|
2016-09-13 17:49:07 -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 |
|
Javier
|
a978062425
|
fix backup flow
|
2016-09-13 17:02:38 -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 |
|