Commit Graph

175 Commits

Author SHA1 Message Date
Richard Ramos 8abcd28835 Added validation when adding polls 2018-06-27 15:00:50 -04:00
Richard Ramos 28521fb1a5 Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-27 14:45:00 -04:00
Richard Ramos 5e9a0da95c Added gas estimation 2018-06-27 14:44:37 -04:00
Barry Gitarts e99d9b5560 add vote button and slider 2018-06-27 14:40:45 -04:00
Barry Gitarts 70e5c77d91 Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-27 13:55:25 -04:00
Barry Gitarts 2cc4478553 add get voting option
store proposals in indexed order
2018-06-27 13:54:36 -04:00
Richard Ramos b96ecd5a20 Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-27 13:27:27 -04:00
Richard Ramos 79d0763a7d Added custom vote option 2018-06-27 13:27:01 -04:00
Barry Gitarts 56297fb988 add pollsList 2018-06-27 13:23:14 -04:00
Richard Ramos 09d85cb00c Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-27 10:39:51 -04:00
Barry Gitarts 840295bb27 add rawPolls to top level state 2018-06-27 10:27:16 -04:00
Richard Ramos 27d0162b32 Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-27 09:36:09 -04:00
Barry Gitarts 0ab1b422ba increase font size of text field 2018-06-27 08:52:41 -04:00
Barry Gitarts 0d75175db3 add rlp encoding for new proposal 2018-06-26 17:40:27 -04:00
Barry Gitarts 0f0c7261c4 fixup! fixup! Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-26 17:19:26 -04:00
Barry Gitarts 9e227df03d fixup! Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-26 17:15:20 -04:00
Richard Ramos df786d1536 Removing start block 2018-06-26 17:15:20 -04:00
Barry Gitarts a3807a8478 add addPoll method to handlesubmit 2018-06-26 17:05:58 -04:00
Richard Ramos 818b67d19f Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-26 17:02:26 -04:00
Richard Ramos 58be366bd9 Removing start block 2018-06-26 17:02:04 -04:00
Barry Gitarts 00957320b1 Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-26 16:35:12 -04:00
Barry Gitarts 1bf51552d7 add AddPoll component 2018-06-26 16:34:52 -04:00
Richard Ramos f7985fb57c Added quadratic voting 2018-06-26 16:34:28 -04:00
Richard Ramos 2979fbcc2e Changed constructor 2018-06-26 15:41:28 -04:00
Richard Ramos 9eb347e32c Linting and removing warnings 2018-06-26 14:44:45 -04:00
Richard Ramos 6e6247593c Merging changes 2018-06-26 13:35:05 -04:00
Richard Ramos 3759522633 Created test case to demonstrate how to use contracts 2018-06-26 13:34:24 -04:00
Barry Gitarts 7f007935f2 add initial scalfold for voting dapp
seperate admin view from main view
2018-06-26 12:46:06 -04:00
Richard Ramos a712cece85 Poll contracts 2018-06-26 10:19:04 -04:00
Richard Ramos 66b6fbf966 Wrong variable name 2018-06-26 08:22:44 -04:00
Richard Ramos 98dcb1f803 Adding topic, to, value and data 2018-06-25 17:06:19 -04:00
Richard Ramos 9f122d36ff Tabulation and determining final result 2018-06-25 14:35:16 -04:00
Richard Ramos 93d96c07da Last tabulation condition was incorrect 2018-06-25 10:25:15 -04:00
Richard Ramos e160a028cf Voting form did not display during pagination 2018-06-25 10:19:10 -04:00
Richard Ramos 723b5a2cac Set dapp back to working state 2018-06-25 09:43:08 -04:00
Richard Ramos da4306b5e1 Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp 2018-06-22 16:26:47 -04:00
Richard Ramos 9a0284aa9a Adding poll manager 2018-06-22 16:26:24 -04:00
Ricardo Guilherme Schmidt f4efa8a607
add taulation block delay setter and default value of 7 days 2018-06-22 16:40:20 -03:00
Richard Ramos 8cec6507eb Updating proposal manager with changes from 000-tcr 2018-06-21 15:46:58 -04:00
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