Commit graph

60 commits

Author SHA1 Message Date
Matias Alejo Garcia
c38d0ed221 Merge pull request #370 from gabrielbazan7/fix/resume
if no wallet resume welcome - if no disclaimer accepted resume disclaimer
2016-10-11 13:18:29 -03:00
Gabriel Edgardo Bazán
2c7856be7e Update disclaimer.html 2016-10-11 13:14:30 -03:00
Gabriel Bazán
6b454bb1f1 change title 2016-10-11 12:37:12 -03:00
Jason Dreyzehner
f1897f4d1b Merge pull request #369 from vanhue/ref/design
Onboarding bg fix
2016-10-11 11:28:40 -04:00
Houston
4d2513c899 Onboarding bg fix 2016-10-11 11:20:24 -04: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
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
Matias Alejo Garcia
2b11dbc4e1
rm Copay from tos 2016-10-10 15:09:28 -03:00
Matias Alejo Garcia
183dde73c4
fix font on tx-send 2016-10-10 14:56:14 -03:00
Jamal Jackson
2da5d82a8a sending user directly to gliders view 2016-10-10 13:42:29 -04:00
Matias Alejo Garcia
52f8888a94
fix arrow direction 2016-10-10 14:12:25 -03:00
Gustavo Maximiliano Cortez
1ab772b419 Merge pull request #335 from matiu/bug/no-lang
rm language selection
2016-10-10 14:02:47 -03:00
Matias Alejo Garcia
1af5d6dd5f
better message for "no enough funds" 2016-10-10 13:57:25 -03:00
Matias Alejo Garcia
fce9c2357f
rm language selection 2016-10-10 13:25:40 -03:00
Gabriel Bazán
b29fab9ae2 ios fixes 2016-10-10 13:16:13 -03:00
Gabriel Bazán
3320510d35 fix push notifications and remove onboarding email 2016-10-10 13:16:07 -03:00
Gustavo Maximiliano Cortez
19567e31cb Merge pull request #322 from jamal-jackson/feature/kill_recieve_scan_tips
kill recieve and scan tips
2016-10-10 11:56:27 -03:00
Gustavo Maximiliano Cortez
0b00274dd2 Merge pull request #321 from JDonadio/fix/clear-backup-flow-02
Reset words only - backup flow
2016-10-10 11:54:32 -03:00
Gustavo Maximiliano Cortez
4f06b3f672 Merge pull request #319 from JDonadio/ref/password-and-advanced-options
Ref/password and advanced options
2016-10-10 11:53:18 -03:00
Marty Alcala
777c2efc32 implement slide to pay 2016-10-07 20:03:51 -04:00
Jason Dreyzehner
bb247416fa fix(settings): correct image paths 2016-10-07 16:44:02 -04:00
Jamal Jackson
93625092c5 removed scanner tip 2016-10-07 16:42:51 -04:00
Jamal Jackson
7f2dae6960 killed receive tips 2016-10-07 16:42:05 -04:00
Javier
12835ddb7e reset words only 2016-10-07 17:33:54 -03:00
Javier
45c6cd9736 ref password and andvanced options on join and export file view 2016-10-07 16:41:00 -03:00
Javier
8e5ac09aa4 ref password and andvanced options oncreate shared view 2016-10-07 16:24:38 -03:00
Javier
1ab4504824 ref password and andvanced options oncreate personal view 2016-10-07 16:24:28 -03:00
Jason Dreyzehner
47c683bf2b Merge pull request #282 from gabrielbazan7/feat/disableScroll
disable scroll in notifications view
2016-10-07 11:38:39 -04:00
Jamal Jackson
5559ce9b3f Updated icons and links (#255)
* added appropriate wallet design

* added new links to settings tab, and associated svg images

* added space below last link in settings list

* hiding links with views not ready

* added help and support link

* updated settings view

* removed empty param
2016-10-07 11:35:43 -04:00
Gabriel Bazán
80cd494e3e disable scroll in notifications view 2016-10-07 12:24:20 -03:00
Jason Dreyzehner
b98887b2fe Merge pull request #311 from JDonadio/fix/wallet-icon
Use correct icon on wallet widget
2016-10-07 11:12:41 -04:00
Jason Dreyzehner
ce28d971c2 Merge pull request #278 from isocolsky/ref/email-text
Remove warning from email notification preferences
2016-10-07 11:09:04 -04:00
Jason Dreyzehner
e0582c0153 Merge pull request #306 from isocolsky/rm/delete-words
Remove "delete words" option
2016-10-07 11:08:49 -04:00
Javier
43adab479b use correct wallet icon 2016-10-07 11:34:04 -03:00
Javier
1e4b30c893 clear button 2016-10-07 10:59:23 -03:00