Commit Graph

584 Commits

Author SHA1 Message Date
Matias Alejo Garcia 69daee6ed1 fix/import 2014-11-11 14:51:10 -03:00
Gustavo Maximiliano Cortez 3c2e881acd Merge pull request #1761 from isocolsky/pagination
using foundation pagination directive
2014-11-11 13:02:45 -03:00
Ivan Socolsky 1753e315c1 Merge pull request #1756 from cmgustavo/feature/manage-wallets
Manage wallets
2014-11-11 13:02:43 -03:00
Gustavo Maximiliano Cortez 5a9ecb3a13 fix sidebar when you delete your last inactive wallet 2014-11-11 12:55:25 -03:00
Gustavo Maximiliano Cortez 74b61624e5 deleting wallet with callback 2014-11-11 12:54:52 -03:00
Gustavo Maximiliano Cortez ea7de935d7 Rename of callback function. Add network name. 2014-11-11 10:59:05 -03:00
Ivan Socolsky 6cefd15cbd using foundation pagination directive 2014-11-10 19:10:58 -03:00
Gustavo Maximiliano Cortez ca3e9005a7 Manage wallets 2014-11-10 16:41:07 -03:00
Ivan Socolsky 04a0bff706 added pagination 2014-11-10 16:35:08 -03:00
Matias Alejo Garcia 53843a578d Merge pull request #1669 from matiaspando/feature/importProfile
Import profile
2014-11-10 15:49:56 -03:00
Gustavo Maximiliano Cortez b71bef495a fix alternativeAmount for list of pending transactions proposals 2014-11-08 11:42:01 -03:00
Gustavo Maximiliano Cortez 73ab099236 fix order of transactions list. New format of timestamp. 2014-11-08 11:42:01 -03:00
Gustavo Maximiliano Cortez c132346959 deleted link to test paypro 2014-11-08 11:42:01 -03:00
Gustavo Maximiliano Cortez cea1a1175b fixes sidebar: if wallet is not complete, show: waiting for copayers 2014-11-08 11:42:01 -03:00
Gustavo Maximiliano Cortez 4926a6998d fix icons when moving bitcoin to addresses from a same wallet 2014-11-08 11:29:46 -03:00
Matias Alejo Garcia 5763002edd Merge pull request #1735 from bechi/new-style
fix animation style
2014-11-08 10:06:21 -03:00
Matias Alejo Garcia a73edca586 Merge pull request #1739 from isocolsky/balance
showing N/A when rate services not available
2014-11-08 09:40:04 -03:00
Matias Pando 16c3d66f33 Import profile 2014-11-07 17:35:51 -03:00
Ivan Socolsky b8e7613822 showing N/A when rate services not available 2014-11-07 13:04:46 -03:00
Gustavo Maximiliano Cortez 431a66eeb2 Refresh list of pending transactions proposals after any events 2014-11-07 13:03:34 -03:00
Ivan Socolsky e1eef196a3 removed layout for small devices 2014-11-07 11:19:21 -03:00
Ivan Socolsky 377dc7a176 show alternative amount on txps 2014-11-07 11:18:38 -03:00
bechi f0f5202c7d fix animation style 2014-11-06 18:25:35 -03:00
Gustavo Maximiliano Cortez b2aef7c7db Merge pull request #1727 from matiaspando/feature/selectWalletOnBIP21
Feature/select wallet on bip21
2014-11-06 14:30:52 -03:00
Matias Alejo Garcia 68208f7610 Merge pull request #1726 from marianorod/new-popup
wallets effect
2014-11-05 19:46:01 -03:00
Gustavo Maximiliano Cortez aa58070d7d fixed page not found 2014-11-05 17:52:55 -03:00
Gustavo Maximiliano Cortez a067b24a57 fix layout create, join and import 2014-11-05 17:52:21 -03:00
Mariano Rodriguez 9f40443ed4 unused_html_deleted 2014-11-05 17:48:37 -03:00
Gustavo Maximiliano Cortez 1e1f39e3b2 fix layout history, manage and settings 2014-11-05 17:33:51 -03:00
Gustavo Maximiliano Cortez 2122ccff43 fix addresses to string. fix layout of receive 2014-11-05 17:33:00 -03:00
Gustavo Maximiliano Cortez 80e2eb7378 fixes sidebar: hide locked balance when selecting wallet 2014-11-05 17:29:59 -03:00
Matias Pando 0c9b36032b Update balance of wallets 2014-11-05 16:37:25 -03:00
Mariano Rodriguez abba5e1ea8 style_to_anim_boxes 2014-11-05 11:49:05 -03:00
Mariano Rodriguez 9297d92488 wallets effect 2014-11-05 11:49:05 -03:00
Gustavo Maximiliano Cortez fbfbeaa54c Merge pull request #1723 from bechi/temp
first animation on wallet selection
2014-11-05 09:49:36 -03:00
bechi f1e1f6e853 fix name class 2014-11-05 09:20:58 -03:00
bechi 6ec24348f7 first animation $ wallet selection 2014-11-04 17:57:23 -03:00
Matias Alejo Garcia 80a26411a7 Merge pull request #1719 from cmgustavo/bug/05-ui
Bug/05 ui
2014-11-04 16:44:14 -03:00
Juan Ignacio Sosa Lopez 7209745446 Merge pull request #1717 from matiaspando/feature/selectWalletOnBIP21
Shows the wallet on a pop up
2014-11-04 16:42:51 -03:00
Gustavo Maximiliano Cortez 861f3c584d fix payment protocol message on send page 2014-11-04 16:32:43 -03:00
Matias Pando e39959b4a4 Added a link to test payment protocol 2014-11-04 15:56:50 -03:00
Matias Pando 6286789f4d Shows the wallet on a pop up 2014-11-04 15:24:56 -03:00
Gustavo Maximiliano Cortez d5f7e46084 fix transactions proposals list 2014-11-04 15:14:42 -03:00
Matias Alejo Garcia 4378290ff6 Merge pull request #1715 from cmgustavo/bug/tooltip-position
Removed unused styles. Fix tooltip position
2014-11-04 13:09:17 -03:00
Matias Alejo Garcia e59fc26f0d Merge pull request #1716 from matiaspando/iss1700
Replaced a call to a function for a variable
2014-11-04 13:08:47 -03:00
Gustavo Maximiliano Cortez 6a9e2a0a32 fix settings layout 2014-11-04 13:02:03 -03:00
Matias Pando b086cff940 Replaced a call to a function for a variable 2014-11-04 12:13:09 -03:00
Gustavo Maximiliano Cortez a191a53c59 Removed unused styles. Fix tooltip position 2014-11-04 12:04:53 -03:00
Matias Alejo Garcia e7211979e8 Merge pull request #1711 from maraoz/add/devLogin
add developer easy login
2014-11-04 11:59:34 -03:00
Juan Ignacio Sosa Lopez e9c160bd4d Merge pull request #1706 from matiaspando/feature/selectWalletOnBIP21
Added page and controller to select wallet
2014-11-04 11:30:11 -03:00
Manuel Araoz 0a91883096 add developer easy login 2014-11-04 10:58:32 -03:00
Matias Pando d8f4881582 Shows only ready wallets 2014-11-04 10:17:42 -03:00
Matias Alejo Garcia e9eb311339 Merge pull request #1704 from cmgustavo/bug/04-ui
Bug/04 ui
2014-11-03 18:15:35 -03:00
Matias Pando bacea69cb3 Added page and controller to select wallet 2014-11-03 18:03:41 -03:00
Matias Alejo Garcia 7a610c1b5b fix type 2014-11-03 17:44:24 -03:00
Gustavo Maximiliano Cortez fe92486d67 fix history. Added date and comment for small devices 2014-11-03 16:32:41 -03:00
Matias Alejo Garcia 4821567b1d inform the user of "too big" tx 2014-11-03 16:07:55 -03:00
Matias Alejo Garcia 1f9b9c8dca variable fee for "send all funds" 2014-11-03 15:53:00 -03:00
Gustavo Maximiliano Cortez 885765b873 Fixed layout for small devices. remove unused function and css classes. 2014-11-03 14:10:59 -03:00
Matias Alejo Garcia 3360c31a12 fix login / create form errors and confirmed messages 2014-11-01 21:36:46 -03:00
Matias Alejo Garcia 01e8562b43 fix async loop 2014-11-01 09:42:56 -03:00
Gustavo Maximiliano Cortez 65d1cc7019 fix homeWallet. unified icon copayers 2014-10-31 18:38:31 -03:00
bechi 873ace30e4 fix color & size 2014-10-31 18:21:36 -03:00
bechi b68127e6fe little detail 2014-10-31 18:15:23 -03:00
Gustavo Maximiliano Cortez 76b59c78a7 Merge pull request #1661 from bechi/history-icon
History icon
2014-10-31 17:28:21 -03:00
bechi 099fffed4b fix history icon 2014-10-31 17:06:02 -03:00
Matias Alejo Garcia f1b7d11eec Merge pull request #1654 from isocolsky/paypro
fixed paypro
2014-10-31 16:16:23 -03:00
Ivan Socolsky a685fd77f1 fixed paypro 2014-10-31 16:10:11 -03:00
bechi 1a61b58581 Merge branch 'master' into history-icon 2014-10-31 16:02:34 -03:00
bechi 5bf89db32d add icon 2014-10-31 16:00:02 -03:00
Matias Alejo Garcia b9540d5a09 Merge pull request #1651 from bechi/bugs/ui-10
fix home style
2014-10-31 15:53:15 -03:00
bechi 9353225409 fix more section 2014-10-31 15:36:49 -03:00
Gustavo Maximiliano Cortez b540021487 fix layout locked balance and list of wallets 2014-10-31 15:30:43 -03:00
Gustavo Maximiliano Cortez cfc16b8d68 fix sidebar mobile 2014-10-31 15:29:59 -03:00
bechi d8cd4240fa fix copayers 2014-10-31 15:21:52 -03:00
bechi 081f299a54 fix home style 2014-10-31 15:17:39 -03:00
Matias Pando 07b4050d39 Added copayers list 2014-10-31 14:10:09 -03:00
Matias Alejo Garcia b12d12bff7 Merge pull request #1642 from bechi/bugs/ui-09
Bugs/ui 09
2014-10-31 12:25:00 -03:00
bechi e7703692df fix button class 2014-10-31 12:16:02 -03:00
bechi da5aa14487 fix refresh btn position 2014-10-31 12:14:47 -03:00
bechi 4693297405 history details 2014-10-31 12:04:59 -03:00
Matias Pando 470e16eaa1 Added home 2014-10-31 11:51:02 -03:00
Esteban Ordano 5f035a9680 Fixes error codes against Insight 2014-10-31 11:24:16 -03:00
bechi 5159508d41 fix history section 2014-10-31 09:33:00 -03:00
Matias Alejo Garcia 263e3fe84d Merge pull request #1621 from cmgustavo/feature/history
Removed transaction proposals from history. List of transactions sent
2014-10-30 22:52:49 -03:00
Gustavo Maximiliano Cortez 950a89727b removed transaction proposals from history. Just list transactions sent 2014-10-30 21:32:49 -03:00
Matias Alejo Garcia 8009ab4f86 Merge pull request #1620 from bechi/bugs/ui-08
fix create, join & import
2014-10-30 18:39:59 -03:00
bechi 041b781994 fix create, join & import 2014-10-30 18:22:34 -03:00
Matias Alejo Garcia 4afcad4601 Merge pull request #1613 from bechi/bugs/ui-07
Bugs/ui 07
2014-10-30 17:48:44 -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
Matias Pando 7cc6e335a7 Adding a way to set the log level from the UI 2014-10-30 17:00:42 -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
bechi 24ea10c36c history section 2014-10-30 16:46:39 -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 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
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
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
ssotomayor 5c158a65e1 New addresses are now added at bottom of the list instead of at the top 2014-10-29 14:52:13 -03:00
bechi 465b68b7ed fix header & new icon 2014-10-29 10:51:26 -03:00
Ivan Socolsky d5b04d7ad8 removed backup step in wallet creation 2014-10-28 15:48:00 -03:00
Gustavo Maximiliano Cortez c8614b76c2 Sidebar support for small devices 2014-10-28 12:37:15 -03:00
Matias Alejo Garcia 7afe921fd2 Merge pull request #37 from isocolsky/tx_date
added sentTs and minedTs to tx history
2014-10-27 23:13:40 -03:00
Ivan Socolsky e60a34cdad added sentTs and minedTs to tx history 2014-10-27 16:56:37 -03:00
Gustavo Maximiliano Cortez 096a5d0290 top-bar with dynamic title 2014-10-27 16:13:06 -03:00
Gustavo Maximiliano Cortez 5f2a508f40 Sidebar auto height (Depending on the number of items that have). Fix auto-refresh and show/hide wallets 2014-10-24 10:51:38 -03:00
Ivan Socolsky 5b0098a2f6 fixed message when receiving on labeled address 2014-10-24 10:51:38 -03:00
Ivan Socolsky 52c913b89e removed txid from view 2014-10-24 10:51:38 -03:00
Ivan Socolsky ccb138f605 show label and comment in view 2014-10-24 10:51:38 -03:00
Ivan Socolsky 797da92d90 added get transaction history method 2014-10-24 10:51:38 -03:00
Gustavo Maximiliano Cortez 6af23a995e Fix sidebar selector 2014-10-24 10:51:38 -03:00
Gustavo Maximiliano Cortez 9fd0bfb968 hide join form while is loading... 2014-10-24 10:51:38 -03:00
bechi 2900f25831 fix layout sidebar & add new wallet 2014-10-24 10:51:37 -03:00
Gustavo Maximiliano Cortez 5a2dca7b1b fix sidebar links 2014-10-24 10:51:37 -03:00
Gustavo Maximiliano Cortez 768dba5d53 fixes sidebar. Amount in alternative currency breaking the layout. Vertical support for small devices 2014-10-24 10:51:37 -03:00
Gustavo Maximiliano Cortez 93907dbfd1 backup a wallet during creation. View wallet/profile backup in plain text for safari 2014-10-24 10:51:37 -03:00
Gustavo Maximiliano Cortez c01cdb8b25 Delete wallet function as service 2014-10-24 10:51:37 -03:00
Gustavo Maximiliano Cortez 19f6118f7f Fixes if last focused wallet is undefined 2014-10-24 10:51:37 -03:00
Gustavo Maximiliano Cortez 420d5f253c fixes: createProfile, home and settings. Cleaning css 2014-10-24 10:51:36 -03:00
bechi 71784798f8 side bar & change wallets 2014-10-24 10:51:36 -03:00
Ivan Socolsky 3191ba200c do not select wallet on 'ready' message 2014-10-24 10:51:36 -03:00
Ivan Socolsky 1f45ecfdc8 compute balance for all wallets 2014-10-24 10:51:36 -03:00
bechi 8acb4d6676 side bar - wallet select 2014-10-24 10:51:35 -03:00
Ivan Socolsky 62502bc698 implemented wallet selection in sidebar 2014-10-24 10:51:35 -03:00
bechi ee7993dccb side bar refactory 2014-10-24 10:51:35 -03:00
Gustavo Maximiliano Cortez 0e1cdda52d import a wallet inside a profile 2014-10-24 10:51:35 -03:00
Ivan Socolsky 43c0eb9cb6 handle 0 wallets 2014-10-24 10:51:35 -03:00
bechi 22c378b080 side bar details 2014-10-24 10:51:35 -03:00
bechi 005625c4b2 fix signup & signin 2014-10-24 10:51:35 -03:00
Matias Alejo Garcia 09439d1d41 rebased to master 2014-10-24 10:51:35 -03:00
Matias Alejo Garcia a3d0b9e48b fix manage controller, refactor logged attr 2014-10-24 10:51:07 -03:00
Matias Alejo Garcia d9cd2e95d4 add manage page to create/join/import/delete wallets 2014-10-24 10:51:06 -03:00
Matias Alejo Garcia 29bbfa184c add warning for old wallets 2014-10-24 10:51:06 -03:00
Matias Alejo Garcia dd0dc9c6ad add warning for old wallets 2014-10-24 10:51:06 -03:00
Matias Alejo Garcia b03a3f1391 check if there is not profile, to redir 2014-10-24 10:51:06 -03:00
Matias Alejo Garcia bdaf40de48 add redirs to internal pages 2014-10-24 10:51:06 -03:00
Matias Alejo Garcia b5f05118c7 update models tests to new API 2014-10-24 10:51:06 -03:00
Gustavo Maximiliano Cortez 006bf4c1fa fix join 2014-10-24 10:51:06 -03:00
Gustavo Maximiliano Cortez 76e09a0bd4 wallet created 2014-10-24 10:51:06 -03:00
Gustavo Maximiliano Cortez 0c591ce9c0 waiting for copayers 2014-10-24 10:51:06 -03:00