Commit Graph

88 Commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez bf630418d8 Merge pull request #401 from gabrielbazan7/feat/language
disable language auto detection
2016-10-12 10:31:46 -03:00
Gabriel Bazán 78aa0442c1 disable language auto detection 2016-10-12 10:24:15 -03:00
Matias Alejo Garcia 31e6a0d6e4 Merge pull request #392 from msalcala11/sendStyling
Proposal detail modal styling
2016-10-12 08:28:22 -03:00
Jason Dreyzehner 2e6d394673 fix(all): the buttons 2016-10-11 23:23:54 -04:00
Marty Alcala 6bfdec29b3 fix merge conflicts 2016-10-11 19:14:13 -04:00
Marty Alcala a7fe6fc27b remove commented code 2016-10-11 19:10:13 -04:00
Marty Alcala 7451aa0e8f add rejected styling 2016-10-11 19:00:16 -04:00
Marty Alcala 7f40490d0b better style proposal deletion help text 2016-10-11 18:24:01 -04:00
Marty Alcala b3ad938ad4 fix borders and bottom for slide to pay 2016-10-11 18:20:10 -04:00
Marty Alcala dd6a55a5a1 more proposal timeline styling 2016-10-11 18:05:00 -04:00
Matias Alejo Garcia 6b2cbccecd
workaround to link inner childs 2016-10-11 18:37:47 -03:00
Marty Alcala 908bbdff9c prelim timeline-content styling 2016-10-11 16:48:03 -04:00
Jason Dreyzehner 7d9a4244c9 feat(send): design and scaffold zero-state for send tab 2016-10-11 16:36:01 -04:00
Marty Alcala a637c1b61d add single-line item style 2016-10-11 15:36:28 -04:00
Jason Dreyzehner 73018e062f feat(design): polish send tab design 2016-10-11 15:27:25 -04:00
Marty Alcala 70367bc4e7 more proposal page styling 2016-10-11 15:22:11 -04:00
Jason Dreyzehner fbdc23a012 Merge pull request #381 from bitjson/wip/design
Design Work
2016-10-11 15:14:05 -04:00
Marty Alcala 288d122b3d prelim styling of payment proposal modal 2016-10-11 14:45:54 -04:00
Jason Dreyzehner 4cb5de40b4 feat(design): update buttons in logs view 2016-10-11 14:42:56 -04:00
Jason Dreyzehner 7fd9eb63f8 feat(design): improve design of backup-needed-modal 2016-10-11 14:42:56 -04:00
Jason Dreyzehner c19bbc539e feat(design): correct bitcoin icon across all views 2016-10-11 14:41:57 -04:00
Gustavo Maximiliano Cortez ec7e4234e3 Merge pull request #377 from gabrielbazan7/fix/hideConfirmation
hide confirmation label when is unconfirmed
2016-10-11 15:40:16 -03:00
Gabriel Bazán 8d80150322 hide confirmation label when is unconfirmed 2016-10-11 15:32:26 -03:00
Matias Alejo Garcia 29311ffa36
rm unused tips link 2016-10-11 14:55:25 -03:00
Gustavo Maximiliano Cortez 6f3bd62efb Merge pull request #358 from gabrielbazan7/fix/transitions
disable(onboarding) hardware backbutton (android) and back swipe (ios) and more fixes
2016-10-11 14:31:19 -03:00
Matias Alejo Garcia 8c52bc3948 Merge pull request #352 from gabrielbazan7/feat/pullToRefresh
pull to refresh
2016-10-11 14:11:11 -03:00
Gabriel Bazán 80246588f9 remove bouncing wallet details 2016-10-11 13:17:32 -03:00
Gabriel Edgardo Bazán 2c7856be7e Update disclaimer.html 2016-10-11 13:14:30 -03:00
Gabriel Bazán c73fb0173c pull to refresh in home tab 2016-10-11 13:01:12 -03:00
Gabriel Bazán 59d2641c27 remove unused code 2016-10-11 13:01:01 -03:00
Gabriel Bazán 0d92a2af9b pull to refresh 2016-10-11 13:01:01 -03:00
Gabriel Bazán 6b454bb1f1 change title 2016-10-11 12:37:12 -03:00
Matias Alejo Garcia 8607867d71 Merge pull request #327 from msalcala11/slideToPayComponent
Implement Slide to Pay
2016-10-11 11:47:18 -03:00
Matias Alejo Garcia 767b523499 Merge pull request #365 from bitjson/feature/new-qrscanner-permissions
Polish QR scanning for desktop, iOS, and Android
2016-10-11 11:29:30 -03:00
Gabriel Bazán e2b995102c delete unused code and fixes 2016-10-11 10:19:05 -03:00
Matias Alejo Garcia ba62ae6c0c Merge pull request #353 from cmgustavo/bug/amazon-font-size-padding
Fix Amazon GiftCard integration: font-size and padding
2016-10-11 08:56:43 -03:00
Jason Dreyzehner f1a849c5d8 Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into feature/new-qrscanner-permissions 2016-10-11 03:15:07 -04:00
Jason Dreyzehner c0d4fbe5bb feat(scan): first iteration of full scan view implementation 2016-10-11 03:06:17 -04:00
Jason Dreyzehner 845534c727 refactor(scan): remove dead code around old desktop scanner 2016-10-10 23:09:27 -04:00
Jason Dreyzehner ce3812b220 feat(scan): scaffold permission priming in scan view 2016-10-10 22:58:08 -04:00
Marty Alcala 82ad31724b wire slide to accept component to proposal accept screen 2016-10-10 18:52:59 -04:00
Gabriel Bazán 2576b3e790 disable hardware backbutton (android) and back swipe (ios) and more fixes 2016-10-10 17:53:11 -03:00
Marty Alcala 324088b5db handle proposal creation 2016-10-10 16:04:54 -04:00
Marty Alcala 9adab04871 fix merge conflicts 2016-10-10 15:35:27 -04:00
Marty Alcala d5e72eede0 make click to pay flow match slide to pay flow 2016-10-10 15:27:57 -04:00
Gustavo Maximiliano Cortez 3e54619c97 Merge pull request #349 from matiu/bug/tx-sent
fix font on tx-send
2016-10-10 16:04:51 -03:00
Gustavo Maximiliano Cortez 8ef7c9e62c Merge pull request #346 from jamal-jackson/feature/add_direct_glidora_link
sending user directly to Glidera view
2016-10-10 15:48:48 -03:00
Gustavo Maximiliano Cortez c88f3b0fab Merge pull request #338 from matiu/bug/no-funds
better message for "no enough funds"
2016-10-10 15:47:07 -03:00
Gustavo Maximiliano Cortez d2bd1a2406
Fix Amazon GiftCard integration: font-size and padding 2016-10-10 15:40:11 -03:00
Marty Alcala a1c73b7148 add hasClick to platformInfo and use it to determine whether to show the slide to pay component or not 2016-10-10 14:22:00 -04:00