Commit Graph

1452 Commits

Author SHA1 Message Date
Gustavo Cortez c00deb25f9 Fix tests 2014-07-07 19:12:34 -03:00
Gustavo Cortez a1e5246727 updated 2014-07-07 18:13:26 -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
Matias Alejo Garcia 3b18e7e2ba Merge pull request #841 from bitpayalan/fix-moment-loader
Alternate Strategy to Fix MomentJS Loading as Node Module When we want it as Global
2014-07-07 17:38:37 -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 d4c9c87076 Merge pull request #838 from yemel/fix/peer-id-taken-2
Add peer.js file
2014-07-07 16:04:16 -03:00
Yemel Jardi 3522c3067d Add peer.js file 2014-07-07 16:02:04 -03: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
Matias Alejo Garcia c338b3ac88 Merge pull request #836 from ryanxcharles/bug/scriptForAddress
fix mocha node tests / update to bitcore v0.1.25
2014-07-07 15:06:23 -03:00
Gustavo Cortez ac2eda3670 Fixes typos and re-factory throw errors 2014-07-07 14:53:34 -03:00
Matias Alejo Garcia bef6b73207 Merge pull request #835 from maraoz/bug/double-errors
remove duplicate error
2014-07-07 14:48:26 -03:00
Ryan X. Charles b775220209 update to bitcore v0.1.25
...to fix an error where the scriptForAddress function no longer exists.
2014-07-07 10:35:06 -07:00
Manuel Araoz 490f0b4536 remove duplicate error 2014-07-07 14:18:11 -03:00
Matias Alejo Garcia 504d4da0c6 Merge pull request #834 from bitpayalan/master
Disable node-integration in atom-shell browser environment
2014-07-07 13:36:51 -03:00
Manuel Aráoz bd5d8d5168 Merge pull request #832 from yemel/fix/double-store
Fix double wallet store on open/create/join
2014-07-07 13:30:03 -03:00
Alan Stoll 9b88ba67d0 disable node integration in the browser window because it screws stuff up 2014-07-07 12:05:58 -04: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 Maximiliano Cortez 556f1d4750 Merge pull request #827 from matiu/shell/interop
Shell/interop
2014-07-07 11:20:52 -03:00
Matias Alejo Garcia 4e2414d78b fix stdout 2014-07-07 11:08:50 -03:00
Matias Alejo Garcia be8635abbf fixes #826 2014-07-07 11:01:52 -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
Yemel Jardi 13cf5e4216 change import to fix index.html tests 2014-07-07 10:32:19 -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
Matias Alejo Garcia 63f6b9f751 Merge pull request #814 from bitpayalan/native-build
Copay Native Binaries Build
2014-07-07 09:21:35 -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
Manuel Araoz 1714e8dffa add network check to address 2014-07-04 11:24:11 -03:00
Yemel Jardi 7562c3f9e7 Add some test and refactor getCosigner 2014-07-04 09:45:02 -03:00
Matias Alejo Garcia a579e35437 Merge pull request #817 from bechi/bugs/layout-sendPage
fix columns layout
2014-07-03 18:03:15 -03:00
Bechi 16f520811b fix columns layout 2014-07-03 17:44:00 -03:00
Yemel Jardi 680b0b553e bump version 2014-07-03 16:57:59 -03:00
Yemel Jardi 2abc35ae57 Add update indexes and support old indexes schema 2014-07-03 16:42:29 -03:00
Yemel Jardi fd2cf54eb4 Hide empty addresses from othe copayers 2014-07-03 16:42:29 -03:00