Commit Graph

8576 Commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez 39ca6ec656 Merge pull request #69 from nacardin/feature/settings2
update styles for settings views
2016-09-07 10:20:59 -03:00
Matias Alejo Garcia d590e4679f Merge pull request #68 from gabrielbazan7/feat/makewp8
Feat/makewp8
2016-09-06 19:01:28 -03:00
Nick Cardin 6b19189caa update nav link css 2016-09-06 17:58:04 -04:00
Nick Cardin cab4534797 update link items 2016-09-06 17:53:20 -04:00
Gabriel Bazan 04faf583c3 fix grunt file 2016-09-06 17:47:21 -03:00
Gabriel Bazan 32bab4ff3e make wp8 cordova project 2016-09-06 17:44:07 -03:00
Gustavo Maximiliano Cortez 0ba1b5a93b Merge pull request #67 from JDonadio/fix/home-variable
Fix variable
2016-09-06 17:26:55 -03:00
Javier dfe8dea8bc fix variable 2016-09-06 17:24:49 -03:00
Javier 9632fe8b64 complete import process 2016-09-06 17:09:05 -03:00
Javier f2257f2519 import from phrase and text done 2016-09-06 15:30:50 -03:00
Gustavo Maximiliano Cortez da4945cc15 Merge pull request #61 from JDonadio/fix/wallet-incomplete
Fix incomplete wallet process
2016-09-06 15:19:30 -03:00
Gustavo Maximiliano Cortez 6f7ab548be Merge pull request #62 from jamal-jackson/feature/onboarding_last_steps
Onboarding disclaimer steps
2016-09-06 15:18:54 -03:00
Gustavo Maximiliano Cortez 5e03f803de
Fix bitpay card. Replaces the app-name in desktop 2016-09-06 15:14:07 -03:00
Matias Alejo Garcia 572025527c Merge pull request #63 from cmgustavo/ref/design-18
Fix glidera issues (tx proposals and ui)
2016-09-06 15:01:16 -03:00
Matias Alejo Garcia a9e66cf259 Merge pull request #64 from cmgustavo/ref/design-19
Fix amazon buttons and forms
2016-09-06 15:00:59 -03:00
Gustavo Maximiliano Cortez ee33e06697
Fix amazon buttons and forms 2016-09-06 12:44:46 -03:00
Jamal Jackson e74b70744f removed root prefix 2016-09-06 11:18:12 -04:00
Jamal Jackson 660f7cb6d3 removed duplicate translate 2016-09-06 11:16:53 -04:00
Gustavo Maximiliano Cortez 241213ca4f
Fix glidera issues (tx proposals and ui) 2016-09-06 11:59:05 -03:00
Jamal Jackson 229e2fd8ec Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps
# Conflicts:
#	public/views/onboarding/terms.html
#	src/sass/views/onboarding/terms-of-use.scss
2016-09-06 10:46:47 -04:00
Jamal Jackson 0ad4e390bb finished terms of use page 2016-09-06 10:43:54 -04:00
Javier b6bcc57cfd fix incomplete wallet process 2016-09-06 11:28:34 -03:00
Jamal Jackson a78724bcca setup disclaimer view and styles 2016-09-06 10:06:13 -04:00
Gustavo Maximiliano Cortez 2354a46bed Merge pull request #59 from JDonadio/fix/tabs-create
Fix/tabs create
2016-09-06 10:14:51 -03:00
Matias Alejo Garcia 774aaec8ca Merge pull request #60 from cmgustavo/ref/design-17
Ref/design 17
2016-09-05 18:37:03 -03:00
Javier 7d7bad50e7 fix duplicate template entry 2016-09-05 18:04:51 -03:00
Gustavo Maximiliano Cortez a1672e1e95
Fix fee level, preferences by wallet, delete, info 2016-09-05 17:36:11 -03:00
Javier 6ba7b7c655 complete scope data for create wallets 2016-09-05 17:15:23 -03:00
Gustavo Maximiliano Cortez a200d42bcd
Ref About 2016-09-05 14:59:11 -03:00
Javier 25990e23fe separate views 2016-09-05 14:34:32 -03:00
Gustavo Maximiliano Cortez 9bfb38d819 Merge pull request #58 from JDonadio/bug/language
Fix language
2016-09-05 12:41:58 -03:00
Javier 1b35ec67e7 refactor 2016-09-05 11:54:14 -03:00
Javier 55ae03613f replace timeout for whenAvailable function 2016-09-05 11:33:41 -03:00
Javier 50c30c25ec fix language 2016-09-05 11:25:30 -03:00
Matias Alejo Garcia 9908046766 Merge pull request #56 from cmgustavo/ref/design-16
WKWebView plugin for iOS
2016-09-05 11:25:23 -03:00
Matias Alejo Garcia 42594fb390 Merge pull request #57 from gabrielbazan7/fix/routes
fix activity and proposals transitions
2016-09-05 11:24:05 -03:00
Gabriel Bazán 14da63c485 fix activity and proposals transitions 2016-09-05 11:04:40 -03:00
Gustavo Maximiliano Cortez 47a5aa7995
WKWebView plugin for iOS 2016-09-05 11:00:56 -03:00
Matias Alejo Garcia 22c06c73a3 Merge pull request #53 from cmgustavo/ref/design-15
Ref/design 15
2016-09-02 17:01:44 -03:00
Gustavo Maximiliano Cortez c1bb2cd2a5
Fix css 2016-09-02 16:54:44 -03:00
Gustavo Maximiliano Cortez f7440b19aa Merge pull request #54 from matiu/bug/wallet-init
fix init wallet view model
2016-09-02 16:49:51 -03:00
Gustavo Maximiliano Cortez 1bae2e4c7a
Removes console.log 2016-09-02 16:48:27 -03:00
Gustavo Maximiliano Cortez 7b4550f978
Fix glidera uri 2016-09-02 16:47:46 -03:00
Matias Alejo Garcia 88b1ca2ffb Merge pull request #55 from JDonadio/fix/empty-object
Fix empty object - navigate to home
2016-09-02 16:43:23 -03:00
Javier 4b2e72a28f fix empty object - navigate to home 2016-09-02 16:42:14 -03:00
Matias Alejo Garcia 1ad2df0714
fix init wallet view model 2016-09-02 16:36:18 -03:00
Gustavo Maximiliano Cortez d7da13e46c
Removes ionicscrolldelegate 2016-09-02 16:29:14 -03:00
Gustavo Maximiliano Cortez 0478fbf276 Merge pull request #52 from gabrielbazan7/fix/clearHistory
clear history on settings
2016-09-02 16:22:23 -03:00
Gustavo Maximiliano Cortez e4e388f7bd Merge pull request #50 from matiu/bug/sign2
Bug/sign2
2016-09-02 16:21:26 -03:00
Gabriel Bazán 3e8ce8854f clear history on settings 2016-09-02 16:06:48 -03:00