Commit Graph

286 Commits

Author SHA1 Message Date
Richard Ramos 05aa20650b Merged changes on ProposalCuration from 000-tcr 2018-06-21 13:58:05 -04:00
Richard Ramos b50e5bf59e Merged with changes on ProposalManager from 000-tcr 2018-06-21 13:48:19 -04:00
Richard Ramos 01afa35a39 Displaying buttons depending on proposal state 2018-06-03 12:08:53 -04:00
Richard Ramos c6f7e54cac SNT minting 2018-06-01 15:17:32 -04:00
Ricardo Guilherme Schmidt ad7afe0597 remove versions from contract.json 2018-05-31 19:59:07 -03:00
Richard Ramos 0356daef09
Merge pull request #7 from status-im/snt-voting-form-handling
Snt voting form handling
2018-05-31 12:57:40 -08:00
Barry Gitarts 7a394c396e add token permissions to proposal manager 2018-05-31 16:50:05 -04:00
Barry Gitarts a2ee8a12cb add button action to setPrice 2018-05-31 15:29:50 -04:00
Barry Gitarts 69a952d94a add handleSubmit and FieldGroups 2018-05-31 13:29:42 -04:00
Barry Gitarts 9e010a79c2 add initial form scafold for proposal manager 2018-05-31 09:53:26 -04:00
Barry Gitarts eec4518aa3 bump solc to 0.4.24 2018-05-30 15:55:41 -04:00
Richard Ramos 2f2a3fee27 Added voting 2018-05-30 10:32:38 -04:00
Richard Ramos 08d5665245 Loading proposals, and reorganized code 2018-05-29 20:29:40 -04:00
Richard Ramos 6128390bca Proposals are able to be created using SNT 2018-05-29 16:51:59 -04:00
Richard Ramos 226ae6d768 Extracting data from IPFS 2018-05-29 11:00:21 -04:00
Richard Ramos 9d82dbae7f Adding form for proposals 2018-05-24 10:27:28 -04:00
Richard Ramos 3476f96171 Merged 172 changes, and set contracts.json to deploy required contracts 2018-05-24 08:11:33 -04:00
Richard Ramos 20c120237b Simple Paginator 2018-05-22 14:03:28 -04:00
Ricardo Guilherme Schmidt c278b11a4e partial port to embark 2018-05-22 13:01:41 -03:00
Ricardo Guilherme Schmidt b4e83ec6f1 move storage to concrete 2018-05-22 13:01:24 -03:00
Richard Ramos e4c750b1b9 Changed topic to description 2018-05-22 11:39:23 -04:00
Richard Ramos ea171fb030 Adding content to proposals 2018-05-22 11:11:53 -04:00
Richard Ramos 5f8377f23f Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-05-22 09:49:51 -04:00
Richard Ramos 344efdd06e Obtaining SNT balance 2018-05-22 09:49:22 -04:00
Ricardo Guilherme Schmidt aa93e03035 refactor 2018-05-22 07:46:29 -03:00
Ricardo Guilherme Schmidt f021b36058 merge 000-instance-factory 2018-05-22 07:44:49 -03:00
Barry Gitarts de974ec9d2 add proposal manager 2018-05-21 17:44:06 -04:00
Barry Gitarts 39234c5d92 Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-05-21 17:42:34 -04:00
Barry Gitarts a60f36a9e2 add proposal manager 2018-05-21 17:42:23 -04:00
Richard Ramos 55f1e283a1 Moved files 2018-05-21 16:16:29 -04:00
Richard Ramos 3e44fa9b28 Adding ProposalContainer component and changed module.exports to export default 2018-05-21 16:15:46 -04:00
Richard Ramos c905809558 Creating dummy components for the voting dapp 2018-05-21 15:45:57 -04:00
Barry Gitarts 2f5656f2ed Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-05-21 14:30:46 -04:00
Barry Gitarts 46a063bab5 small cleanup 2018-05-21 14:29:57 -04:00
Richard Ramos a73dd44783 Updated contracts.json to not deploy anything initially 2018-05-21 14:14:47 -04:00
Ricardo Guilherme Schmidt ea0ea87ba1 Merge branch 'minimetoken' into 172-topic-democracy 2018-05-21 14:46:36 -03:00
Ricardo Guilherme Schmidt bea6deb15e improve tests 2018-05-20 20:52:26 -03:00
Ricardo Guilherme Schmidt c76a499b31 Merge branch 'bootstrap' into minimetoken 2018-05-19 23:36:46 -03:00
Ricardo Guilherme Schmidt 9f97714ba5 add test to controlled, use "Contract" as generic name 2018-05-19 23:36:34 -03:00
Ricardo Guilherme Schmidt b68fc98b71 add test for Controlled 2018-05-19 23:36:12 -03:00
Ricardo Guilherme Schmidt 6c5e6ce311 Merge branch 'bootstrap' into minimetoken 2018-05-19 22:38:45 -03:00
Ricardo Guilherme Schmidt 1582881629 improve abstract erc20token test 2018-05-19 22:37:58 -03:00
Ricardo Guilherme Schmidt 469a16cab1 start testscript for minimetoken 2018-05-19 22:37:40 -03:00
Ricardo Guilherme Schmidt e6694854e4 Merge branch 'bootstrap' into minimetoken 2018-05-19 17:00:33 -03:00
Ricardo Guilherme Schmidt e63ae2af6e make erc20token test abstract 2018-05-19 17:00:16 -03:00
Ricardo Guilherme Schmidt 3a31893538 require tokenfactory in mmt constructor, fixes in interfaces, bump solcv 2018-05-19 16:53:46 -03:00
Ricardo Guilherme Schmidt cfb26fc1c3 Merge branch 'bootstrap' into minimetoken 2018-05-19 16:17:29 -03:00
Ricardo Guilherme Schmidt 204892e3ce add placement of dropdown, balances, addresses are accounts 2018-05-19 03:09:13 -03:00
Ricardo Guilherme Schmidt 70b7d13ffc add account list 2018-05-18 16:17:46 -03:00
Ricardo Guilherme Schmidt 082c1d19b7 add topbar 2018-05-17 16:53:23 -03:00