BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,852 Commits 8 Branches 122 Tags 162 MiB
Commit Graph

298 Commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez 022dec727e hide delete and backup wallets on the intermediate screen 2014-09-09 14:46:22 -03:00
Gustavo Maximiliano Cortez c9bc512227 Fix: copayers list 2014-09-09 12:59:27 -03:00
Christopher Jeffrey 953ff985d8 paypro: implement short merchant names in address box and side box. 2014-09-08 17:07:21 -07:00
Christopher Jeffrey 20a30609b8 paypro: fix merchant overflow. 2014-09-08 17:07:21 -07:00
Christopher Jeffrey d855c16d0a Revert "fix send section" 
This reverts commit 111dac1a0e.
 2014-09-08 17:06:10 -07:00
Christopher Jeffrey b078a5e2ea Revert "fix send view indentation: broken by 111dac1a0eeafca40fd29a05536b609b69a3e6be." 
This reverts commit c75bd233e0bd31bf693462f615801229e2e10284.
 2014-09-08 17:05:33 -07:00
Christopher Jeffrey 85be1ee1f7 fix send view indentation: broken by 111dac1a0e. 2014-09-08 17:05:33 -07:00
Christopher Jeffrey 55518afdf7 send: fix send view because no one accounted for paypro when adding this input. 2014-09-08 17:02:24 -07:00
Matias Alejo Garcia 65e054c247 hide QR scanner if not supported 2014-09-08 17:07:43 -03:00
Matias Alejo Garcia 9aa45477a2 fix link 2014-09-08 16:35:44 -03:00
Gustavo Maximiliano Cortez 330210d48e Updated spanish translation 2014-09-05 17:23:44 -03:00
Gustavo Maximiliano Cortez 6a855b7ac1 Fix Conflicts: 
views/addresses.html
	views/send.html
	views/transactions.html
 2014-09-05 17:06:25 -03:00
Gustavo Maximiliano Cortez 2ea21c42f3 added translate tags. Spanish partial support. Need revision 2014-09-05 16:58:28 -03:00
Matias Alejo Garcia e61e34c34e Merge pull request #1295 from bechi/bugs/ui-mobile 
Bugs/ui mobile
 2014-09-05 15:08:18 -03:00
bechi 8fd6aa1eb0 fix addres section 2014-09-04 17:40:16 -03:00
bechi ac6688a182 sidebar-mobile + locked amount + signout in header mobile 2014-09-04 17:03:54 -03:00
bechi a9bf9a25ab fix transactions list 2014-09-04 12:50:27 -03:00
bechi 111dac1a0e fix send section 2014-09-04 11:34:24 -03:00
Matias Pando 89dba4c616 Added secret number feature 2014-09-03 16:51:02 -03:00
bechi 8485d839f5 . 2014-09-03 10:39:48 -03:00
bechi 2d33dcfef6 Merge branch 'master' into bugs/ui 2014-09-03 10:39:09 -03:00
Esteban Ordano a0c7d2cb66 Merge pull request #1258 from cmgustavo/feature/01-remove-peerjs 
Feature: remove peerjs
 2014-09-02 18:23:36 -03:00
Manuel Araoz 2f7eaa4c97 fix wording on more view 2 2014-09-02 17:08:09 -03:00
Manuel Araoz 36057ee8cf fix wording on more view 2014-09-02 17:08:09 -03:00
Gustavo Maximiliano Cortez 85894d56d9 remove video from settings 2014-09-02 12:10:47 -03:00
bechi 3208eeecba fix copy addr button 2014-09-02 12:07:05 -03:00
Gustavo Maximiliano Cortez 7b316939f2 fix peer-list 2014-09-02 11:02:59 -03:00
Gustavo Maximiliano Cortez 0cb465095a update peer-list 2014-09-02 10:51:09 -03:00
Gustavo Maximiliano Cortez ac78e2d1e7 Remove peerjs 2014-09-02 10:48:22 -03:00
Gustavo Maximiliano Cortez 7cae6b3a2e Alternative amount should not have enought-amount directive 2014-09-01 15:41:17 -03:00
bechi 0ef47e5c4c addresses on receive - mobile 2014-09-01 14:44:30 -03:00
Matias Alejo Garcia e73a3f8160 Merge pull request #1228 from eordano/feature/fiat 
Allow user to select an alternative currency and specify amount of money in a fiat currency
 2014-09-01 11:53:17 -03:00
bechi 1b0ddadf43 Intermediate screen 2014-09-01 11:40:09 -03:00
Manuel Aráoz 21d7ea5411 Merge pull request #1239 from matiu/bug/create 
rename #setup to #create
 2014-09-01 11:25:49 -03:00
Esteban Ordano 54b3482b1f Add dollar balance to sidebar 2014-09-01 10:42:30 -03:00
Esteban Ordano d3f48661e1 Add minor improvements 2014-08-30 10:59:11 -03:00
Esteban Ordano 22b92aca61 Address needed change to transaction resume, fix tests 2014-08-30 10:59:11 -03:00
Esteban Ordano 0f0e7b78d5 remove temporary vars 2014-08-30 10:58:48 -03:00
Esteban Ordano 3225553d78 Currency list in settings 2014-08-30 10:58:48 -03:00
Esteban Ordano 3da033cb06 Add RateService to get info about fiat currencies 2014-08-30 10:58:48 -03:00
Esteban Ordano decc9e9dba Mocked up usd <-> alternative 2014-08-30 10:58:48 -03:00
Matias Alejo Garcia b8b40f21f6 rename #setup to #create 2014-08-29 13:20:47 -03:00
bechi 4fa6a59ac5 put label class on change 2014-08-29 13:16:59 -03:00
Matias Pando 20c78ce130 Minor cosmetic fixes 2014-08-28 10:00:18 -03:00
Matias Pando e7c9f8d9c7 Added commit Hash to home page 2014-08-27 13:13:37 -03:00
Manuel Aráoz 0a8fe334f8 Merge pull request #1195 from cmgustavo/feature/remove-unsupported 
Check if browser support localStorage
 2014-08-26 17:28:20 -03:00
Gustavo Maximiliano Cortez 00bfeb40fc update 2014-08-26 16:49:51 -03:00
Gustavo Maximiliano Cortez dd5ecff1df updated2 2014-08-26 16:34:11 -03:00
Gustavo Maximiliano Cortez bbb108ef60 updated 2014-08-26 16:33:01 -03:00
Gustavo Maximiliano Cortez fa75af12aa updated text for unsupported browsers 2014-08-26 16:31:49 -03:00
Matias Alejo Garcia 4b9e243a2b Merge pull request #1182 from cmgustavo/ux/02-txp 
If transaction proposal was sent, remove "loading icon"
 2014-08-26 16:17:41 -03:00
Matias Alejo Garcia e87907fa9d Merge pull request #1180 from cmgustavo/ux/01-history 
show loading/spinner when getting last transactions
 2014-08-26 16:17:27 -03:00
Manuel Araoz 24a4be065a green status for copayers 2014-08-26 11:43:44 -03:00
Manuel Araoz 342a69d737 make it work with ssl insight 2014-08-26 11:43:44 -03:00
Gustavo Maximiliano Cortez a36394f830 If transaction proposal was sent, remove "loading icon" from other copayers 2014-08-25 11:10:52 -03:00
Gustavo Maximiliano Cortez 8da0280da6 show loading/spinner when getting last transactions 2014-08-25 10:44:20 -03:00
Matias Alejo Garcia 80b01cb9bf rm skip Private Key 2014-08-22 10:26:19 -04:00
Matias Alejo Garcia fc78ae27d2 rm fn from more 2014-08-22 10:26:19 -04:00
Matias Alejo Garcia 291ed73916 add test and adv opts to create 2014-08-22 10:26:19 -04:00
Matias Alejo Garcia 4931c9d618 add purge to tx prosposals 2014-08-22 10:26:19 -04:00
Matias Alejo Garcia 60d81e6b9f add advanced options to join 2014-08-22 10:26:18 -04:00
Matias Alejo Garcia db1b7d7c45 add advanced options to import 2014-08-22 10:26:18 -04:00
Matias Alejo Garcia 96b841bd51 update sidebar 2014-08-22 10:26:18 -04:00
Matias Alejo Garcia 2617b76428 mv backup to more filenames 2014-08-22 10:26:18 -04:00
Matias Alejo Garcia b388c3eadf add UX to backup tab 2014-08-22 10:25:30 -04:00
Matias Alejo Garcia e760dae2bd add scaning options too more 2014-08-22 10:25:30 -04:00
Matias Alejo Garcia 4b3cbfcfb0 add test for priv key import 2014-08-22 10:25:30 -04:00
Matias Alejo Garcia 2fbbd2a53a add options to enter Priv Key on join 2014-08-22 10:25:30 -04:00
Matias Alejo Garcia 7f0e9cd03d implements skipping fields in backup imports 2014-08-22 10:25:30 -04:00
Matias Alejo Garcia fea90215d4 add options to show the private key 2014-08-22 10:25:29 -04:00
Matias Alejo Garcia 2c56160e97 Merge pull request #1162 from cmgustavo/bug/02-angular-issues 
Bug/02 angular issues
 2014-08-22 10:19:42 -04:00
Ivan Socolsky ce910fe52f Check tx proposal minimum amount 2014-08-21 16:02:02 -03:00
Gustavo Maximiliano Cortez 013d102513 Small optimization for img tag 2014-08-20 15:32:09 -03:00
Matias Alejo Garcia a6bab8ce43 hide initial balance until it is updated 2014-08-19 15:50:23 -04:00
Matias Alejo Garcia a02b648e41 fix nickname in #join 2014-08-19 14:10:33 -04:00
Matias Alejo Garcia 060fe2ef72 rm line for no multisig wallets 2014-08-19 14:03:43 -04:00
Yemel Jardi b19a0daa64 Replace parseBitcoinURI with bitcore implementation 2014-08-15 23:04:13 -03:00
Matias Alejo Garcia 6b0782f3a0 Merge pull request #1102 from yemel/fix/ui-issues 
Fix/ui issues
 2014-08-15 16:30:40 -04:00
Matias Alejo Garcia 352185e66c Merge pull request #1082 from yemel/feature/mobile-clipboard 
Feature/mobile clipboard
 2014-08-15 16:06:31 -04:00
Yemel Jardi 818c01bf52 Remove 1-2-3 image from creation/join at Android version 2014-08-15 15:47:26 -03:00
Yemel Jardi 236e7b91be Make only the address icon clickable 2014-08-15 13:16:06 -03:00
Yemel Jardi 5a79256b0c Disable select of #signatures for only 1 copayer 2014-08-15 12:22:34 -03:00
Christopher Jeffrey ea7948f420 paypro: better error display on no unspent outputs. 2014-08-14 09:52:43 -04:00
Manuel Araoz 324dfbc36a finished refactor 2014-08-14 09:52:43 -04:00
Manuel Araoz 967457764c refactor controller code to controller from directive 2014-08-14 09:52:42 -04:00
Christopher Jeffrey fcb0484828 paypro: ui - move merchant data into its own element. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey 5ebb344cd2 send: lower btc send limit - dust. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey aed815f5cd paypro: angularize the markup and address directive. 2014-08-14 09:52:41 -04:00
Yemel Jardi b60e8ed407 Add copy to clipboard button 2014-08-13 13:34:47 -03:00
Yemel Jardi 815c98f7e8 Merge pull request #1076 from matiu/bug/02-open-wallet 
Bug/02 open wallet
 2014-08-13 12:33:46 -03:00
Matias Alejo Garcia 35ab711846 refactor lock warning and add tests 2014-08-12 15:26:15 -04:00
bechi 21a32c213c add tooltips 2014-08-11 10:15:24 -03:00
bechi 41ee5edfc0 fix left bar 2014-08-08 11:22:12 -03:00
bechi 86e4c0cea9 fix scann button 2014-08-08 10:36:25 -03:00
Gustavo Maximiliano Cortez 801e746d11 Show a warning if trying to open same wallet in same browser. Fix redirect to receive. 2014-08-07 18:57:19 -03:00
Gustavo Maximiliano Cortez fe53f1b87c Merge pull request #1059 from yemel/feature/change-menu 
Refactor menu, split transactions tab into send and history
 2014-08-07 10:26:40 -03:00
Matias Alejo Garcia bb9406be01 Merge pull request #1033 from cmgustavo/bug/01-url-handler 
Fixes: url handler
 2014-08-07 00:58:08 -03:00
Matias Alejo Garcia 35f379f8c8 Merge pull request #1042 from yemel/feature/add-limit-feedback 
WIP: Add comment about #copayers and #signatures limits
 2014-08-07 00:57:11 -03:00
Gustavo Maximiliano Cortez fd030ecbfb Fix Conflicts: 
js/controllers/join.js
 2014-08-06 18:55:44 -03:00
Gustavo Maximiliano Cortez 0c2141c380 Fix Conflicts: 
views/unsupported.html
 2014-08-06 18:51:04 -03:00
Matias Alejo Garcia 8e2802e1e7 Merge pull request #1064 from cmgustavo/feature/01-setup 
add steps to creation process
 2014-08-06 18:45:26 -03:00
Matias Alejo Garcia 0ca9bbe86b Merge pull request #1062 from cmgustavo/feature/01-delete 
Add delete wallet from the intermediate screen
 2014-08-06 18:38:23 -03:00
Matias Alejo Garcia cc164af28b Merge pull request #1045 from cmgustavo/feature/01-version 
Feature/01 version
 2014-08-06 18:34:03 -03:00
Gustavo Maximiliano Cortez c588d97fc3 add steps to creation process 2014-08-06 18:21:14 -03:00
Gustavo Maximiliano Cortez e264aa66a2 Add delete wallet from the intermediate screen (it was lost in migration to new design) 2014-08-06 16:51:45 -03:00
Yemel Jardi 2ba794fc47 Change url to /receive and /history 2014-08-06 15:34:56 -03:00
Yemel Jardi ad75265e93 Refactor menu, split transactions tab into send and history 2014-08-06 13:59:33 -03:00
bechi 0831f60845 fix scann wallet secret 2014-08-05 15:38:11 -03:00
Gustavo Maximiliano Cortez 0a388c73ca Added version and networkName label bellow Copay logo 2014-08-05 11:52:51 -03:00
Gustavo Maximiliano Cortez a5544d08db Merge pull request #1040 from yemel/feature/improve-1-of-1 
Remove Name field and copayer list on 1-of-1 wallets
 2014-08-05 10:29:46 -03:00
Yemel Jardi 4c4f20afb6 Add comment about #copayers and #signatures limits 2014-08-04 17:27:59 -03:00
Yemel Jardi 6a3e109f39 Sort copayer list at Tx proposal by creator 2014-08-04 16:43:45 -03:00
Yemel Jardi 523a48b056 Remove Name field and copayer list on 1-of-1 wallets 2014-08-04 16:27:58 -03:00
Gustavo Maximiliano Cortez 94047a77ae Merge pull request #1030 from yemel/feature/replace-you-with-me 
Replace You with Me
 2014-08-04 15:27:42 -03:00
Gustavo Maximiliano Cortez ee031849b2 Fixes: url handler 2014-08-04 11:27:46 -03:00
Yemel Jardi 698bd3f616 Fix typo, closes #1015 2014-08-04 10:22:02 -03:00
Yemel Jardi 125c99320b Replace You with Me 2014-08-04 10:14:03 -03:00
Yemel Jardi 3ab1510051 Android update 0.4.2 2014-08-04 09:49:22 -03:00
Yemel Jardi 64d5eb7577 Change tooltip placement 2014-08-01 15:16:07 -03:00
Gustavo Maximiliano Cortez a3baab397c Fix Conflicts: 
css/main.css
	views/modals/qr-address.html
 2014-08-01 13:14:10 -03:00
Gustavo Maximiliano Cortez 85e78f2797 Merge pull request #995 from bechi/bugs/re-size-qr 
fix qr size
 2014-08-01 13:09:39 -03:00
Gustavo Maximiliano Cortez 313e3e4fcd Merge pull request #998 from yemel/fix/browser-extensions 
Fix/browser extensions
 2014-08-01 11:54:41 -03:00
bechi 2d3fdbe6fb fix conflict 2014-08-01 11:38:07 -03:00
Gustavo Maximiliano Cortez 1cd1ad2ff8 Fix Conflicts: 
views/modals/qr-address.html
 2014-08-01 11:28:16 -03:00
Yemel Jardi c2345fa77c Merge pull request #996 from cmgustavo/feature/02-join 
Added invalid message if I paste a wrong wallet secret
 2014-08-01 11:20:16 -03:00
Gustavo Maximiliano Cortez d68f0b366f Merge pull request #994 from yemel/fix/qr-code-schema 
Fix address QR code, now it use proper bitcoin: schema
 2014-08-01 11:17:23 -03:00
Gustavo Maximiliano Cortez b94f66f32e Fixed Conflicts: 
bower.json
	js/directives.js
	views/includes/sidebar.html
 2014-08-01 11:12:35 -03:00
bechi 1a6585a358 fix conflict qr modal 2014-08-01 10:55:47 -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
bechi 771c0e4a8d fix qr on modal 2014-08-01 09:39:41 -03:00
Gustavo Maximiliano Cortez f9161ed8f2 Fix Conflicts: 
css/main.css
 2014-07-31 23:10:38 -03:00
Gustavo Maximiliano Cortez 96116c14fd Added invalid message if I paste a wrong wallet secret 2014-07-31 21:58:35 -03:00
Yemel Jardi 30505ebb49 Fix title position on join wallet screen 2014-07-31 21:20:43 -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 1232b28f0f Fix address QR code, now it use proper bitcoin: schema 2014-07-31 20:39:08 -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
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
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 010c13fa4f QR style changes 2014-07-30 11:41:55 -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
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