Commit Graph

408 Commits

Author SHA1 Message Date
Vadim Arasev 058fbb67c1 Merge branch 'core' into issue-156 2018-10-03 15:14:01 +03:00
Vadim Arasev 34cc4cdaef
Merge branch 'core' into issue-156 2018-10-02 16:42:52 +03:00
Vadim Arasev dc1a567b5f
Merge pull request #176 from varasev/dai-netid
(Feature) Add poa-chain-spec branch name and netId for DAI shard
2018-10-02 16:38:25 +03:00
Vadim Arasev 36aa96fbfb (Fix) Add `isTestnet` function to helpers.js 2018-10-02 14:21:56 +03:00
Vadim Arasev 27404d1b9c (Fix) Add `isTestnet` function to helpers.js 2018-10-02 14:21:40 +03:00
Vadim Arasev d1374a1356 Show alert on clicking `New Ballot` button if MetaMask is locked 2018-10-02 14:11:10 +03:00
Vadim Arasev 9c2b6d2b58 (Update) Add netId and branch name for DAI shard 2018-10-02 14:10:58 +03:00
Vadim Arasev c28d307916 Show alert on clicking `New Ballot` button if MetaMask is locked 2018-10-02 14:07:57 +03:00
Vadim Arasev 81d23b9f6d (Update) Add netId and branch name for DAI shard 2018-10-01 13:29:06 +03:00
Vadim Arasev e5eda2fa02 (Update) Add netId and branch name for DAI shard 2018-10-01 13:27:49 +03:00
Vadim Arasev 8206c7b4b6
Merge pull request #175 from varasev/balance-auto-fetch
(Feature) Auto fetching of EmissionFunds balance every 5 seconds
2018-09-22 11:03:01 +03:00
Vadim Arasev 848b7a7f11 (Feature) Auto fetching of EmissionFunds balance every 5 seconds 2018-09-21 20:34:44 +03:00
Vadim Arasev 031736888c (Feature) Auto fetching of EmissionFunds balance every 5 seconds 2018-09-21 20:34:12 +03:00
Vadim Arasev 28f27d7c9c
Merge pull request #174 from varasev/time-text-labels
(Fix) Add some text labels for clear displaying of time
2018-09-21 11:27:26 +03:00
Vadim Arasev fae9ae585a (Update) Add some text labels for clear displaying of time 2018-09-21 10:51:57 +03:00
Vadim Arasev 5224f4426c (Update) Add some text labels for clear displaying of time 2018-09-21 10:51:23 +03:00
Vadim Arasev 5fdf932a05
Merge pull request #173 from varasev/issue-130
(Feature) Votings to Manage Emission Funds
2018-09-20 13:28:47 +03:00
Vadim Arasev 283a66ce06 (Fix) Use sokol.poaexplorer.com instead of sokol-explorer.poa.network 2018-09-20 13:24:05 +03:00
Vadim Arasev bfcb3fd558 (Fix) Use sokol.poaexplorer.com instead of sokol-explorer.poa.network 2018-09-20 13:23:49 +03:00
Vadim Arasev b8c71be7fe (Fix) syntax of BallotEmissionFundsMetadata.jsx 2018-09-20 11:47:37 +03:00
Vadim Arasev ad758beb33 (Fix) syntax of BallotEmissionFundsMetadata.jsx 2018-09-20 11:47:19 +03:00
Vadim Arasev df60ea1683 (Refactor) A few enhancements of code 2018-09-20 11:39:28 +03:00
Vadim Arasev 2f5e178ef4 (Refactor) A few enhancements of code 2018-09-20 11:39:04 +03:00
Vadim Arasev c8009db1fd (Fix) src/components/NewBallot.jsx 2018-09-19 18:24:39 +03:00
Vadim Arasev d0f1d012e9 (Fix) index.js and BallotCard.jsx 2018-09-19 18:24:35 +03:00
Vadim Arasev d43f03036d (Feature) Add support of VotingToManageEmissionFunds.cancelNewBallot 2018-09-19 18:24:31 +03:00
Vadim Arasev b3f262674a (Fix) src/components/NewBallot.jsx 2018-09-19 18:24:27 +03:00
Vadim Arasev 931ae8c058 (Fix) src/components/BallotEmissionFundsMetadata.jsx 2018-09-19 18:24:23 +03:00
Vadim Arasev e35da1df70 (Fix) src/components/BallotCard.jsx 2018-09-19 18:24:19 +03:00
Vadim Arasev 5639487713 (Feature) Add voting to manage emission funds 2018-09-19 18:24:13 +03:00
Vadim Arasev 3ac429875d (Fix) src/components/NewBallot.jsx 2018-09-19 14:16:53 +03:00
Vadim Arasev 8c70c917d2 (Fix) index.js and BallotCard.jsx 2018-09-19 13:26:04 +03:00
Vadim Arasev f738081157 (Feature) Add support of VotingToManageEmissionFunds.cancelNewBallot 2018-09-19 10:54:31 +03:00
Vadim Arasev c54baba8d5 (Fix) src/components/NewBallot.jsx 2018-09-18 11:40:19 +03:00
Vadim Arasev c45fdfd737 (Fix) src/components/BallotEmissionFundsMetadata.jsx 2018-09-17 21:16:41 +03:00
Vadim Arasev e846d45d8b (Fix) src/components/BallotCard.jsx 2018-09-17 20:33:54 +03:00
Vadim Arasev 4d288fcda1 (Feature) Add voting to manage emission funds 2018-09-17 19:17:56 +03:00
Victor Baranov 12719ebd8c
Merge pull request #172 from varasev/address-arguments
(Refactor) Put address arguments at the end of argument list of functions
2018-09-14 17:37:47 +03:00
Vadim Arasev 664233571e (Update) Put address arguments at the end of argument list of functions 2018-09-05 11:56:52 +03:00
Vadim Arasev 443ad860f4 (Update) Put address arguments at the end of argument list of functions 2018-09-05 09:49:18 +03:00
Vadim Arasev 321fda4880
Merge pull request #171 from varasev/rename-already-voted
(Refactor) Rename `hasAlreadyVoted` property to `alreadyVoted`
2018-08-29 16:42:46 +03:00
Vadim Arasev 49c2cf204d (Update) Replace `hasAlreadyVoted` property with `alreadyVoted` 2018-08-29 14:14:17 +03:00
Vadim Arasev af496b28fb (Update) Replace `hasAlreadyVoted` property with `alreadyVoted` 2018-08-29 12:09:35 +03:00
Vadim Arasev 3ae5036239 Merge remote-tracking branch 'upstream/core' into core 2018-08-29 11:10:51 +03:00
Victor Baranov dc52cade4b
Merge pull request #170 from poanetwork/screenshot
(Fix) Update png for StateOfTheDapps
2018-08-27 19:55:30 +03:00
Victor Baranov 44c1e69b1f Update png for StateOfTheDapps 2018-08-27 19:49:36 +03:00
Victor Baranov 83c89735c2
Merge pull request #169 from poanetwork/screenshot
Add jpg screenshot for StateOfTheDapps
2018-08-27 19:02:08 +03:00
Victor Baranov faed7c9274 Return png screenshot for StateOfTheDapps 2018-08-27 18:58:58 +03:00
Victor Baranov 02870382f2 Merge branch 'screenshot' of github.com:poanetwork/poa-dapps-voting into screenshot 2018-08-27 18:57:59 +03:00
Victor Baranov a52371373b Add jpg screenshot for StateOfTheDapps 2018-08-27 18:57:39 +03:00