Commit Graph

8798 Commits

Author SHA1 Message Date
Gabriel Bazán aa53dd4926 remove console log 2016-09-23 12:45:07 -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
Gustavo Maximiliano Cortez 34ee8a54ff Merge pull request #172 from JDonadio/bug/spend-unconfirmed
Fix use spending unconfirmed funds
2016-09-23 11:40:39 -03:00
Javier 1cf3e3d535 fix use spending unconfirmed funds 2016-09-23 11:14:50 -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 8a50c9f502 removed typo 2016-09-23 09:50:45 -04:00
Jamal Jackson f82ea8502f started new address book styling 2016-09-23 09:50:17 -04:00
Gustavo Maximiliano Cortez a34d483cd3 Merge pull request #171 from gabrielbazan7/fix/confirm2
fix confirm popup
2016-09-23 10:38:00 -03: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 cf5290d3e5 Merge pull request #170 from cmgustavo/ref/design-46
Fix paypro
2016-09-22 19:28:48 -03:00
Gustavo Maximiliano Cortez d023f9b2b5
Fix paypro 2016-09-22 19:27:59 -03:00
Gustavo Maximiliano Cortez fbe14be31a Merge pull request #169 from cmgustavo/ref/design-45
v0.13.0
2016-09-22 18:35:42 -03:00
Gustavo Maximiliano Cortez 5355dee90b
v0.13.0 2016-09-22 18:35:02 -03:00
Gustavo Maximiliano Cortez fac553eb14
Return cached address while BWS returns main address GAP reached 2016-09-22 18:24:46 -03:00
Gustavo Maximiliano Cortez fa4fd457a0 Merge pull request #167 from cmgustavo/ref/design-43
Fix click to pay
2016-09-22 17:40:34 -03:00
Gustavo Maximiliano Cortez d8c8a7004f
Fix click to pay 2016-09-22 17:40:17 -03:00
Gustavo Maximiliano Cortez 1fcb596c7c Merge pull request #165 from gabrielbazan7/fix/button1
delete fixed button
2016-09-22 17:30:53 -03:00
Gabriel Bazán 8f4f16a906 delete fixed button 2016-09-22 17:10:28 -03:00
Gustavo Maximiliano Cortez 2f77b71c50 Merge pull request #164 from gabrielbazan7/fix/routes1
fix back button in backup view
2016-09-22 17:06:50 -03:00
Gabriel Bazán 0cb1ea0494 fix back button in backup view 2016-09-22 17:04:49 -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
Gustavo Maximiliano Cortez 6f7c4fc1c5 Merge pull request #161 from gabrielbazan7/fix/copayers1
go from create new shared to copayers
2016-09-22 16:54:27 -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 fd06a330c9 remove back view when go home 2016-09-22 16:33:30 -03: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
Gustavo Maximiliano Cortez 09b9be609a Merge pull request #159 from cmgustavo/ref/design-41
Fix delay when open a tx from home
2016-09-22 15:49:34 -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 12906bf416
Fix delay when open a tx from home 2016-09-22 12:08:15 -03:00
Gustavo Maximiliano Cortez 9b93cf8c42 Merge pull request #158 from gabrielbazan7/fix/copayers
refresh status when bwsEvent arrives
2016-09-22 12:06:42 -03:00
Gabriel Bazán e3257ec5c0 refresh status when bwsEvent arrives 2016-09-22 12:02:45 -03: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