Commit Graph

3274 Commits

Author SHA1 Message Date
Matias Alejo Garcia 6edaf9f1a4 Merge pull request #1612 from isocolsky/fixes
Correctly assign sentTxid when proposal is broadcasted
2014-10-30 17:39:40 -03:00
Matias Alejo Garcia 6715d776c0 Merge pull request #1614 from matiaspando/feature/addLogLevelSettings
Feature/add log level settings
2014-10-30 17:38:50 -03:00
Matias Pando de1d230123 Added an explanation 2014-10-30 17:12:27 -03:00
Matias Pando 9e5179aa20 UI fixed 2014-10-30 17:02:04 -03:00
bechi dfc2745293 Merge branch 'master' into bugs/ui-07 2014-10-30 17:01:23 -03:00
Matias Pando 7cc6e335a7 Adding a way to set the log level from the UI 2014-10-30 17:00:42 -03:00
Gustavo Maximiliano Cortez c53905e6ce Merge pull request #1601 from matiu/feature/swipe
Feature/swipe
2014-10-30 16:58:56 -03:00
Matias Pando f586ecf708 Added drop down 2014-10-30 16:58:48 -03:00
bechi 11ab17ec94 Merge branch 'master' into bugs/ui-07 2014-10-30 16:56:26 -03:00
Matias Alejo Garcia fcb2401fff Merge pull request #1609 from cmgustavo/feature/import-from-localstorage
Import Old wallets from localStorage
2014-10-30 16:54:53 -03:00
bechi efab427de1 Merge branch 'master' into bugs/ui-07 2014-10-30 16:51:38 -03:00
Matias Alejo Garcia 0bf30a70aa Merge pull request #57 from cmgustavo/matias/feature/swipe
support for wallets 1-1
2014-10-30 16:47:10 -03:00
Ivan Socolsky dbf1ae2f64 fixed test 2014-10-30 16:47:01 -03:00
Ivan Socolsky 05e836424a correctly assign sentTxid when proposal is broadcasted 2014-10-30 16:47:01 -03:00
bechi 24ea10c36c history section 2014-10-30 16:46:39 -03:00
Gustavo Maximiliano Cortez 9f881087a2 support for wallets 1-1 2014-10-30 16:45:44 -03:00
Matias Alejo Garcia 9914fbce12 Merge pull request #1610 from matiu/feature/home
Feature/home
2014-10-30 16:24:07 -03:00
Matias Alejo Garcia d2f09291cf add change storage to settings 2014-10-30 16:20:25 -03:00
Gustavo Maximiliano Cortez 965d3e1d96 Import Old wallets from localStorage 2014-10-30 16:13:56 -03:00
bechi 9d798a2547 sidebar balance locked 2014-10-30 14:26:11 -03:00
Matias Alejo Garcia fdf466ca45 Merge pull request #1602 from isocolsky/fixes
Small usability fix
2014-10-30 14:14:32 -03:00
Matias Alejo Garcia 376eca7802 Merge pull request #1603 from matiaspando/feature/emailConfirmation
Added email confirmation message
2014-10-30 14:14:03 -03:00
Matias Alejo Garcia 505ac5b5c6 rename controllers and views 2014-10-30 14:13:40 -03:00
bechi 4f1205a4f5 fix UI style & manage wallet 2014-10-30 12:08:42 -03:00
Matias Pando 8a291732b9 Added email confirmation message 2014-10-30 12:06:48 -03:00
Matias Alejo Garcia 4a7a31e8e9 add help 2014-10-30 11:49:05 -03:00
Ivan Socolsky dcab904f50 reorganized method definitions 2014-10-30 11:38:55 -03:00
Matias Alejo Garcia c427d59cfd add quorum check and confimation 2014-10-30 11:24:34 -03:00
Matias Alejo Garcia b402a5a105 swipe working 2014-10-30 11:14:52 -03:00
Matias Alejo Garcia 1325b3f34a pull balance and tx proposal generation 2014-10-30 11:14:52 -03:00
Ivan Socolsky ad1eee6c9c added refresh to settings page 2014-10-30 11:07:15 -03:00
Matias Alejo Garcia 9066e77511 Merge pull request #1600 from bechi/temp3
Fixes UI details
2014-10-30 11:04:57 -03:00
bechi 74ad1f37ff perfil photo container 2014-10-30 10:28:07 -03:00
bechi 8ab32eb684 fix ui details 2014-10-30 10:28:07 -03:00
Gustavo Maximiliano Cortez 35eed69cc2 Merge pull request #1599 from matiaspando/feature/functionDeleted
function deleted
2014-10-30 10:27:17 -03:00
Matias Alejo Garcia 02ab30610f Merge pull request #1598 from cmgustavo/feature/identity-compat01
Display a message for users whose have wallet:: but not profile::
2014-10-30 10:00:32 -03:00
Matias Pando a29585a826 function deleted 2014-10-30 09:51:42 -03:00
Matias Alejo Garcia 24fa7feaee Merge pull request #1498 from matiu/feature/identity
Feature/identity
2014-10-29 23:43:48 -03:00
Matias Alejo Garcia 8f7740824d add crytojs for compatibility 2014-10-29 23:30:36 -03:00
Matias Alejo Garcia 08dc892887 add store Profile on adding wallets 2014-10-29 23:23:16 -03:00
Matias Alejo Garcia ae4dd9a54b fix ALL karma + mocha tests, + karma integration 2014-10-29 22:54:48 -03:00
Matias Alejo Garcia 061938ea63 karma unit directive and services fixed 2014-10-29 20:46:46 -03:00
Matias Alejo Garcia b2c04b7372 fix controllerSpec tests 2014-10-29 20:46:45 -03:00
Matias Alejo Garcia fd7c484761 Merge pull request #56 from ssotomayor/fixes1592
Fix for test after change of PublicKeyRing.
2014-10-29 17:19:00 -03:00
ssotomayor 0f1168882c Removed unnecesary console.log 2014-10-29 17:14:54 -03:00
ssotomayor cf1f7eae01 Fix for test on PublicKeyRing. 2014-10-29 17:14:24 -03:00
Gustavo Maximiliano Cortez 2c07ad6dd7 Display a message for users whose have wallet:: but not profile:: 2014-10-29 16:21:44 -03:00
Matias Alejo Garcia 5a5a15e4ea Merge pull request #51 from matiaspando/feature/identity
adding message publicKeyRingUpdated
2014-10-29 16:03:23 -03:00
Matias Pando 31cab73193 adding message publicKeyRingUpdated 2014-10-29 14:59:28 -03:00
Matias Alejo Garcia a93a48dc60 Merge pull request #50 from ssotomayor/fixes1592
New addresses are now added at bottom of the list instead of at the top
2014-10-29 14:56:59 -03:00