Commit Graph

955 Commits

Author SHA1 Message Date
Ivan Socolsky c7691400c2 improve error check 2015-06-29 10:32:12 -03:00
Matias Alejo Garcia 4552d3e524 Merge pull request #264 from isocolsky/ref/preferences
Incremental preferences
2015-06-29 09:38:14 -03:00
Ivan Socolsky fb0dcee054 combine new preferences with stored preferences 2015-06-29 09:11:03 -03:00
Matias Alejo Garcia 415d759fd0 Merge pull request #263 from isocolsky/client_version
Store client version
2015-06-29 09:09:08 -03:00
Ivan Socolsky 116bea1aa5 ignore unrecognized preferences 2015-06-29 08:57:53 -03:00
Ivan Socolsky a00b8c3592 test incremental save 2015-06-29 08:50:00 -03:00
Ivan Socolsky efcabce315 store client version on every request 2015-06-29 08:41:59 -03:00
Ivan Socolsky 4139cb0ae7 test client version stored 2015-06-29 08:40:39 -03:00
Matias Alejo Garcia 1ab1871313 Merge pull request #261 from isocolsky/ref/emails
Ref/emails
2015-06-27 21:13:16 -03:00
Ivan Socolsky 3801165ec7 Merge pull request #3 from Kirvx/ref/emails
Add French to email templates
2015-06-27 20:31:09 -03:00
Kirvx d3404a0dda Add French to email templates 2015-06-28 00:54:50 +02:00
Ivan Socolsky 21afe19cc4 Merge pull request #2 from dabura667/ref/emails
Add Japanese to email templates
2015-06-26 22:39:57 -03:00
dabura667 1be10e2384 Add Japanese to email templates 2015-06-27 10:11:51 +09:00
Ivan Socolsky 15b0f45635 optional html body 2015-06-26 17:39:47 -03:00
Ivan Socolsky 2d5fdaca1b include unit when rendering template 2015-06-26 16:10:29 -03:00
Ivan Socolsky 044f511726 select template based on language 2015-06-26 16:10:29 -03:00
Ivan Socolsky 6609814840 test email preferences 2015-06-26 16:10:29 -03:00
Ivan Socolsky 1460bf2128 add language & unit to preferences
Signed-off-by: Ivan Socolsky <jungans@gmail.com>
2015-06-26 16:10:29 -03:00
Matias Alejo Garcia a9d1a3c06a Merge pull request #260 from isocolsky/ref/proposal_signature
Ref/proposal signature
2015-06-25 15:39:05 -03:00
Ivan Socolsky 539da089ef v0.0.37 2015-06-25 12:56:14 -03:00
Ivan Socolsky 7139847709 remove TxProposal#getHeader 2015-06-25 12:53:53 -03:00
Ivan Socolsky 48e0709607 simplify validations on createTx 2015-06-25 11:43:47 -03:00
Ivan Socolsky 3851428a57 bwu v0.0.19 2015-06-25 11:03:19 -03:00
Ivan Socolsky dee4a83ded refactor proposal hash 2015-06-25 11:03:11 -03:00
Ivan Socolsky e6fc53f4b2 Merge pull request #256 from greggzigler/feat/multOutputs
Feat/mult outputs
2015-06-23 19:29:04 -03:00
Gregg Zigler f324fd80cd replace missing and unsupported flags with output.valid, similar to each loops below 2015-06-23 17:11:14 -04:00
Gregg Zigler e9a90f5560 un-skip test suite 2015-06-23 16:33:24 -04:00
Gregg Zigler c923d802dc apply fix for fake timers 2015-06-23 16:32:21 -04:00
Ivan Socolsky 0ef770e1f0 Merge pull request #259 from isocolsky/fix/fake_timers
Fix fake timers
2015-06-23 17:26:40 -03:00
Ivan Socolsky a021636b0f override only the Date function 2015-06-23 17:22:14 -03:00
Gregg Zigler c1558bb1b0 change xit back to it in tests, but add skip to backoff-tiime suite 2015-06-23 11:38:36 -04:00
Gregg Zigler 3a9fce12bf debug travis issue 2015-06-22 17:20:52 -04:00
Gregg Zigler fb34eaf75b debug Travis issue 2015-06-22 16:15:24 -04:00
Gregg Zigler a04962cdb7 debug travis issue 2015-06-22 15:45:19 -04:00
Gregg Zigler c64790f014 lodash each needs return-false to break out of loop, travis timeout debug 2015-06-22 15:02:28 -04:00
Gregg Zigler fa2170a5f3 avoid badFoo flags, avoid _.each() bug, use for-loop to check each output 2015-06-22 14:00:33 -04:00
Gregg Zigler 40dc1c095b Merge remote-tracking branch 'upstream/master' into feat/multOutputs
Conflicts:
	test/integration/server.js
2015-06-19 12:24:04 -07:00
Gregg Zigler 0a4bf8f77f proposal header hash and proposal amount should work with multi-output 2015-06-19 09:30:46 -07:00
Matias Alejo Garcia b68d188135 Merge pull request #255 from isocolsky/send_max
Send max
2015-06-18 15:36:48 -03:00
Gregg Zigler ab33debdd1 move types to single object, remove default type assignment from proposal 2015-06-18 10:32:56 -07:00
Gregg Zigler 07a381bdb3 Merge remote-tracking branch 'upstream/master' into feat/multOutputs 2015-06-18 09:55:15 -07:00
Ivan Socolsky 999bcbbe7d refactor code 2015-06-18 13:39:16 -03:00
Ivan Socolsky 621fe1777a v0.0.36 2015-06-18 13:20:50 -03:00
Ivan Socolsky 931923f585 compute kbs needed to send max in getBalance 2015-06-18 13:20:19 -03:00
Ivan Socolsky edfc50fca1 test resulting kb to send max 2015-06-18 13:19:27 -03:00
Matias Alejo Garcia 30eee4baf7 Merge pull request #254 from isocolsky/bump_bitcore
bitcore 0.12.9, bwu 0.0.16
2015-06-18 12:01:17 -03:00
Ivan Socolsky 7b30687115 bitcore 0.12.9, bwu 0.0.16 2015-06-18 11:59:03 -03:00
Gregg Zigler 10644f7edc handle unknown proposal types 2015-06-18 07:57:07 -07:00
Matias Alejo Garcia d3b1299b25 Merge pull request #253 from getplank/master
Wrapper shell scripts for starting and stopping services
2015-06-17 18:15:52 -03:00
Gregg Zigler 453a7187b5 separate common properties from those that vary by proposal type 2015-06-17 13:33:43 -07:00