Commit graph

270 commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez
e5b237bb7a Merge pull request #145 from JDonadio/feat/open-tx-modal
Open tx/txp modal without navigation
2016-09-21 12:10:03 -03:00
Gabriel Bazán
473feddfc8 use accept slider directive 2016-09-20 15:58:44 -03:00
Jamal Jackson
f74ff4f40f added click to go to slide in wallets, added max-width 2016-09-20 12:35:12 -04:00
Javier
ae266e397b wip 2016-09-20 12:02:45 -03:00
Jamal Jackson
7357273314 fix backup modal header image 2016-09-15 10:41:18 -04:00
Jamal Jackson
be58b7983d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_screenshot_warning_model 2016-09-15 09:37:36 -04:00
Gustavo Maximiliano Cortez
90c9f69a9c
Fix no border for back buttons 2016-09-14 17:43:03 -03:00
Gustavo Maximiliano Cortez
cd6d0a5d1d Merge pull request #111 from cmgustavo/ref/design-29
Amazon: not allow to buy gift card for amounts with more than 2 decim…
2016-09-14 16:36:37 -03:00
Jamal Jackson
d38a3a01be added screenshot model 2016-09-14 14:07:44 -04:00
Gustavo Maximiliano Cortez
a8f212474a
Amazon: not allow to buy gift card for amounts with more than 2 decimal places. Adds a confirmation before to purchase 2016-09-14 12:39:27 -03:00
Javier
a978062425 fix backup flow 2016-09-13 17:02:38 -03:00
Jamal Jackson
d39f69531d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_backup_phrase
# Conflicts:
#	public/views/includes/confirmBackupPopup.html
#	src/js/controllers/backup.js
2016-09-13 14:26:25 -04:00
Jamal Jackson
13c56798fe updated language and position on confirm on backup file 2016-09-13 14:15:51 -04:00
Jamal Jackson
8b24adb53c added basic modal class styling, styled success modal 2016-09-13 14:05:49 -04:00
Gustavo Maximiliano Cortez
058f790ebd Merge pull request #99 from gabrielbazan7/ref/code
code refactor
2016-09-13 09:55:26 -03:00
Gabriel Bazán
50434d7ab6 code refactor 2016-09-12 16:53:12 -03:00
Gabriel Bazán
d28c837fcf onboarding process details 2016-09-12 15:12:22 -03:00
Gustavo Maximiliano Cortez
112d30d3e6 Merge pull request #78 from jamal-jackson/feature/recieve_bitcoin_views
Initial setup of receive tab(waiting on some designs/views to be made)
2016-09-08 15:13:15 -03:00
Jamal Jackson
21a2f41ef9 began update for wallet module and receive screen 2016-09-07 09:46:00 -04: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
241213ca4f
Fix glidera issues (tx proposals and ui) 2016-09-06 11:59:05 -03:00
Javier
b6bcc57cfd fix incomplete wallet process 2016-09-06 11:28:34 -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
e4e388f7bd Merge pull request #50 from matiu/bug/sign2
Bug/sign2
2016-09-02 16:21:26 -03:00
Gustavo Maximiliano Cortez
2fccd89c3a
Fix onboarding params, buttons, states 2016-09-02 15:42:45 -03:00
Matias Alejo Garcia
3ee06cdab9 Merge pull request #51 from gabrielbazan7/fix/txDetails
fix transations details note and external link
2016-09-02 15:01:10 -03:00
Gabriel Bazán
2bdf4021d2 fix transations details note and external link 2016-09-02 14:51:41 -03:00
Matias Alejo Garcia
8c43f55756
add notpending in proposals 2016-09-02 14:33:18 -03:00
Matias Alejo Garcia
4662b2fc92
add translate 2016-09-02 10:35:57 -03:00
Matias Alejo Garcia
b9ebe65c9b
txp at home 2016-09-01 19:14:18 -03:00
Matias Alejo Garcia
f5127d157c
better views in activity 2016-09-01 16:56:35 -03:00
Matias Alejo Garcia
e0b77968bd
disable grouping in activity 2016-09-01 16:50:13 -03: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
Gabriel Bazán
91d1b16508 translations 2016-09-01 10:41:23 -03:00
Jamal Jackson
f15d597b25 pulled in latest commits from yesterday, merged and handled conflicts 2016-09-01 08:59:37 -04:00
Matias Alejo Garcia
1e5c940ef7
wallet created 2016-08-31 20:10:13 -03:00
Matias Alejo Garcia
0c668f3b83
recent activity 2016-08-31 17:12:36 -03:00
Matias Alejo Garcia
3080cf05dd
better activity 2016-08-31 16:41:33 -03:00
Matias Alejo Garcia
d14f5306e3
include own notifications in ticker 2016-08-31 16:39:45 -03:00
Matias Alejo Garcia
8bc84d397d
. 2016-08-31 16:38:16 -03:00
Nick Cardin
ba781bcbf7 update tab-home first pass 2016-08-31 12:00:01 -04:00
Javier
a9c4762ef7 refactor backup flag process 2016-08-31 09:49:06 -03:00
Gabriel Bazán
b804a6d867 adding translation tags 2016-08-30 16:09:39 -03:00
Jamal Jackson
e24e13aa20 finished terms view, added terms and general layout sass files, updated default back button to match comp, etc. 2016-08-30 12:58:58 -04:00
Matias Alejo Garcia
f7e04c70c6
bettet activity 2016-08-25 18:40:53 -03:00
Matias Alejo Garcia
db9750b263
better wallet order 2016-08-25 18:13:20 -03:00
Javier
48a2be626d refactor 2016-08-25 17:31:23 -03:00
Javier
19419526e4 isolated scope - wallets filtered from controller 2016-08-25 17:31:23 -03:00
Javier
26b58fd9ed add wallet change events 2016-08-25 17:30:35 -03:00
Javier
1f7d9a99b4 ref view 2016-08-25 17:30:35 -03:00