Commit Graph

1476 Commits

Author SHA1 Message Date
Manuel Aráoz b3f2476992 Merge pull request #859 from matiu/feature/wording
change settings tab name
2014-07-08 12:10:04 -03:00
Matias Alejo Garcia 50a29909ba remove test 2014-07-08 12:02:20 -03:00
Matias Alejo Garcia ef8116d74b Update README.md 2014-07-08 11:17:38 -03:00
Matias Alejo Garcia d190aedf2b Update README.md 2014-07-08 11:15:01 -03:00
Matias Alejo Garcia ddfb7a0251 Update README.md 2014-07-08 11:04:04 -03:00
Matias Alejo Garcia 360ccd724d change settings tab name 2014-07-08 10:48:56 -03:00
Manuel Aráoz 89c3de7c71 Merge pull request #858 from matiu/bug/txproposals01
fixes txproposal notifications
2014-07-08 10:48:12 -03:00
Matias Alejo Garcia 9bd770dc89 Update TODO.md 2014-07-08 10:27:57 -03:00
Matias Alejo Garcia 01fccc776a Update README.md 2014-07-08 10:27:53 -03:00
Matias Alejo Garcia 627323dfbb Update TODO.md 2014-07-08 10:26:33 -03:00
Matias Alejo Garcia a2b736d49b remove native shell to todo. 2014-07-08 10:21:04 -03:00
Matias Alejo Garcia f79b1368e2 created TODO.md 2014-07-08 10:18:53 -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
Matias Alejo Garcia 495647d2ac Merge pull request #820 from cmgustavo/feature/02-addressbook
Creator's signature for addressbook entry
2014-07-07 20:25:45 -03:00
Gustavo Cortez b25a781add . 2014-07-07 20:25:25 -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 b9b09d5f11 add stub to _request 2014-07-07 19:33:59 -03:00
Matias Alejo Garcia e01b5039dc Merge pull request #850 from bechi/feature/intermediate-screen
fix intermediate screen, waiting copayers
2014-07-07 19:32:19 -03:00
Bechi 37c7c2271d fix intermediate screen, waiting copayers 2014-07-07 19:22:02 -03:00
Gustavo Cortez c00deb25f9 Fix tests 2014-07-07 19:12:34 -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
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