Commit Graph

8178 Commits

Author SHA1 Message Date
Matias Alejo Garcia 333b4f45a0
fix fingerprint setting, remove activity from home 2016-09-01 16:46:49 -03:00
Matias Alejo Garcia 21c5cd3fd7 Merge pull request #37 from nacardin/feature/walletDetails
update walletDetails header styles
2016-09-01 16:46:07 -03:00
Nick Cardin 70db673855 update walletDetails header styles 2016-09-01 15:25:03 -04:00
Matias Alejo Garcia 1f1007a552 Merge pull request #36 from nacardin/feature/topBarColor
remove ionic css task from gruntfile
2016-09-01 16:09:36 -03:00
Nick Cardin 8dd14aa1b1 remove ionic css task from gruntfile 2016-09-01 15:06:26 -04:00
Matias Alejo Garcia fd8f76bab0 Merge pull request #32 from cmgustavo/ref/design-12
Removes msg error by popupService
2016-09-01 15:44:56 -03:00
Matias Alejo Garcia edbab551b6 Merge pull request #34 from nacardin/feature/topBarColor
Update headers and colors across app
2016-09-01 15:44:31 -03:00
Nick Cardin a2052b3f3a clean up merge 2016-09-01 12:46:25 -04:00
Nick Cardin 8e6cd5ffba update header color and back button for settings 2016-09-01 12:36:59 -04:00
Nick Cardin e63cb569ba standardize back buttons 2016-09-01 12:16:28 -04:00
Nick Cardin bd7b7d1a77 indent 2016-09-01 11:53:55 -04:00
Nick Cardin 997f57e6d6 revert onboarding 2016-09-01 11:50:30 -04:00
Nick Cardin 3a771e0e21 Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into feature/topBarColor 2016-09-01 11:40:43 -04:00
Matias Alejo Garcia 64e43646d7 Merge pull request #33 from jamal-jackson/feature/get_started_tour
Get started tour for onboarding process
2016-09-01 11:30:52 -03:00
Jamal Jackson 4a793682e6 removed bitpay-wallet file 2016-09-01 10:27:06 -04:00
Jamal Jackson 1caf875ad1 Merge branch 'ref/design' of https://github.com/jamal-jackson/bitpay-wallet into feature/get_started_tour
# Conflicts:
#	public/views/onboarding/welcome.html
2016-09-01 10:12:35 -04:00
Gustavo Maximiliano Cortez 50fdeff138
Removes function showAlert 2016-09-01 11:11:40 -03:00
Gustavo Maximiliano Cortez 92bb8e01bc
Uses popupService 2016-09-01 11:00:36 -03:00
Matias Alejo Garcia 546891d69c Merge pull request #31 from gabrielbazan7/fix/translations
translations
2016-09-01 10:50:24 -03:00
Matias Alejo Garcia 9acebebaff Merge pull request #30 from bitpay/bug/activity/created
fix restore from onboarding.
2016-09-01 10:50:04 -03:00
Gabriel Bazán 91d1b16508 translations 2016-09-01 10:41:23 -03:00
Matias Alejo Garcia 65e1f2dd50
fix respore 2016-09-01 10:37:02 -03:00
Jamal Jackson e935ea64e8 updated create wallet method 2016-09-01 09:25:19 -04:00
Matias Alejo Garcia 8adeb075ad Merge pull request #29 from cmgustavo/ref/design-11
Missing ion-view element and bar-stable class for topbar
2016-09-01 10:10:54 -03:00
Jamal Jackson 8485b62df1 fixed header style issue on tour 2016-09-01 09:02:28 -04:00
Jamal Jackson f15d597b25 pulled in latest commits from yesterday, merged and handled conflicts 2016-09-01 08:59:37 -04:00
Gustavo Maximiliano Cortez 9d341a2cd9
Missing ion-view element and bar-stable class for topbar 2016-09-01 09:53:17 -03:00
Jamal Jackson e3634f63d1 finished on boarding tour ui improvements, started on wallet create 2016-09-01 08:51:48 -04:00
Jamal Jackson e09cd46f95 added svg images for tour flow 2016-09-01 08:51:20 -04:00
Gustavo Maximiliano Cortez 48a182e658 Merge pull request #28 from bitpay/bug/activity/created
wallet created
2016-08-31 23:21:18 -03:00
Matias Alejo Garcia 9fef8f0e90
route fix 2016-08-31 21:01:00 -03:00
Matias Alejo Garcia 1e5c940ef7
wallet created 2016-08-31 20:10:13 -03:00
Matias Alejo Garcia 208f248c32 Merge pull request #27 from cmgustavo/ref/design-10
Fix path to walletDetails
2016-08-31 19:21:01 -03:00
Gustavo Maximiliano Cortez 88b51a579a Merge pull request #26 from gabrielbazan7/fix/backAdd
fix back on add view
2016-08-31 19:07:22 -03:00
Gustavo Maximiliano Cortez bb195e0742
Fix path to walletDetails 2016-08-31 19:07:07 -03:00
Nick Cardin 8d762b380b standardize buttons and bar color 2016-08-31 18:02:15 -04:00
Gabriel Bazán 7e1ced6a18 fix back on add view 2016-08-31 19:01:06 -03:00
Matias Alejo Garcia 2748a893df Merge pull request #25 from JDonadio/bug/scroll-size
Resize view
2016-08-31 18:53:24 -03:00
Javier 97c04d6dae resize view 2016-08-31 18:43:58 -03:00
Matias Alejo Garcia 9a2cdf057c Merge pull request #22 from gabrielbazan7/ref/routes
WIP: move wallet preferences to global settings and show tabs on activity view
2016-08-31 18:28:25 -03:00
Gustavo Maximiliano Cortez 46f8c3a3ac Merge pull request #24 from bitpay/feat/notif2
Feat/notif2
2016-08-31 18:23:48 -03:00
Matias Alejo Garcia e801fc2626
notifications cache and autorefresh 2016-08-31 18:12:28 -03:00
Nick Cardin bacf1fb68f update add wallet view 2016-08-31 17:11:05 -04:00
Matias Alejo Garcia f999f4d092 Merge pull request #23 from cmgustavo/ref/design-09
Fix flag for the next steps
2016-08-31 18:08:16 -03:00
Gustavo Maximiliano Cortez 68c10a4e00
Fix flag for the next steps 2016-08-31 17:59:41 -03:00
Matias Alejo Garcia 0c668f3b83
recent activity 2016-08-31 17:12:36 -03:00
Matias Alejo Garcia 15a288e194 Merge pull request #21 from cmgustavo/ref/design-08
popupServices: BitPay Card and Glidera
2016-08-31 17:11:05 -03:00
Gabriel Bazán 3b419c616a move wallet preferences to global settings and show tabs on activity view 2016-08-31 16:58:36 -03:00
Nick Cardin 09859996a2 fix accidental logic inversion 2016-08-31 15:57:52 -04:00
Nick Cardin 9fa4da88c6 update top bar color 2016-08-31 15:54:53 -04:00