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

2671 Commits

Author SHA1 Message Date
Mariano Rodriguez 1a6c6b6c10 Margins top 10 2014-09-17 11:39:02 -03:00
Matias Alejo Garcia e2af5ac782 Merge pull request #1418 from matiaspando/test/addingCoverage 
Test added on Wallet.js
 2014-09-17 06:30:46 -03:00
Matias Alejo Garcia 533e554341 Merge pull request #1420 from bechi/bugs/ui-mobile-02 
Bugs/ui mobile 02
 2014-09-17 06:30:28 -03:00
Matias Alejo Garcia 912c57eee4 Merge pull request #1400 from cmgustavo/antifeature/forcenetwork 
Remove forceNetwork
 2014-09-17 05:38:18 -03:00
bechi 619611b0af fix address list mobile 2014-09-16 17:01:52 -03:00
Matias Pando a316d04474 Test added 2014-09-16 15:58:23 -03:00
bechi 0301ad0cf0 fix qr code's popup mobile 2014-09-16 15:45:55 -03:00
Matias Alejo Garcia 6fc144571b Merge pull request #1415 from marianorod/first-pr 
Strong and italic to 'No transaction yet' msg
 2014-09-16 12:37:44 -03:00
bechi a7d5ca70d3 fix address book mobile 2014-09-16 12:04:21 -03:00
Mariano Rodriguez 62d6c0c8df Strong and italic to 'No transaction yet' msg 2014-09-16 11:39:30 -03:00
Manuel Aráoz ba1ebcac88 Merge pull request #1407 from bechi/bugs/ui-01 
balance font in sidebar
 2014-09-16 10:34:43 -03:00
Manuel Aráoz 103d9d2384 Merge pull request #1402 from bechi/bugs/ui-mobile-01 
fix close button positioned
 2014-09-16 10:30:22 -03:00
Matias Alejo Garcia c665ccfb80 Merge pull request #1406 from chjj/xhr_error_msg 
paypro: fix xhr error messages. fix clearing $root.merchant on section switch. check for merchant_data.
 2014-09-15 21:03:31 -03:00
Christopher Jeffrey aa5e90786b paypro: fix - check for merchant_data existence. 2014-09-15 16:39:30 -07:00
Christopher Jeffrey 20bc1ecbb5 paypro: fix $root.merchant clearing on tab change. see #1406 - gustavo's comment. 2014-09-15 15:49:52 -07:00
bechi 635579cf43 balance font in sidebar 2014-09-15 17:13:57 -03:00
Christopher Jeffrey 03c3eefd0d paypro: fix xhr error messages. remove comments. 2014-09-15 11:43:39 -07:00
Matias Alejo Garcia 38756063ad Merge pull request #1403 from cmgustavo/bug/05-typos 
typos: BIP32 master extended private key (hex)
 2014-09-15 13:57:27 -03:00
Gustavo Maximiliano Cortez 03eb6488ec typos: BIP32 master extended private key (hex) 2014-09-15 13:04:44 -03:00
bechi feb40d7e3a fix close button positioned 2014-09-15 12:06:19 -03:00
Gustavo Maximiliano Cortez d4ec48aadd Merge pull request #1371 from matiaspando/error/informPasswordNotMatching 
Error/inform password not matching
 2014-09-15 11:06:16 -03:00
Matias Pando 3818044a2e Translations fixed 2014-09-15 10:50:06 -03:00
Gustavo Maximiliano Cortez d85fcbfe07 Remove forceNetwork 2014-09-15 10:16:40 -03:00
Gustavo Maximiliano Cortez 6efa6dbf96 Merge pull request #1308 from eordano/grunt-jsdoc 
JSDocs generated by grunt
 2014-09-15 09:40:32 -03:00
Esteban Ordano 313efa9503 Fixes old version of grunt 2014-09-13 23:49:56 -03:00
Esteban Ordano 027043bd6f JSDocs generated by grunt 2014-09-13 23:49:56 -03:00
Matias Pando a599251b39 Fixed 2014-09-13 09:24:20 -03:00
bechi 2bb61501bb fix ui 2014-09-13 09:24:20 -03:00
Matias Pando 4de113fa19 Translation added 2014-09-13 09:20:21 -03:00
Matias Pando 72d2e16415 Fixed 2014-09-13 09:20:21 -03:00
Matias Pando de43990882 Conflicts fixed 2014-09-13 09:20:21 -03:00
Gustavo Maximiliano Cortez ce95cb264d Merge pull request #1389 from maraoz/wording/txs 
Wording fixes
 2014-09-12 19:04:37 -03:00
Manuel Araoz 8c422640aa wording fix 2014-09-12 13:24:10 -07:00
Manuel Araoz 80b86ca2ab fixes #1325 2014-09-12 13:15:43 -07:00
Matias Alejo Garcia c596535ca7 Merge pull request #1384 from maraoz/wording/adv-settings 
wording fix
 2014-09-12 15:30:08 -03:00
Gustavo Maximiliano Cortez d0d49f17ef Merge pull request #1353 from matiaspando/feature/skipBackup 
Skiping backup
 2014-09-12 15:27:58 -03:00
Manuel Araoz ce975ed0ab wording fix 2014-09-12 11:23:44 -07:00
Matias Pando 0698c70cce Conflicts fixed 2014-09-12 14:56:19 -03:00
Matias Pando 873f854eb8 Skip avoid waiting for other copayers 2014-09-12 13:29:41 -03:00
Matias Pando b7373367a1 Skip avoid waiting for other copayers 2014-09-12 13:25:52 -03:00
Matias Pando da08f52d67 Showing message only when the copayer may create a backup 2014-09-12 12:55:36 -03:00
bechi 7847cd5067 fix style 2014-09-12 12:55:36 -03:00
bechi 778086ca1d fix text color 2014-09-12 12:55:36 -03:00
Matias Pando db7d33682e Solving conflicts 2014-09-12 12:55:36 -03:00
Matias Pando 2b540264a5 Conflicts solved 2014-09-12 12:55:36 -03:00
Matias Pando ecea1a654d If the copayer upload a backup it does not wait for others 2014-09-12 12:55:36 -03:00
Matias Pando 84dbcb038a Fixed 2014-09-12 12:55:36 -03:00
Gustavo Maximiliano Cortez c9ccc4f085 Merge pull request #1369 from isocolsky/rename_backup 
Added copayer nickname to backup name
 2014-09-12 12:02:25 -03:00
Ivan Socolsky 8d7e420524 No copayer nickname on 1-1 wallets 2014-09-12 11:10:45 -03:00
Ivan Socolsky 7cf2a474dd removed old test 2014-09-12 10:41:17 -03:00