Commit Graph

2154 Commits

Author SHA1 Message Date
viktor 767547fd9e fix npm run build command 2018-06-11 12:28:10 +03:00
viktor 2484e9f091 rename getWhiteListWithCapCrowdsaleAssets to getCrowdsaleAssets 2018-06-08 13:06:02 +03:00
viktor f1a4591fb3 Updated token-wizard-test-automation submodule 2018-06-08 11:56:19 +03:00
Victor Baranov a7e3d947cc
Merge pull request #941 from poanetwork/allow-minCap-manage-screen-#930
(Feature) Allow min cap manage screen
2018-06-07 21:08:23 +03:00
fernandomg fa9c19f5e3 Prevent minCap modification if no tier is editable 2018-06-07 13:46:54 -03:00
fernandomg 0cfe78feea Prevent minCap from being greater than minimum supply 2018-06-07 10:51:32 -03:00
viktor 06d3fe58aa Merge branch '2.0' of github.com:poanetwork/token-wizard into 2.0 2018-06-07 16:44:22 +03:00
viktor b6122d7dee methods to retrieve data to display stats (not finalized yet) 2018-06-07 16:43:59 +03:00
fernandomg 84aacdb08b Enable minCap modification if all tiers are not whitelisted 2018-06-07 10:17:49 -03:00
Victor Baranov c9f4c6c2dc
Merge pull request #942 from poanetwork/incorrect-duration-update-#919
(Fix) Wrong tiers' duration calculation
2018-06-07 09:04:58 +03:00
fernandomg 07df9c22e2 Prevent minCap edition if all tiers are whitelisted 2018-06-06 15:40:09 -03:00
fernandomg 72b89b5933 Fix decimal values in whitelist form 2018-06-06 15:31:58 -03:00
fernandomg 17e61cbdd5 Update tierStore when form values are updated 2018-06-06 15:23:54 -03:00
fernandomg 480ef80030 Fix save button enabled/disabled status 2018-06-06 12:08:20 -03:00
fernandomg 6c9e70315a Merge remote-tracking branch 'origin/allow-minCap-manage-screen-#930' into allow-minCap-manage-screen-#930 2018-06-06 11:36:05 -03:00
fernandomg 6b5d5b3717 Enable DutchAuction in manage screen 2018-06-06 11:35:32 -03:00
fernandomg f16a60e883 Prevent minCap edit if it's not allowed 2018-06-06 10:46:59 -03:00
fernandomg d36a112237 Properly handle mincap field update 2018-06-06 10:06:37 -03:00
fernandomg d126c7d31a List reserved tokens addresses and renamed component to ReservedTokensList 2018-06-06 10:01:59 -03:00
fernandomg 323ebdea72 Allow whitelist modification after tier has started 2018-06-06 09:50:16 -03:00
viktor fcdc8939ab Stats page (without data) 2018-06-06 15:42:05 +03:00
viktor 83a7bb5e3e update token-wizard-test-automation 2018-06-06 10:49:33 +03:00
viktor ad89ba0dda update token-wizard-test-automation 2018-06-06 10:45:41 +03:00
fernandomg 48181e8f9e Merge branch '2.0' into allow-minCap-manage-screen-#930
# Conflicts:
#	src/components/crowdsale/utils.js
#	src/components/manage/ManageDutchAuctionBlock.js
#	src/components/manage/ManageForm.js
#	src/components/manage/ManageTierBlock.js
#	src/components/manage/index.js
#	src/components/manage/utils.js
2018-06-05 17:48:40 -03:00
fernandomg 444719e315 Allow global minCap update 2018-06-05 15:57:58 -03:00
fernandomg bbaf03ccd7 Prevent errors if no key exist 2018-06-05 15:55:09 -03:00
viktor ba115e4a8d Description for Dutch Auction crowdsale 2018-06-05 12:53:33 +03:00
Victor Baranov 6f283e39d1
Merge pull request #937 from poanetwork/fixes
(Refactoring) collapse deployCrowdsale and deployDutchAuctionCrowdsale to one function
2018-06-05 09:15:47 +03:00
viktor 3e0e6687d8 reviewer' comment 2018-06-05 08:46:49 +03:00
viktor 3e2577d30c remove commented lines 2018-06-04 20:29:57 +03:00
viktor 7f7d2826d6 resolve React suggestions 2018-06-04 16:36:49 +03:00
viktor b7d3a7f54a collapse deployCrowdsale and deployDutchAuctionCrowdsale to one function 2018-06-04 16:00:05 +03:00
viktor 5803aa48a9 Updated token-wizard-test-automation submodule 2018-06-04 08:59:00 +03:00
Victor dc8e207094 Missed contribute.scss 2018-06-01 20:37:04 +03:00
Victor Baranov 1883505058
Merge pull request #935 from poanetwork/invest-rename
(Fix) Rename invest
2018-06-01 20:29:46 +03:00
Victor 44c904b34f invest is in css, invest is in some variabled names 2018-06-01 15:47:39 +03:00
Victor f533769a29 investStore -> ContributeStore 2018-06-01 13:43:56 +03:00
Victor 37f41fe4f3 Rename invest 2018-06-01 13:33:12 +03:00
fernandomg fa1575cfdd Refactor methods to use async/await and simplify code 2018-05-31 19:25:28 -03:00
Victor dca64e3bfa update e2e for Dutch auction 2018-05-31 15:32:37 +03:00
Victor Baranov 4f313e0127
Merge pull request #932 from poanetwork/manage-page-fixes
(Fix) inaccuracy in displaying supply in management page for Dutch Auction
2018-05-30 22:22:58 +03:00
Victor 02775f5b82 Fix crowdsale supply in manage page 2018-05-30 21:08:10 +03:00
Victor 8599fdb463 disable 1 unit test 2018-05-30 20:20:11 +03:00
Victor f9ea934c0e Update react tests 2018-05-30 19:41:54 +03:00
Victor 13204bb1b4 Merge with 2.0 upstream 2018-05-30 19:18:19 +03:00
Victor bd2e75fe18 update snapshots && update whitelists for Dutch Auction fix 2018-05-30 19:14:28 +03:00
Victor Baranov 468750cae2
Merge pull request #931 from poanetwork/publish-page-fix
(Fix) remove unused parameter 'Allow modifying' from publish page in Dutch Auction strategy
2018-05-30 19:12:02 +03:00
Victor b770983e91 Display save button 2018-05-30 18:30:26 +03:00
Victor c835321758 Updating snapshots and npm version 2018-05-30 17:06:59 +03:00
Victor 9c052da63e Supply input 2018-05-30 16:53:15 +03:00