Commit graph

1,710 commits

Author SHA1 Message Date
Jamal Jackson
52baa52a5c Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book 2016-09-26 08:51:04 -04:00
Gustavo Maximiliano Cortez
88e1d81d9a
Bug fixes 2016-09-23 17:22:03 -03:00
Gustavo Maximiliano Cortez
1b2b49ce2b Merge pull request #183 from cmgustavo/ref/design-50
Bug fixes. Split contacts and wallets from send
2016-09-23 17:12:00 -03:00
Gustavo Maximiliano Cortez
b370e61012
Bug fixes. Split contacts and wallets from send 2016-09-23 17:10:34 -03:00
Jamal Jackson
b5a4597416 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book 2016-09-23 13:58:21 -04:00
Gustavo Maximiliano Cortez
ca1194ce93 Merge pull request #180 from gabrielbazan7/fix/preferencesBwsUrl
fix bws url
2016-09-23 13:47:10 -03:00
Gabriel Bazán
af9b73fd08 fix bws url 2016-09-23 13:40:27 -03:00
Gustavo Maximiliano Cortez
04c724f3dc Merge pull request #179 from cmgustavo/ref/design-49
Minor fixes. Fix Glidera
2016-09-23 13:39:16 -03:00
Gustavo Maximiliano Cortez
a8568db32e Merge pull request #178 from gabrielbazan7/fix/preferencesEmail
fix email
2016-09-23 13:38:47 -03:00
Gustavo Maximiliano Cortez
fabf6a6fd1
Minor fixes. Fix Glidera 2016-09-23 13:34:47 -03:00
Gabriel Bazán
f1576508ba fix email 2016-09-23 13:34:17 -03:00
Gabriel Bazán
2b3fb7eea4 fix alias 2016-09-23 13:31:10 -03:00
Gustavo Maximiliano Cortez
6955f8728d
Fix amazon 2016-09-23 13:13:37 -03:00
Gustavo Maximiliano Cortez
6a3bd53464 Merge pull request #175 from gabrielbazan7/fixes
fixes
2016-09-23 13:11:38 -03:00
Gabriel Bazán
35756cf529 fixes 2016-09-23 12:42:33 -03:00
Jamal Jackson
6e23e35171 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book 2016-09-23 11:30:56 -04:00
Gustavo Maximiliano Cortez
39383b30ad Merge pull request #173 from cmgustavo/ref/design-47
Minor bug fixes
2016-09-23 12:12:39 -03:00
Gustavo Maximiliano Cortez
1923a3d2f8 Merge pull request #160 from jamal-jackson/feature/settings_views_polish
updated add contact view for when user has empty address book
2016-09-23 12:11:59 -03:00
Gustavo Maximiliano Cortez
3292ad382d
Minor bug fixes 2016-09-23 12:07:56 -03:00
Jamal Jackson
4004efd5e4 Merge branch 'feature/settings_views_polish' of https://github.com/jamal-jackson/bitpay-wallet into feature/address_book
# Conflicts:
#	src/sass/views/address-book.scss
2016-09-23 10:11:19 -04:00
Jamal Jackson
ee10ebff9c updated address book add and no address for user 2016-09-23 10:10:17 -04:00
Jamal Jackson
097e6f6d86 removed mistake paste 2016-09-23 09:56:28 -04:00
Jamal Jackson
2799fcb949 removed commented code 2016-09-23 09:53:15 -04:00
Jamal Jackson
f82ea8502f started new address book styling 2016-09-23 09:50:17 -04:00
Gabriel Bazán
eec846f422 fix confirm popup 2016-09-23 10:33:26 -03:00
Jamal Jackson
06fe55519e updated save function 2016-09-23 09:26:26 -04:00
Gustavo Maximiliano Cortez
d8c8a7004f
Fix click to pay 2016-09-22 17:40:17 -03:00
Gabriel Bazán
8f4f16a906 delete fixed button 2016-09-22 17:10:28 -03:00
Gustavo Maximiliano Cortez
337ab55f10 Merge pull request #162 from cmgustavo/ref/design-42
Fix transitions for address book and delete wallet
2016-09-22 16:56:41 -03:00
Gabriel Bazán
8f40484a71 fixes 2016-09-22 16:50:06 -03:00
Gustavo Maximiliano Cortez
f1817047e0
Fix transitions for address book and delete wallet 2016-09-22 16:43:35 -03:00
Jamal Jackson
6bfcf8e874 added color names 2016-09-22 15:36:44 -04:00
Gabriel Bazán
d73ca23548 card for header and QR 2016-09-22 16:18:27 -03:00
Jamal Jackson
64fb4a2e81 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/settings_views_polish
# Conflicts:
#	public/views/preferencesLanguage.html
2016-09-22 15:08:53 -04:00
Jamal Jackson
ee4ba85d35 added settings class 2016-09-22 15:06:34 -04:00
Gabriel Bazán
b713d26173 go from create new shared to copayers 2016-09-22 16:04:05 -03:00
Jamal Jackson
5948123393 improved list style on main settings and preferences views 2016-09-22 12:43:35 -04:00
Jamal Jackson
7973d3a75f updating list view styles throughout settings tab 2016-09-22 12:16:51 -04:00
Jamal Jackson
e3bd63777c updated add contact view for when user has empty address book 2016-09-22 11:46:52 -04:00
Gustavo Maximiliano Cortez
a8ed208ba7 Merge pull request #156 from cmgustavo/ref/design-40
Views caching
2016-09-22 11:57:52 -03:00
Gustavo Maximiliano Cortez
c88df6c599 Merge pull request #157 from gabrielbazan7/fix/addEntrySend
fix okay button on status modal and others
2016-09-22 11:57:12 -03:00
Gustavo Maximiliano Cortez
ca292813eb
Adds cache for preferences, walletDetails 2016-09-22 11:55:23 -03:00
Gustavo Maximiliano Cortez
2a9c3c82e9
Adds cache for amount, backup, amazon, glidera, export, walletDetails 2016-09-22 10:34:00 -03:00
Gabriel Bazán
868e6b086f show add to address book only from tab send 2016-09-22 10:30:35 -03:00
Gabriel Bazán
a6b3b204bd fix okay button on status modal and others 2016-09-22 10:03:38 -03:00
Gustavo Maximiliano Cortez
9cb0dc128c
Fix cache for activity, addressbook, amazon, proposals 2016-09-22 01:47:39 -03:00
Gustavo Maximiliano Cortez
1edcf184ee
Minor fixes 2016-09-21 19:36:24 -03:00
Gustavo Maximiliano Cortez
889ebb8c6c
Enable cache for nav tabs 2016-09-21 19:20:15 -03:00
Gustavo Maximiliano Cortez
b86f2e240d Merge pull request #155 from jamal-jackson/feature/add_wallet_polish
added new images styled icons and list item rows
2016-09-21 19:19:52 -03:00
Gustavo Maximiliano Cortez
006ad0be39 Merge pull request #154 from jamal-jackson/feature/onboarding_last_steps
updated text to match new copy
2016-09-21 19:19:18 -03:00