Commit Graph

531 Commits

Author SHA1 Message Date
Bechi 4a66ecd63b tx item 2014-02-19 17:35:24 -03:00
Gustavo Cortez a4b978d6dd fix calendar on block list 2014-02-19 10:41:12 -03:00
Mario Colque b53b2f0f5c Merge pull request #378 from cmgustavo/bug/01performance-txs-list
Bug/01performance txs list
2014-02-19 11:16:43 -02:00
Gustavo Cortez 0f7ad7b948 fix conflicts 2014-02-19 10:10:28 -03:00
Gustavo Cortez afe5c2421c message of current loading insted the empty box 2014-02-19 03:45:26 -03:00
Gustavo Cortez 88e39d0c1b improved performance of list of transactions 2014-02-19 03:05:06 -03:00
Mario Colque 00239aac08 #340 Using 'Mined by' legend 2014-02-19 01:48:13 -03:00
Matias Alejo Garcia 7e2035ebeb Merge pull request #374 from colkito/bug/hide-copy-button-without-flash
#356 Fixed copy button if have not flash installed
2014-02-18 20:41:28 -02:00
Matias Alejo Garcia da43ca9231 Merge pull request #375 from matiu/bug/repeating-txs
Bug/repeating txs
2014-02-18 20:35:06 -02:00
Matias Alejo Garcia c2221a9ece fix repeating TXs in addr pages 2014-02-18 19:31:23 -03:00
Mario Colque 91652d854d #356 Fixed copy button if have not flash installed 2014-02-18 16:40:14 -03:00
Matias Alejo Garcia d23648befc Merge pull request #369 from colkito/feature/mining-pool-detection
added Minig Pool Detection
2014-02-18 16:48:04 -02:00
Mario Colque 36f3d6684a #340 added mining pool detection on homepage and block list page 2014-02-18 15:44:02 -03:00
Ryan X. Charles f9b94c9f9f Merge pull request #372 from matiu/npm-version.0.1.2
Npm version.0.1.2
2014-02-18 13:21:16 -05:00
Matias Alejo Garcia 5bca46ed53 Merge pull request #371 from bechi/feature/01-layout-details
navbar-footer
2014-02-18 16:14:56 -02:00
Matias Alejo Garcia 1e8bee4f18 fix working for spent, also in var names 2014-02-18 15:13:22 -03:00
Bechi 941caaafd5 navbar-footer 2014-02-18 15:09:11 -03:00
Mario Colque db064e9527 added Minig Pool Detection 2014-02-18 14:35:54 -03:00
Gustavo Cortez 8710ce410d limit list of addr to 6 with a show more link. 2014-02-18 12:48:43 -03:00
Rich Morgan a820594b8b Added missing /p in pagination row. 2014-02-18 10:28:40 -05:00
Rich Morgan f21d28c601 Added missing /td in Height row 2014-02-18 10:00:50 -05:00
Matias Alejo Garcia 365bd74c53 Merge pull request #362 from matiu/bug/sync-status
Bug/sync status
2014-02-18 11:52:43 -02:00
Matias Alejo Garcia 9bc952a274 fix status page sync error 2014-02-18 10:50:07 -03:00
Bechi b8d872e2d6 adres-tx-page 2014-02-17 17:19:22 -03:00
Bechi e0647e71d0 block page 2014-02-17 16:14:14 -03:00
Matias Alejo Garcia 35abcd4e23 fix conflics 2014-02-16 13:49:34 -03:00
Matias Alejo Garcia f69f210abf fix working for spent, also in var names 2014-02-16 13:38:34 -03:00
Steve Dakh 5c5885149c Fixed wording for unspent/spent outputs 2014-02-16 11:11:27 -05:00
Gustavo Maximiliano Cortez bf64aea7a1 Merge pull request #318 from matiu/feature/new-favico
new favicon by @bechilandia
2014-02-14 15:05:54 -02:00
Matias Alejo Garcia 5ae99f25bb new favicon by @bechilandia 2014-02-14 14:05:13 -03:00
Gustavo Maximiliano Cortez 1f5ca72957 Merge pull request #316 from cmgustavo/bug/01-status-info
#314 duplicate difficulty information: remove duplicate info
2014-02-14 15:00:47 -02:00
Gustavo Cortez 609b43684a #314 duplicate difficulty information: remove duplicate info 2014-02-14 14:05:32 -03:00
Matias Alejo Garcia 90e676e8b6 Merge pull request #315 from matiu/feature/link-on-homepage
add link to insight.bitcore.io
2014-02-14 14:52:31 -02:00
Matias Alejo Garcia f3b26af5e2 add link to insight.bitcore.io 2014-02-14 13:50:42 -03:00
Mario Colque c8eb862b31 fixed start date and finish date for status page 2014-02-14 10:59:59 -03:00
Mario Colque db89d01903 added start date and finix date in status page 2014-02-14 10:09:44 -03:00
Gustavo Cortez 76601f8881 fix status sync 2014-02-13 18:23:47 -03:00
Gustavo Maximiliano Cortez e5216a4fe6 Merge pull request #302 from maraoz/feature/improve-error-messages
improve error messages + fix server error display
2014-02-13 18:42:49 -02:00
Gustavo Cortez dc9914daad #296 fixed sync info box when stop and then start bitcoind 2014-02-13 17:37:50 -03:00
Manuel Araoz 8b88a01f65 add host port to bitcoind error message 2014-02-13 17:16:35 -03:00
Manuel Araoz 25b6011b7c improve error messages + fix server error display 2014-02-13 17:00:55 -03:00
Gustavo Maximiliano Cortez b8d2a863d9 Merge pull request #301 from colkito/bug/new-copy-icon
added a new copy icon #293 and several improvements in the block page
2014-02-13 17:48:01 -02:00
Mario Colque 596d090ca5 added a new copy icon #293 and several improvements in the block page 2014-02-13 16:34:14 -03:00
Manuel Araoz 42c193dfd5 sockets now autoreconnect after disconnection 2014-02-13 16:24:43 -03:00
Mario Colque d68a0ccbfe lenguage change for #292 2014-02-13 15:04:24 -03:00
Manuel Araoz add4088542 add error message 2014-02-13 12:37:23 -03:00
Manuel Araoz ec62e77c80 fix bitcoind message problem 2014-02-13 12:37:23 -03:00
Gustavo Maximiliano Cortez 8c06ab378e Merge pull request #286 from matiu/bug/insight-lowercase
fix capitalization of insight
2014-02-13 12:36:20 -02:00
Matias Alejo Garcia 5cd43cbcaa fix capitalization of insight 2014-02-13 11:29:21 -03:00
Matias Alejo Garcia 5c8bdd8c0c Merge pull request #285 from colkito/bug/clean-error-message-not-found
Hide error message when a tx, addr or block is not found
2014-02-13 11:59:58 -02:00
Mario Colque 056498e773 change url link 2014-02-13 10:59:15 -03:00
Mario Colque 6d222d2fca Hide error message when a tx, addr or block is not found 2014-02-13 10:57:37 -03:00
Matias Alejo Garcia 6213b414e3 remove apiError mesg 2014-02-13 10:56:06 -03:00
Mario Colque 96c58157ba hide bitcoind message 2014-02-13 10:49:58 -03:00
Gustavo Cortez 550a9c7f21 fix issue #281 2014-02-13 10:24:47 -03:00
Matias Alejo Garcia e5f92ed030 fix conflics. 2014-02-13 00:28:30 -03:00
Matias Alejo Garcia 09e3e1d32f new levelDB roots. test updated 2014-02-12 23:56:52 -03:00
Matias Alejo Garcia a35fcc776d addr tx orderer by TS. keep unconfirmed balance. fix times in txs 2014-02-12 19:27:29 -03:00
Gustavo Maximiliano Cortez c6971eaf77 Merge pull request #278 from colkito/feature/added-calendar-selector
#263 Added a calendar selector for blocks
2014-02-12 19:08:29 -02:00
Mario Colque be2a4dec85 #263 Added a calendar selector for blocks 2014-02-12 18:01:04 -03:00
Manuel Araoz 956b04b642 bitcoind connection status derived from PeerSync 2014-02-12 16:30:10 -03:00
Manuel Aráoz b141e20ec9 Merge pull request #272 from maraoz/bug/bitcoind-crash
Bug/bitcoind crash
2014-02-12 17:29:00 -02:00
Gustavo Cortez 0d803a533b #262 right alignment of numbers on blocks-list 2014-02-12 14:16:20 -03:00
Manuel Araoz 5d75aa3ef2 remove console.log for tx and block recieved 2014-02-12 13:43:12 -03:00
Matias Alejo Garcia d561c191e7 sync status 2014-02-12 13:35:57 -03:00
Matias Alejo Garcia 2271a11e37 fixes #251 2014-02-12 13:25:01 -03:00
Gustavo Maximiliano Cortez cae872e575 Merge pull request #269 from colkito/bug/search-loading
Bug/search loading
2014-02-12 14:16:38 -02:00
Matias Alejo Garcia 65c711b278 fixes #266 and #264 2014-02-12 13:11:27 -03:00
Mario Colque d96f60f18b added helper to reset serch 2014-02-12 13:04:26 -03:00
Manuel Aráoz d3a167b170 Merge pull request #252 from cmgustavo/bug/Rounding-issue
Rounding issue: transactions on front page sometimes have too many decimal places
2014-02-12 14:01:07 -02:00
Mario Colque 42968ba12e fixed #253 2014-02-12 12:57:50 -03:00
Gustavo Cortez 1f2b2be6b7 fix layout: unconfirm txs message is too big 2014-02-12 12:48:03 -03:00
Gustavo Cortez a4a0eef2b0 fixed rounding btc values on homepages 2014-02-12 11:59:29 -03:00
Manuel Araoz b9ab6cc6d2 fix homepage 2014-02-12 10:18:49 -03:00
Manuel Araoz 8edf753883 added development message to home 2014-02-11 18:18:23 -03:00
Matias Alejo Garcia 36f8cd0b98 Merge pull request #248 from colkito/bug/hide-time-blockhash-unconfirmed-tx
Bug/hide time blockhash unconfirmed tx
2014-02-11 18:49:18 -02:00
Mario Colque f89e500fcf change hide for show 2014-02-11 17:47:36 -03:00
Mario Colque 95686b8a21 hide time and blockhash for unconfirmed txs 2014-02-11 17:46:21 -03:00
Matias Alejo Garcia 780e2c2172 Merge pull request #247 from matiu/bug/fix-homepage-blocklist
fix #246
2014-02-11 18:45:11 -02:00
Matias Alejo Garcia 81db07e3f1 fix #246 2014-02-11 17:44:16 -03:00
Gustavo Maximiliano Cortez 4d2a97bb33 Merge pull request #241 from colkito/feature/powered-homepage
added powered by
2014-02-11 18:09:43 -02:00
Mario Colque 15689df732 added powered by 2014-02-11 16:48:25 -03:00
Matias Alejo Garcia 8557336ce4 fix lenght 2014-02-11 16:27:35 -03:00
Matias Alejo Garcia 4650418a73 bug/blockslistapi 2014-02-11 16:06:05 -03:00
Matias Alejo Garcia ada8eb2a26 fix NaN 2014-02-11 15:31:50 -03:00
Matias Alejo Garcia c4ebfa39ab Merge pull request #237 from matiu/feature/double-spends
Feature/double spends
2014-02-11 15:58:49 -02:00
Matias Alejo Garcia 5a8a06e0dd show spend status on outputs 2014-02-11 14:50:19 -03:00
Manuel Araoz dfc7f521cf dummy 2014-02-11 14:18:49 -03:00
Manuel Araoz 2c78448417 added development message to home 2014-02-11 14:12:04 -03:00
Matias Alejo Garcia daa8327a5e show double spends, unconfirmed outpoints and incoherences 2014-02-11 13:31:33 -03:00
Matias Alejo Garcia 2bc9cbf07c update docs and homepage 2014-02-11 09:54:07 -03:00
Matias Alejo Garcia 835612da4e Merge pull request #230 from colkito/feature/look-and-feel-tables-list
added a new look&feel for tables at home an block list
2014-02-10 23:25:59 -02:00
Mario Colque 02f676b107 added a new look&feel for tables at home an block list 2014-02-10 22:08:18 -03:00
Gustavo Maximiliano Cortez 338947b321 Merge pull request #228 from cmgustavo/feature/06lookandfeel
fix table of blocks and txs
2014-02-10 20:27:57 -02:00
Gustavo Cortez af0680517b fix table of blocks and txs 2014-02-10 19:25:41 -03:00
Gustavo Maximiliano Cortez 506bd4b32b Merge pull request #227 from colkito/bug/progressbar-style-fixed
progressbar style fixed
2014-02-10 20:07:08 -02:00
Gustavo Maximiliano Cortez b43e2673c9 Merge pull request #226 from cmgustavo/feature/02streamed
fix homepage. fix streamed new txs.
2014-02-10 20:05:21 -02:00
Gustavo Cortez fcb892f269 fix homepage. fix streamed new txs. 2014-02-10 19:11:13 -03:00
Mario Colque 95b874b273 progressbar style fixed 2014-02-10 19:04:26 -03:00
Matias Alejo Garcia 3c317d700b Merge pull request #220 from matiu/feature/handle-double-spends
Feature/handle double spends
2014-02-10 18:15:31 -02:00
Gustavo Maximiliano Cortez 558d8832f2 Merge pull request #219 from colkito/feature/progressbar-top
ngProgress fixed
2014-02-10 17:54:29 -02:00
Mario Colque 96cc476c08 css fixed 2014-02-10 16:30:23 -03:00
Mario Colque f2459093c7 ngProgress fixed 2014-02-10 16:08:36 -03:00
Mario Colque c5e651d714 Merge pull request #216 from cmgustavo/feature/04lookandfeel
target blank for link to source code on homepage
2014-02-10 17:00:59 -02:00
Mario Colque 5e237a7b03 Merge pull request #217 from cmgustavo/feature/05lookandfeel
blocklist: removed column of confirmations
2014-02-10 17:00:16 -02:00
Mario Colque c3cf0145ce added progressbar 2014-02-10 15:51:26 -03:00
Gustavo Cortez ff8494c149 blocklist: removed column of confirmations 2014-02-10 15:12:57 -03:00
Gustavo Cortez 7d4af3f942 target blank for link to source code on homepage 2014-02-10 15:05:10 -03:00
Gustavo Cortez 59edaa45e6 box borders. link color on homepage 2014-02-10 13:45:41 -03:00
Gustavo Cortez d91998622d box with borders 2014-02-10 11:34:36 -03:00
Matias Alejo Garcia 0bbc9763b2 shows orphan status on block page 2014-02-10 11:00:31 -03:00
Mario Colque 16aba1847f created a new Grunt Task only for compress assets 2014-02-10 10:28:43 -03:00
Mario Colque 5b19578407 added all minified files 2014-02-10 04:19:22 -03:00
Mario Colque 3e9c0e0517 conflict solved 2014-02-10 04:10:13 -03:00
Mario Colque 2abb7c4859 concat and minify css and js files 2014-02-10 03:58:28 -03:00
Gustavo Cortez f245622123 fix conflicts. fix table last txs 2014-02-09 21:34:46 -03:00
Gustavo Cortez db8b6e2728 when arrive tx, push on list. fixed streamed blocks on homepage. 2014-02-09 21:11:20 -03:00
Matias Alejo Garcia c40cd41bfd Merge pull request #207 from matiu/bug/fix-broadcast
fix broadcast
2014-02-09 20:34:54 -02:00
Matias Alejo Garcia 87c10a122b fix broadcast 2014-02-09 19:33:39 -03:00
Ryan X. Charles 1c32a43854 remove lorem ipsum content and add real about content 2014-02-09 15:59:35 -05:00
Gustavo Cortez 34f2e933b6 fix update of blockheight on navbar 2014-02-09 16:26:41 -03:00
Gustavo Cortez c6d137f856 fixed: blocklist by date with limit. when arrive new block, reload last 5 blocks on homepage. The same for new txs. 2014-02-09 15:59:28 -03:00
Matias Alejo Garcia 165b8f53ca add block reward to block page, remove it from coinbase 2014-02-08 22:36:03 -03:00
Matias Alejo Garcia 2695ee8073 fix conflics 2014-02-08 20:23:06 -03:00
Gustavo Cortez ec93b9dc29 fixed color on blocklist title 2014-02-07 17:20:54 -03:00
Gustavo Cortez 499578f40c tx pages: flat design for buttons 2014-02-07 16:42:26 -03:00
Mario Colque 1837b9f211 disabled address fixed 2014-02-07 16:07:06 -03:00
Mario Colque e540112b4b initial currency values setted on header controller 2014-02-07 15:44:19 -03:00
Mario Colque 2a4d3f0252 removed unnecessary CurrencyController calls 2014-02-07 15:13:09 -03:00
Mario Colque 398babaa8f added new controller 2014-02-07 13:57:55 -03:00
Gustavo Maximiliano Cortez ad8392380d Merge pull request #192 from colkito/bug/fade-transaction-list
remover the fade effect in the transaction list
2014-02-07 11:23:03 -02:00
Gustavo Cortez b590cf5c5c currency links at left column on all pages 2014-02-06 18:25:12 -03:00
Gustavo Cortez 4e49989d24 Currency support on address pages and missing places 2014-02-06 18:09:50 -03:00
Gustavo Cortez 0b3ac5804f tx page: fixed left column with icon and summary 2014-02-06 17:46:14 -03:00
Mario Colque bdfc1c5455 remover the fade effect in the transaction list 2014-02-06 16:50:20 -03:00
Mario Colque 724c4911bc fixed error message when bitcoind is down 2014-02-06 13:57:11 -03:00
Gustavo Maximiliano Cortez dc75747211 Merge pull request #190 from colkito/bug/copy-paste-feedback-tooltip
added a tooltip when copy&paste buttons is pressed
2014-02-06 14:09:59 -02:00
Mario Colque c5fbde45bb added a tooltip when copy&paste buttons is pressed 2014-02-06 12:57:15 -03:00
Gustavo Cortez 5e4b014c54 added blockhash to tx list. fix lookandfeel tx list, responsive support. hide link copy/paste for small devicas 2014-02-06 12:53:39 -03:00
Matias Alejo Garcia 94edb188d0 fix standalone p2p 2014-02-06 10:20:49 -03:00
Mario Colque afec679720 added the style improvement for the currency switch 2014-02-06 04:46:50 -03:00
Gustavo Cortez f2dfacc25a update generi favicon 2014-02-05 18:30:58 -03:00
Mario Colque fe550a7ab0 added new style for currency switch 2014-02-05 16:26:46 -03:00
Mario Colque d089531643 Merge branch 'master' into feature/switch-currency 2014-02-05 16:01:41 -03:00
Mario Colque 78d4c99337 added currency switch with cache 2014-02-05 15:59:44 -03:00
Gustavo Cortez ed6a259c21 fix warning with var not used. removed developers section. fix navbar search 2014-02-05 15:55:07 -03:00
Matias Alejo Garcia dbe65e6860 Merge pull request #183 from matiu/feature/leveldb
Feature/leveldb
2014-02-05 16:24:35 -02:00
Gustavo Cortez 2a2a2110f5 front-end of block list by date is ready. fillCache for getting blocks. 2014-02-05 15:11:39 -03:00
Gustavo Cortez b69b269cbf fix search box for small devices 2014-02-03 18:16:35 -03:00
Mario Colque e438fb53b7 Merge pull request #180 from cmgustavo/feature/01developers-page
Feature/01developers page
2014-02-03 05:35:30 -08:00
Gustavo Cortez 6b362d5e7b added top messages 2014-02-03 10:39:16 -03:00
Gustavo Cortez c4a05c1060 color in developer: titles 2014-02-03 10:35:12 -03:00
Gustavo Cortez da75d543f2 added API documentation to developers page 2014-01-31 19:16:35 -03:00
Mario Colque 35fcb49660 fix container margin 2014-01-31 17:02:55 -03:00
Mario Colque d73b29240f added new error message template 2014-01-31 16:35:51 -03:00
Mario Colque 6f879e1436 removed old templates 2014-01-31 16:35:28 -03:00
Mario Colque 0520c117a9 moved templates to includes 2014-01-31 16:34:25 -03:00
Gustavo Cortez 1eff18b9b9 Empty page for Developers. Fix responsive menu. 2014-01-31 13:21:32 -03:00
Mario Colque d63163d159 fix conflicts 2014-01-30 18:39:00 -03:00
Mario Colque 00e77708e2 Merge pull request #174 from cmgustavo/feature/01copy-hash-in-blockpage
added hash with copy/paste link on blockpage
2014-01-30 13:36:44 -08:00
Mario Colque a406980b87 added error message when the server is down, bitcoind is down or lost internet connection 2014-01-30 18:34:48 -03:00
Gustavo Cortez fb83126f60 added hash with copy/paste link on blockpage 2014-01-30 18:33:33 -03:00
Gustavo Cortez f03bd89bcd Important Fix on URL routing (Node.js catch all request first, then throught Angular.js) 2014-01-30 17:33:58 -03:00
Mario Colque ed98c88a58 Merge pull request #171 from cmgustavo/bug/01titles-h1-h2-descriptions
SET: complete descriptions info. fixed titles for all pages. complete h1...
2014-01-29 12:20:33 -08:00
Gustavo Cortez bbdd3a137b SET: complete descriptions info. fixed titles for all pages. complete h1, h2 on some pages 2014-01-29 17:17:16 -03:00
Matias Alejo Garcia f405f72e74 Merge pull request #169 from matiu/feature/opt-mongo
Feature/opt mongo
2014-01-29 10:13:53 -08:00
Matias Alejo Garcia 6f2ffeff04 new DB schema. test updated 2014-01-29 15:10:36 -03:00
Mario Colque f2963a2b6d limit live transactions in the homepage 2014-01-29 11:25:27 -03:00
Mario Colque 4d69c974c4 limit live transactions in the homepage 2014-01-29 10:40:49 -03:00
Mario Colque 9b7d1d7758 little fix 2014-01-29 10:27:49 -03:00
Mario Colque 4e88c6fe5d limit live transactions in the homepage 2014-01-29 10:26:03 -03:00
Mario Colque 659d6714c1 new arrow direction for mobile version 2014-01-28 16:41:50 -03:00
Gustavo Maximiliano Cortez 3f7c9a56e7 Merge pull request #161 from colkito/feature/show-output-input-different
added colors to show inputs and outputs different
2014-01-27 13:54:25 -08:00
Mario Colque 9d4052f096 Merge pull request #162 from cmgustavo/feature/01responsive-all-pages
fix route for status page. update all page with responsive support
2014-01-27 13:51:07 -08:00
Gustavo Cortez c49021af9f fix route for status page. update all page with responsive support 2014-01-27 18:13:32 -03:00
Mario Colque 3581b1b347 added colors to show inputs and outputs different 2014-01-27 17:48:02 -03:00
Mario Colque 4656383aea added a rootScope to handle the header bar visibility 2014-01-27 16:09:38 -03:00
Mario Colque f09c041efa added dynamic title 2014-01-27 15:39:59 -03:00
Mario Colque a40b87c4b6 Merge pull request #157 from cmgustavo/feature/01bug-route-index
block without info on list of tx (eg. genesis block). url: block-index n...
2014-01-24 13:02:04 -08:00
Gustavo Cortez 0973047d80 block without info on list of tx (eg. genesis block). url: block-index not founded. Fixed 2014-01-24 18:04:08 -03:00
Gustavo Cortez bb6c1d82fd little fix: navbar 2014-01-24 17:07:24 -03:00
Mario Colque 91c1bec493 Merge pull request #155 from cmgustavo/feature/01navbar-home-responsive
modified navbar to support small device. responsive fix for homepage
2014-01-24 11:48:14 -08:00
Gustavo Cortez f7397f5734 modified navbar to support small device. responsive fix for homepage 2014-01-24 16:50:59 -03:00
Gustavo Maximiliano Cortez d707a55dad Merge pull request #154 from colkito/feature/disable-next-button-blocklist-is-today
verify date and disable next button if is today
2014-01-24 11:47:27 -08:00
Mario Colque 67b0dfd4db verify date and disable next button if is today 2014-01-24 16:07:49 -03:00
Mario Colque c06777748a fixed search when put a txid 2014-01-24 15:18:07 -03:00
Mario Colque b11a7e19a1 search style improved 2014-01-24 12:08:09 -03:00
Mario Colque c4e830b8a4 hide no blocks message when bloks are loading 2014-01-24 11:09:36 -03:00
Mario Colque b4ad22b634 limited live transactions 2014-01-23 18:58:54 -03:00
Mario Colque cc4bba6f52 live transactions limited 2014-01-23 18:15:58 -03:00
Mario Colque 096b3a031f removed unnused footer paginator 2014-01-23 17:51:03 -03:00
Gustavo Cortez 16d1a6fe16 fix conflicts. Removed hashbang route for html5mode. Changed all urls and route for epxress 2014-01-23 17:49:47 -03:00
Mario Colque 8ebd686e33 Merge branch 'master' into fix/node-ui-fixes 2014-01-23 17:33:46 -03:00
Mario Colque fc1717e7e3 hide loading message when there are not txs 2014-01-23 17:31:49 -03:00
Mario Colque 51ba3104fd minimal ui fixes 2014-01-23 16:52:50 -03:00
Matias Alejo Garcia 25ec207fb3 fix conflics 2014-01-23 15:17:00 -03:00
Matias Alejo Garcia 37783c5286 fix conflics 2014-01-23 15:16:17 -03:00
Mario Colque 3023eb6fe4 reorder services 2014-01-23 15:09:17 -03:00
Mario Colque c8113af0f2 changed get_socket to getSocket (camelCase) 2014-01-23 15:01:09 -03:00
Mario Colque a2394e8e89 hide messages until loading be false 2014-01-23 15:00:29 -03:00