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

1053 Commits

Author SHA1 Message Date
Yemel Jardi 09e60b2f70 Refresh tx list after send on 1-of-1 2014-08-07 09:53:20 -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
Gregg Zigler c8c7a57416 1. Add TxProposals to mocha test page 
2. The jshint tool found some instances where var was declared twice within a function. Seemed to originate from copy/paste-style coding. Most were unambiguously intended for a single block within the function. In a few cases, two declarations were consumed by one later reference. In those cases, I removed the duplicate var or I refactored slightly.
 2014-08-06 18:44:04 -04: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
Gustavo Maximiliano Cortez 53bc610bbc improve url checker 2014-08-06 18:41:37 -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
Matias Alejo Garcia ddc8649bd3 fix `comment` handling 2014-08-06 15:56:17 -03:00
Gustavo Maximiliano Cortez 7fd642c8ac Fixes problem with gitignore 2014-08-06 15:36:13 -03:00
Yemel Jardi 2ba794fc47 Change url to /receive and /history 2014-08-06 15:34:56 -03:00
Matias Alejo Garcia afde77e575 fix last transaction retrieval 2014-08-06 15:30:47 -03:00
Yemel Jardi ad75265e93 Refactor menu, split transactions tab into send and history 2014-08-06 13:59:33 -03:00
Matias Alejo Garcia 91a05a896e rm removeRepeated fn 2014-08-05 17:18:02 -03:00
Matias Alejo Garcia 260adc8587 fix tests 2014-08-05 16:42:51 -03:00
Matias Alejo Garcia 5a2dfe690d add rebroadcast test 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 91829f8410 remove sender sig check 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 36fcd6882f add more tests to wallet 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 768dfefe3a wallet working again 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 4cf152999a add seenBy on creator 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia f5f9848ff1 all test passing! 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 753b890658 txp* test passing 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 966818c53a add different toObj/fromObj fn for networking 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia c8917fccd6 karma + mocha browser passing also 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia d0c43f9bfb ALL test passing 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia dc3bbb8859 wallet test passings 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 5d2b50f77f test in Txproposals working again 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 42c73f9a01 rewrite from scratch tests for TxProposalSet 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia ae042a8292 TxProposal fully testes 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 2fe421b14f tests for txProposal 1 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 0e211426d7 tests for txProposal 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 05aefc17a5 tests for txProposal 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 72e1dfc114 WIP 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 6e5f06693d separate TxProposal to a different class. new tests 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 96a5f0aeb8 add forPath and tests 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia a10e6f4908 add getForPath with tests 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 4e6d572de0 add cache to pubkeyring test. Speedup 2x 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia c19eac6a4e WIP 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia df357e4ea7 add metadata checks 2014-08-05 16:38:13 -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
Gustavo Maximiliano Cortez 125ceb9b66 Merge pull request #1041 from yemel/fix/go-home-settings 
Go home after saving settings
 2014-08-05 10:23:12 -03:00
Gustavo Maximiliano Cortez 844620f30f Merge pull request #1038 from yemel/feature/remember-last-wallet 
Save last opened wallet
 2014-08-04 17:37:28 -03:00
Yemel Jardi 2a122f4b47 Go home after saving settings 2014-08-04 17:13:24 -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
Yemel Jardi 9b1708b88e Save last opened wallet 2014-08-04 15:10:01 -03:00
Gustavo Maximiliano Cortez ee031849b2 Fixes: url handler 2014-08-04 11:27:46 -03:00
Yemel Jardi 3ab1510051 Android update 0.4.2 2014-08-04 09:49:22 -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 313e3e4fcd Merge pull request #998 from yemel/fix/browser-extensions 
Fix/browser extensions
 2014-08-01 11:54:41 -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
Gustavo Maximiliano Cortez 854196e72a Merge pull request #989 from yemel/feature/pre-created-address 
Add a pre-generated address to the shared branch
 2014-08-01 11:04:58 -03:00
Yemel Jardi ba504f147d Merge pull request #976 from cmgustavo/feature/01-timeout 
Automatically logout wallet after 15 minutes of inactivity
 2014-08-01 10:56:23 -03:00
Gustavo Maximiliano Cortez d2ae49f9a5 Fixes: typo 2014-08-01 10:51:26 -03:00
Gustavo Maximiliano Cortez fc71e6a441 Fixes: typo 2014-08-01 10:44:33 -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
Yemel Jardi 411bc1c85f Update chrome extension 2014-08-01 10:03:11 -03:00
Yemel Jardi fe20e2dabd Update firefox extension 2014-08-01 09:49:03 -03:00
Gustavo Maximiliano Cortez f9161ed8f2 Fix Conflicts: 
css/main.css
 2014-07-31 23:10:38 -03:00
Gustavo Maximiliano Cortez dbf812f848 Fix Karma test 2014-07-31 22:49:11 -03:00
Yemel Jardi 9c633f1918 Add icons for user actions at transaction proposal 2014-07-31 20:34:21 -03:00
Gustavo Maximiliano Cortez dc565e0a68 Integrating ZeroClipboard in Copay as directive 2014-07-31 16:34:21 -03:00
Yemel Jardi fdabdc64fe Add a pre-generated address to the shared branch 2014-07-31 16:13:27 -03:00
Yemel Jardi e5fd3c38f4 Fix open external in new tab and fix typo 2014-07-31 14:06:55 -03:00
Gustavo Maximiliano Cortez f704826a5c feature: Logout wallet after 15 minutes of inactivity 2014-07-30 20:12:22 -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
Yemel Jardi 71448828f2 Fix settings save function 2014-07-30 00:22:40 -03:00
Gustavo Maximiliano Cortez fc339f6472 Merge pull request #964 from matiu/feature/renameHD 
Feature/rename hd
 2014-07-29 15:57:48 -03:00
Yemel Jardi ba70a17b63 Fix uriHandler 2014-07-29 15:30:01 -03:00
Matias Alejo Garcia af2a12929a fix uriPayment 2014-07-29 14:30:08 -03:00
Yemel Jardi e3eeab0eb6 Change routes to old hastag mode 2014-07-29 14:13:21 -03:00
Matias Alejo Garcia ba31e6a628 renames inside HDParams 2014-07-29 14:11:11 -03:00
Matias Alejo Garcia 578d05e638 all tests BUT hardcoded imports working 2014-07-29 13:09:47 -03:00
Matias Alejo Garcia 0ee93403f3 change names to HD and fix HD* tests 2014-07-29 11:23:58 -03:00
Matias Alejo Garcia 1a40e29fd2 remove unrequired soop 2014-07-29 10:21:44 -03:00
Matias Alejo Garcia 19b9fcd0b1 change to camelCase 2014-07-29 10:14:43 -03:00
Matias Alejo Garcia 1d5238b2b8 change to camelCase 2014-07-29 10:14:15 -03:00
Gustavo Maximiliano Cortez 8974847f48 Removed old unused notifications. Fixes template url for new notifications 2014-07-28 15:41:12 -03:00
Gustavo Maximiliano Cortez 898e5a12ef Fixes: karma tests 2014-07-28 13:30:41 -03:00
Gustavo Maximiliano Cortez 85aa5842f1 Fix Conflicts: 
.gitignore
	index.html
	js/controllers/backup.js
	js/controllers/sidebar.js
 2014-07-28 12:28:07 -03:00
Manuel Aráoz 811dc6dd3b Merge pull request #952 from matiu/feature/txproposal01 
Feature/txproposal01
 2014-07-25 18:05:02 -03:00
Matias Alejo Garcia ceada149d7 fix tests 2014-07-25 17:48:35 -03:00
Matias Alejo Garcia 3aef6e156b add FORCED options to TxBuilder creation 2014-07-25 17:45:56 -03:00
Matias Alejo Garcia eea45d4413 reset note in form 2014-07-25 17:45:06 -03:00
Matias Alejo Garcia 560702df58 Merge pull request #936 from yemel/feature/android-cordova 
Android - Migration to Cordova + Crosswalk Framework
 2014-07-25 16:40:13 -03:00
Manuel Araoz e85431861e fix cases for incomplete transactions 2014-07-25 13:37:12 -03:00
Manuel Araoz 76e0d8f5ef add validation for actual tx SIGHASH_TYPE 2014-07-25 12:25:28 -03:00
Manuel Araoz b5c144d48c complete validation tests for txProposal SIGHASH 2014-07-25 12:25:27 -03:00
Manuel Aráoz d7650f30ff Merge pull request #929 from matiu/feature/bitcore01 
Updates model and tests to newest bitcore version
 2014-07-25 12:23:36 -03:00
Matias Alejo Garcia bb5ba1a209 rm log 2014-07-25 12:15:00 -03:00
Matias Alejo Garcia 2008db932b add buildermockv0 to show old / obsolete tx proposals 2014-07-25 11:59:13 -03:00
Yemel Jardi 19f57e614c Add native QR scanner to send form 2014-07-25 11:30:54 -03:00
Yemel Jardi e121d0acb6 Send email backup with file attached 2014-07-25 11:30:54 -03:00
Matias Alejo Garcia 7f11793b96 less strict import check for TXP v0 2014-07-25 11:13:48 -03:00
Matias Alejo Garcia ae08d5611a fix test / id name 2014-07-25 11:05:10 -03:00
Matias Alejo Garcia ab0aee7e89 Merge pull request #2 from maraoz/feature/bitcore01 
add failing test for mati to fix
 2014-07-25 10:53:46 -03:00
Manuel Araoz 235920bd84 add failing test for mati to fix 2014-07-25 10:50:18 -03:00
Matias Alejo Garcia 5eb8164df2 skip incompatible transaction proposals from backups 2014-07-25 10:39:41 -03:00
Matias Alejo Garcia c2dcd4f44b Merge pull request #919 from maraoz/feature/delete-wallet-intermediate 
Add delete wallet button at intermediate screen
 2014-07-25 08:01:24 -03:00
Matias Alejo Garcia 72d91ddd50 Merge pull request #922 from yemel/feature/show-empty-address 
Show addresses for other copayers
 2014-07-25 08:00:04 -03:00
Matias Alejo Garcia 46e8de6314 Merge pull request #904 from yemel/feature/better-password-formula 
Implement bitpay's password strength checker
 2014-07-25 07:55:05 -03:00
Matias Alejo Garcia b788c76d91 rm log 2014-07-25 07:53:29 -03:00
Matias Alejo Garcia 23ba3e6ebf updates version and use latest bitcore params 2014-07-25 07:53:02 -03:00
Matias Alejo Garcia 813c498d1f fix typo 2014-07-24 21:59:44 -03:00
Matias Alejo Garcia 2d481dd406 updates model and tests to newest bitcore version 2014-07-24 21:18:38 -03:00
Gustavo Maximiliano Cortez 031a65e0e4 fixes timeout notifications 2014-07-24 17:36:44 -03:00
Gustavo Maximiliano Cortez 4c190c1132 Fixes: notifications 2014-07-24 17:33:21 -03:00
Gustavo Maximiliano Cortez 2787a72b7a Waiting copayer as a controller 2014-07-24 15:31:07 -03:00
Gustavo Maximiliano Cortez 9875e9d643 Split signin.html in home, join and open files. Signin process with responsive support 2014-07-23 17:11:51 -03:00
Yemel Jardi cff8dcb41b Show addresses for other copayers 2014-07-22 16:13:11 -03:00
Gustavo Maximiliano Cortez c52b604771 Import and settings 2014-07-22 15:57:19 -03:00
Gustavo Maximiliano Cortez d7adc854c9 fixes modals qr-address. 2014-07-22 11:03:27 -03:00
Manuel Araoz e7847208f7 add confirmation message before deleting 2014-07-21 16:31:46 -03:00
Manuel Araoz 1d6e4b897f remove '...' from More tab name 2014-07-21 16:25:47 -03:00
Manuel Araoz 1e44ce2cc7 add delete option in intermediate screen 2014-07-21 16:24:41 -03:00
Yemel Jardi 5f27f1e7a6 Move address modal to a separate file, rename html files and reintroduce bitcoin protocol handler 2014-07-18 18:51:55 -03:00
Yemel Jardi 0c3709ceee Add copayer list at sidebar, separate snippet and clean video controller code 2014-07-18 18:38:43 -03:00
Gustavo Maximiliano Cortez b17bc2310d test for new angular directive: match password inputs 2014-07-18 18:18:05 -03:00
Gustavo Maximiliano Cortez b51e8b3539 password confirmation when joining and creating a wallet 2014-07-18 18:18:05 -03:00
Yemel Jardi 4f57c3f696 Highlight active section on sidebar 2014-07-18 15:23:01 -03:00
Yemel Jardi 0ffbd585f8 Add QR modal at address list and clean deprecated code 2014-07-18 11:24:29 -03:00
Yemel Jardi d484c5ab49 Replace iframe for window.open _blank 2014-07-17 22:35:24 -03:00
Yemel Jardi f1a2b357db Add system notification icon 2014-07-17 21:23:09 -03:00
Yemel Jardi aa4af0a0e9 Add email wallet backup using iframe 2014-07-17 16:53:38 -03:00
Yemel Jardi ddebfee8b1 Add vibration and system notifications 2014-07-17 16:52:32 -03:00
Gustavo Maximiliano Cortez f7e4390507 Split create new wallet page 2014-07-17 16:00:58 -03:00
Gustavo Maximiliano Cortez 0ffb8eb42f New schema for signin/join a wallet 2014-07-17 15:09:44 -03:00
Gustavo Maximiliano Cortez 91c7ab100d Fixes karma tests 2014-07-16 19:00:34 -03:00
Gustavo Maximiliano Cortez 0a027360a8 Split index.html in many files smaller. New right column when the wallet is ready. Removed templates selector. 2014-07-16 17:59:28 -03:00
Yemel Jardi c190729e81 Implemet bitpay password strength checker 2014-07-14 11:59:47 -03:00
Yemel Jardi abdb876a4b Remove automatic partial backup 2014-07-10 17:45:16 -03:00
Ryan X. Charles 643cad3a39 change encryption to work on hex strings 
..instead of binary, to work around an issue with bitcore/sjcl. I'm not sure
what the issue is exactly, except that encryption of binary data isn't working
correctly due to some kind of string stuff involving decodeURIComponent inside
sjcl. I haven't fully figured it out. For now I am changing the network
protocol to hex to workaround the issue.

See this: https://github.com/bitpay/bitcore/pull/416
 2014-07-09 01:13:42 -07:00
Ryan X. Charles 88ab38eb00 add nonce support to WebRTC and Wallet 
Each person keeps track of their own nonce, and the nonces of the other
copayers. The nonce is iterated for each message. If a person ever doesn't
iterate their nonce, that message is discarded by the copayers.

The nonces are saved as networkNonce (your nonce) and networkNonces (the nonces
of your copayers) in the wallet file.

In order to support restoring old wallets, the first four bytes of the 8 byte
nonce are actually the current time in seconds. Thus you can restore an old
wallet, because certainly at least one second has passed since your last
message. Only if you try to restore an old wallet within 1 second from the time
of your last message will you have a problem (or if your system clock is
grossly inaccurate).
 2014-07-08 23:03:30 -07:00
Ryan X. Charles a1155c2798 add support for 8 byte big endian nonce to Message 
...network protocol is backwards incompatible with previous network protocl.
also includes a second version number for backwards-compatible changes (the
original version number was for backwards-incompatible changes).
 2014-07-08 20:02:37 -07:00
Matias Alejo Garcia 27e27af7ab Merge pull request #872 from cmgustavo/bug/01-config-storage 
Fixes: save config in localStorage
 2014-07-08 21:00:03 -03:00
Gustavo Maximiliano Cortez d91c42ee30 Merge pull request #873 from matiu/feature/test01 
Feature/test01
 2014-07-08 20:13:23 -03:00
Matias Alejo Garcia 248c18596c more tests 2014-07-08 19:52:47 -03:00
Gustavo Maximiliano Cortez 5d5bf3dfc5 Merge pull request #849 from yemel/feature/backup-wallet 
Wallet Backups
 2014-07-08 19:17:43 -03:00
Matias Alejo Garcia fb2b6c40ba add tests to localencrypted 2014-07-08 19:11:48 -03:00
Gustavo Maximiliano Cortez 4d160a4ee7 Fixes: 
* Save config in localStorage
* Show forced networkName in settings Page
 2014-07-08 18:53:02 -03:00
Yemel Jardi 774f9e4def Fix importing partial backup 2014-07-08 16:47:00 -03:00
Gustavo Maximiliano Cortez 937369d0c7 Merge pull request #870 from matiu/bug/handlerNetErrors 
Bug/handler net errors
 2014-07-08 15:59:40 -03:00
Yemel Jardi cadd66812b Skip partial backup on 1-1 wallet 2014-07-08 15:54:10 -03:00
Yemel Jardi e6a9a443cc Update tests 2014-07-08 15:54:10 -03:00
Yemel Jardi c145290167 Add full backup stage with user feedback 2014-07-08 15:53:34 -03:00
Yemel Jardi 49ac6dfcf4 Hold on backup page until all copayers made a full backup 2014-07-08 15:53:34 -03:00
Yemel Jardi f9fad5d62f Add partial backup at create and join 2014-07-08 15:53:34 -03:00
Matias Alejo Garcia 137e9ca108 Merge pull request #868 from cmgustavo/bug/video-intermediate-page 
Fixed video while waiting for copayer
 2014-07-08 15:44:25 -03:00
Matias Alejo Garcia b0ff5494e0 Merge pull request #865 from maraoz/feature/force-testnet 
Feature: allow to force network from config
 2014-07-08 15:35:31 -03:00
Matias Alejo Garcia c0338a1f43 add .bind 2014-07-08 15:31:03 -03:00
Gustavo Maximiliano Cortez ad403309ce Fixed video while waiting for copayer 2014-07-08 15:26:20 -03:00
Matias Alejo Garcia bbac45ee7a fixes handling networking errors and retries. Adds tests 2014-07-08 15:25:12 -03:00
Matias Alejo Garcia 5d63741f35 Merge pull request #862 from yemel/fix/address-list 
Fix showing QR code on address list when it shouldn't
 2014-07-08 15:05:55 -03:00
Manuel Araoz 4d70f0cf24 add message for unchangeable network 2014-07-08 13:23:43 -03:00
Manuel Araoz 00cf32fc8d add forceNetwork parameter and test it 2014-07-08 12:34:49 -03:00
Yemel Jardi cef5b72557 Fix showing QR code on address list when it shouldn't 2014-07-08 12:23:10 -03:00
Matias Alejo Garcia 360ccd724d change settings tab name 2014-07-08 10:48:56 -03:00
Matias Alejo Garcia 141e8bddd3 fixes txproposal notifications 2014-07-08 08:58:24 -03:00
Gustavo Maximiliano Cortez 6ea9831913 Merge pull request #851 from matiu/bug/undefined3 
fix undefined bugs
 2014-07-07 20:44:59 -03:00
Gustavo Maximiliano Cortez 6e442cd902 Merge pull request #847 from matiu/bug/handleInsightErrors 
handle empty Insight responses
 2014-07-07 20:26:12 -03:00
Gustavo Cortez 14cea0362f Fixes and re-factory 2014-07-07 20:01:50 -03:00
Matias Alejo Garcia d099db6cde fix undefined bugs 2014-07-07 19:39:44 -03:00
Matias Alejo Garcia 1cb10219e9 more handles 2014-07-07 18:46:12 -03:00
Gustavo Cortez a1e5246727 updated 2014-07-07 18:13:26 -03:00
Matias Alejo Garcia d192cc5270 handle empty Insight responsed 2014-07-07 18:12:58 -03:00
Gustavo Maximiliano Cortez 4f57fe2368 Merge pull request #844 from matiu/bug/settings10 
fix save in Firefox
 2014-07-07 18:11:55 -03:00
Matias Alejo Garcia 7e6827351f rm log 2014-07-07 18:06:30 -03:00
Gustavo Maximiliano Cortez bc4a1ca3ee Merge pull request #843 from matiu/feature/intermediate-screen 
Feature/intermediate screen
 2014-07-07 17:54:52 -03:00
Gustavo Maximiliano Cortez 48fb8ed2c4 Merge pull request #842 from matiu/bug/workaround-urihandler 
workaround bug of urihandler in firefox
 2014-07-07 17:46:48 -03:00
Gustavo Cortez 0931024e23 Fixes: verify addressbook method 2014-07-07 17:38:17 -03:00
Matias Alejo Garcia 93bbc68f5f fix save in Firefox 2014-07-07 17:30:42 -03:00
Matias Alejo Garcia e180e53e73 add SIN and video 2014-07-07 17:00:26 -03:00
Matias Alejo Garcia 164d0c198a workaround bug of urihandler in firefox 2014-07-07 16:57:57 -03:00
Alan Stoll 996f6f0150 we still need node integration, so fix moment loader another way 2014-07-07 15:53:42 -04:00
Matias Alejo Garcia 2626414771 Merge pull request #830 from yemel/fix/peer-id-taken 
Derive token from cid, bring back the custom version of peerjs
 2014-07-07 15:55:46 -03:00
Matias Alejo Garcia f497d76405 Merge pull request #816 from yemel/feature/bipNNN-refactor 
Feature/bip nnn refactor
 2014-07-07 15:55:13 -03:00
Gustavo Cortez ac2eda3670 Fixes typos and re-factory throw errors 2014-07-07 14:53:34 -03:00
Manuel Araoz 490f0b4536 remove duplicate error 2014-07-07 14:18:11 -03:00
Yemel Jardi d0693442ce Remove magic number fixes #736 2014-07-07 12:27:05 -03:00
Yemel Jardi e22eed8610 Fix double wallet store on open/create/join 2014-07-07 12:17:36 -03:00
Yemel Jardi f8ea3a4090 Derive token from cid, bring back the custom version of peerjs 2014-07-07 11:29:28 -03:00
Gustavo Cortez 7cdf559fd7 Fixes typos: Matias's suggestions. Added more tests 2014-07-07 10:58:43 -03:00
Matias Alejo Garcia a7e7d258ee Merge pull request #823 from bechi/feature/import 
fix import layout
 2014-07-07 10:37:44 -03:00
Bechi 4effa511d4 fix import layout 2014-07-07 10:34:53 -03:00
Matias Alejo Garcia 44ef1c4710 Merge pull request #818 from maraoz/bug/addresses-check-network 
check network for addresses

* Chrome 35.0.1916 (Mac OS X 10.9.3): Executed 76 of 76 SUCCESS (0.806 secs / 0.239 secs)
* mocha:   170 passing (8s)
* browser: 100%: 128.16s


Code: OK (I am starting to like preconditions 👍 )
 2014-07-07 09:45:23 -03:00
Matias Alejo Garcia 72e2960202 Merge pull request #643 from gordonwritescode/bug/join-copy-shell 
I manually teste the copy& paste and it works. Since this is a minor PR (couple of lines) I am merging it.
 2014-07-07 09:37:37 -03:00
Gustavo Cortez 2ad4aee2d6 Show only entry I want. Hidden anywhere. 2014-07-07 02:21:29 -03:00
Gustavo Cortez c83e0c73da Delete entry with a wrong signature 2014-07-07 01:57:25 -03:00
Gustavo Cortez 313fcd4808 Added creator's signature to address book entry. Re-factory somethings and improve the merge of them 2014-07-07 01:33:39 -03:00
Manuel Aráoz 0f28f607d8 Merge pull request #813 from matiu/feature/minor-ux-changes 
add testnet in footer / add links
 2014-07-04 14:25:25 -03:00
Manuel Araoz a30b8d81bb fix tests 2014-07-04 12:51:27 -03:00
Manuel Araoz 90ebd8deb5 add check to core, not only UI 2014-07-04 11:40:07 -03:00