84 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jordi Baylina	b4b79671ce	Merge pull request #21 from Giveth/campaign_to_project ... refactor campaign -> project	2017-10-06 11:05:25 +02:00
perissology	e0f19d8461	refactor campaign -> project	2017-10-04 16:39:18 -07:00
Jordi Baylina	5fd25487b5	Do not allow transfers to a canceled campaign	2017-10-04 14:30:09 +02:00
Jordi Baylina	bd5c29cf2f	State to Status refactor	2017-10-04 13:02:19 +02:00
Jordi Baylina	2af64a9e60	find to findOrCreate name refactor	2017-10-04 12:55:46 +02:00
Jordi Baylina	b4d5e5657c	url added	2017-10-04 11:40:26 +02:00
Jordi Baylina	52e439318c	proposed to intended refactor	2017-10-04 10:33:33 +02:00
Jordi Baylina	aaa3be9305	NotPaid to Pledged refactor	2017-10-04 10:29:41 +02:00
Jordi Baylina	41154e89d2	Manager to Admin refactor	2017-10-04 10:24:35 +02:00
Jordi Baylina	e409e04a85	Push lock file	2017-10-04 10:10:09 +02:00
Jordi Baylina	0de789ef30	Merge pull request #2 from perissology/master ... update to use web3 1.0	2017-10-04 10:01:36 +02:00
perissology	5f3a73b5c1	inline starting testrpc	2017-10-03 06:19:28 -07:00
perissology	bc415f002e	Merge branch 'master' of github.com-perissology:Giveth/liquidpledging	2017-10-03 06:15:05 -07:00
perissology	96d5adc164	update tests to web3 1.0 syntax	2017-10-03 06:06:58 -07:00
Jordi Baylina	28ecaff0ce	note to pledge refactor	2017-10-03 14:42:21 +02:00
Jordi Baylina	bae30084f0	project to campaign refactor	2017-10-03 13:37:45 +02:00
perissology	5260b768f8	Merge branch 'master' of github.com-perissology:Giveth/liquidpledging	2017-10-03 04:17:33 -07:00
Jordi Baylina	e305229311	Donor to Giver refactor	2017-10-03 12:20:23 +02:00
Jordi Baylina	75bb05769b	Fix the last test	2017-10-03 12:08:47 +02:00
Jordi Baylina	3e945ff349	Merge branch 'master' of github.com:Giveth/liquidpledging	2017-10-03 11:51:26 +02:00
Jordi Baylina	c190d5fb0f	Merge pull request #1 from perissology/add_donor_on_donate ... call addDonor in donate method if donorId is 0	2017-10-03 11:51:17 +02:00
Jordi Baylina	7b34866559	Merge branch 'master' into add_donor_on_donate	2017-10-03 11:36:14 +02:00
Jordi Baylina	4a76d51f82	Merge pull request #7 from Giveth/GriffGreen-patch-4 ... Added comments and other small changes	2017-10-03 11:33:51 +02:00
Jordi Baylina	2c73ec5941	Merge branch 'master' of github.com:Giveth/liquidpledging	2017-10-03 11:06:51 +02:00
Jordi Baylina	4bd6726b2a	Merge branch 'master' into GriffGreen-patch-4	2017-10-03 10:57:54 +02:00
Jordi Baylina	104b857736	Merge pull request #6 from Giveth/GriffGreen-patch-3 ... Added comments and a few other small things	2017-10-03 10:56:09 +02:00
Jordi Baylina	b5c0686ff4	Merge pull request #3 from Giveth/GriffGreen-patch-1 ... added comments	2017-10-03 10:55:43 +02:00
Jordi Baylina	4b4d614495	Merge pull request #5 from Giveth/GriffGreen-patch-2 ... Added comments and asserted 80 char per line	2017-10-03 10:54:48 +02:00
Jordi Baylina	8a106f054f	Merge pull request #4 from perissology/plugin ... return plugin in getNoteManager	2017-10-03 10:53:53 +02:00
Jordi Baylina	942a5d55ab	Merge branch 'master' of github.com:Giveth/liquidpledging	2017-10-03 09:53:06 +02:00
Jordi Baylina	b93ae8454f	Cancel Project Event	2017-10-03 09:52:56 +02:00
perissology	336f25a3bb	leave response values as strings in getState call	2017-10-02 13:21:42 -07:00
perissology	adda020c71	fix typo	2017-09-30 12:04:14 -07:00
Griff Green	a4793fb44d	made acceptOwnership() throw when not newOwner	2017-09-29 15:09:05 +02:00
Griff Green	9cc092d2cd	edited comments	2017-09-29 12:21:21 +02:00
Griff Green	c051497bbc	Merge pull request #8 from Giveth/GriffGreen-patch-5 ... Very small change in comments	2017-09-29 12:18:42 +02:00
Griff Green	3ffdbceefa	Very	2017-09-29 12:18:07 +02:00
Griff Green	be4741aa38	Added comments and other small changes	2017-09-29 12:16:53 +02:00
Griff Green	885678c078	Added comments and a few other small things	2017-09-29 12:11:13 +02:00
Griff Green	da9a276647	Added comments and asserted 80 char per line	2017-09-29 11:06:11 +02:00
perissology	633d185989	fix addDonor call after merge	2017-09-28 12:03:36 -07:00
perissology	cea412426d	Merge remote-tracking branch 'upstream/master' into add_donor_on_donate	2017-09-28 08:50:57 -07:00
perissology	f01d174a56	create donor on donate if donorId == 0	2017-09-28 08:49:10 -07:00
perissology	e68546451e	explict type conversion for Plugin	2017-09-26 12:26:26 -07:00
perissology	aca20feb53	return plugin in getNoteManager	2017-09-26 12:07:36 -07:00
perissology	43517ca146	add plugin to noteManager state	2017-09-26 11:59:57 -07:00
perissology	5082e0dad1	update eth-contract-class dep	2017-09-26 11:50:57 -07:00
Griff Green	5ccf92d502	Update Owned.sol	2017-09-26 10:58:31 +02:00
Griff Green	f781649355	added comments	2017-09-26 10:57:09 +02:00
perissology	79a6a6641b	fix bug with generateClass import	2017-09-22 11:31:42 -07:00