Gustavo Maximiliano Cortez
|
b94f66f32e
|
Fixed Conflicts:
bower.json
js/directives.js
views/includes/sidebar.html
|
2014-08-01 11:12:35 -03:00 |
|
Gustavo Maximiliano Cortez
|
854196e72a
|
Merge pull request #989 from yemel/feature/pre-created-address
Add a pre-generated address to the shared branch
|
2014-08-01 11:04:58 -03:00 |
|
Yemel Jardi
|
ba504f147d
|
Merge pull request #976 from cmgustavo/feature/01-timeout
Automatically logout wallet after 15 minutes of inactivity
|
2014-08-01 10:56:23 -03:00 |
|
Gustavo Maximiliano Cortez
|
d2ae49f9a5
|
Fixes: typo
|
2014-08-01 10:51:26 -03:00 |
|
Gustavo Maximiliano Cortez
|
fc71e6a441
|
Fixes: typo
|
2014-08-01 10:44:33 -03:00 |
|
Gustavo Maximiliano Cortez
|
2784e19cb2
|
Merge pull request #988 from yemel/fix/open-external
Fix open external in new tab and fix typo
|
2014-08-01 10:23:26 -03:00 |
|
Gustavo Maximiliano Cortez
|
09286ec37d
|
Merge pull request #986 from yemel/feature/ui-locked-balance
Change available balance to locked
|
2014-08-01 10:16:00 -03:00 |
|
Yemel Jardi
|
59a03c1f25
|
Change available balance to locked
|
2014-08-01 10:09:26 -03:00 |
|
Gustavo Maximiliano Cortez
|
f9161ed8f2
|
Fix Conflicts:
css/main.css
|
2014-07-31 23:10:38 -03:00 |
|
Gustavo Maximiliano Cortez
|
dbf812f848
|
Fix Karma test
|
2014-07-31 22:49:11 -03:00 |
|
Matias Alejo Garcia
|
1f691d8a2f
|
Merge pull request #993 from yemel/feature/action-icons-tx
Feature/action icons tx
|
2014-07-31 20:47:31 -03:00 |
|
Yemel Jardi
|
9c633f1918
|
Add icons for user actions at transaction proposal
|
2014-07-31 20:34:21 -03:00 |
|
Gustavo Maximiliano Cortez
|
8b2ae3cb8f
|
Fixes: tooltips position. copy peerId from sidebar
|
2014-07-31 17:54:33 -03:00 |
|
Gustavo Maximiliano Cortez
|
87f196ebf4
|
Implemented icon for copy to clipboard in join, address book, transactions and addresses.
|
2014-07-31 16:40:26 -03:00 |
|
Gustavo Maximiliano Cortez
|
dc565e0a68
|
Integrating ZeroClipboard in Copay as directive
|
2014-07-31 16:34:21 -03:00 |
|
Yemel Jardi
|
fdabdc64fe
|
Add a pre-generated address to the shared branch
|
2014-07-31 16:13:27 -03:00 |
|
bechi
|
ccd537751b
|
fix icon-status
|
2014-07-31 15:46:20 -03:00 |
|
Yemel Jardi
|
aa8211a40e
|
Move tooltip to top, it was out of screen on mobile devices
|
2014-07-31 14:11:01 -03:00 |
|
Yemel Jardi
|
e5fd3c38f4
|
Fix open external in new tab and fix typo
|
2014-07-31 14:06:55 -03:00 |
|
bechi
|
25bedef1fc
|
fix conflict
|
2014-07-31 12:17:50 -03:00 |
|
Gustavo Maximiliano Cortez
|
f704826a5c
|
feature: Logout wallet after 15 minutes of inactivity
|
2014-07-30 20:12:22 -03:00 |
|
bechi
|
ac7e8af991
|
tx item fix
|
2014-07-30 17:59:48 -03:00 |
|
bechi
|
c7dfda45a1
|
tooltips comments
|
2014-07-30 16:16:54 -03:00 |
|
bechi
|
dc1f28477d
|
fix h3
|
2014-07-30 16:06:23 -03:00 |
|
bechi
|
010c13fa4f
|
QR style changes
|
2014-07-30 11:41:55 -03:00 |
|
Manuel Aráoz
|
2b74d9a75d
|
Merge pull request #972 from yemel/feature/android-menubutton
Handle android menu button
|
2014-07-30 10:53:26 -03:00 |
|
Yemel Jardi
|
df226e16b6
|
Handle android menu button
|
2014-07-30 10:45:43 -03:00 |
|
Matias Alejo Garcia
|
d62883e88f
|
Merge pull request #969 from yemel/feature/address-external-link
Open bitcoin url in external app
|
2014-07-30 09:55:33 -03:00 |
|
Matias Alejo Garcia
|
3f23e57edd
|
Merge pull request #971 from yemel/feature/share-qr-code
Add qr code to wallet secret and qr scanner at join page
|
2014-07-30 09:54:01 -03:00 |
|
Yemel Jardi
|
45f4352ec4
|
Add qr code to wallet secret and qr scanner at join page
|
2014-07-30 02:55:59 -03:00 |
|
Yemel Jardi
|
037b6e9d01
|
Open bitcoin url in external app
|
2014-07-30 00:51:38 -03:00 |
|
Yemel Jardi
|
71448828f2
|
Fix settings save function
|
2014-07-30 00:22:40 -03:00 |
|
bechi
|
f7e01c477f
|
transaction item
|
2014-07-29 18:09:09 -03:00 |
|
Gustavo Maximiliano Cortez
|
fc339f6472
|
Merge pull request #964 from matiu/feature/renameHD
Feature/rename hd
|
2014-07-29 15:57:48 -03:00 |
|
Manuel Aráoz
|
2cbfbc071a
|
Merge pull request #966 from yemel/feature/android-new-design
Feature/android new design
|
2014-07-29 15:44:22 -03:00 |
|
Yemel Jardi
|
ba70a17b63
|
Fix uriHandler
|
2014-07-29 15:30:01 -03:00 |
|
bechi
|
5ccac65a9b
|
color success
|
2014-07-29 14:42:15 -03:00 |
|
Matias Alejo Garcia
|
af2a12929a
|
fix uriPayment
|
2014-07-29 14:30:08 -03:00 |
|
Matias Alejo Garcia
|
c0190aaeeb
|
fix name in build
|
2014-07-29 14:26:31 -03:00 |
|
Yemel Jardi
|
e3eeab0eb6
|
Change routes to old hastag mode
|
2014-07-29 14:13:21 -03:00 |
|
Yemel Jardi
|
ae9deaa6f8
|
Reintroduce cordova
|
2014-07-29 14:12:50 -03:00 |
|
Matias Alejo Garcia
|
ba31e6a628
|
renames inside HDParams
|
2014-07-29 14:11:11 -03:00 |
|
Matias Alejo Garcia
|
4241bdac68
|
all test pass!
|
2014-07-29 13:33:54 -03:00 |
|
Matias Alejo Garcia
|
cb8f719a99
|
all tests BUT hardcoded imports working
|
2014-07-29 13:10:36 -03:00 |
|
Matias Alejo Garcia
|
578d05e638
|
all tests BUT hardcoded imports working
|
2014-07-29 13:09:47 -03:00 |
|
Matias Alejo Garcia
|
0ee93403f3
|
change names to HD and fix HD* tests
|
2014-07-29 11:23:58 -03:00 |
|
Matias Alejo Garcia
|
1a40e29fd2
|
remove unrequired soop
|
2014-07-29 10:21:44 -03:00 |
|
Matias Alejo Garcia
|
19b9fcd0b1
|
change to camelCase
|
2014-07-29 10:14:43 -03:00 |
|
Matias Alejo Garcia
|
1d5238b2b8
|
change to camelCase
|
2014-07-29 10:14:15 -03:00 |
|
Yemel Jardi
|
bb3e237451
|
Include views folder into apk
|
2014-07-28 17:35:21 -03:00 |
|