Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated repo #30

Merged
merged 100 commits into from
Jan 19, 2018
Merged

Updated repo #30

merged 100 commits into from
Jan 19, 2018

Conversation

OperationNine
Copy link

No description provided.

Janther and others added 30 commits July 21, 2017 15:22
@Janther
Update 2_deploy_contracts.js
4fc7237
@Janther
PreSaleWallet is not needed and the Eth will be forwarded to a MultiS…
a2868a8 
…igWallet
Merge pull request #8 from BlockchainLabsNZ/feature/removing_presalew…
10f0d5a 
…allet

PreSaleWallet is not needed
@Janther
adding a basic contribution based on the presale
5afb7a6
@Janther
new Exchanger to takeover the responsibility of distributing the AIX …
9729373 
…tokens between the APT holders
@Janther
mint initial value for PreSale Exchanger
2fdfefe
@rstormsf
add Timestamps to Contribution, change Exchanger to timestamps
d4a0760
@rstormsf
add tests for contribution
062d3ef
@Janther
Merge pull request #1 from rstormsf/feature/contribution
06d2c50 
update to timestamps
@rstormsf
add deployment steps
ca92aef
@rstormsf
correct deployment logs
9346c37
@rstormsf
fix logs, remove SafeMath from deployment
caa153d
@Janther
Merge pull request #2 from rstormsf/feature/contribution
883aeed 
add deployment steps
@Janther
Adding whitelisting, individual hardcap, and enforcing the use of Pre…
c387f8d 
…ttier for js formatting on tests.
@Janther
Update Contribution.sol
81f73e2
@Janther
Merge pull request #3 from Janther/feature/contribution
0b00da2 
WhiteListing investors
@Janther
adding the discounts for people investing early.
4a22da7
@rstormsf
Merge pull request #4 from Janther/feature/contribution
2720ad0 
adding the discounts for people investing early.
@rstormsf
add build to gitignore
707e49a
@Janther
Contribution caps based on Eth collected considering PreSale
888f87e
@Janther
Merge pull request #5 from Janther/feature/contribution
c3e35d1 
Contribution caps based on Eth collected considering PreSale
@rstormsf
Merge branch 'feature/contribution' of github.com:BlockchainLabsNZ/ai…
41f3f1f 
…gang-contracts into feature/contribution
@Janther
added logic for finalizing the Contribution
e05b949
@Janther
fixing typo
1cc9367
@Janther
Merge pull request #6 from Janther/feature/contribution
39a651e 
added logic for finalizing the Contribution
@rstormsf
Merge branch 'feature/contribution' of github.com:BlockchainLabsNZ/ai…
8af559e 
…gang-contracts into feature/contribution
@rstormsf
add babel to truffle tests
ec92437
@rstormsf
update tests for #initialize and fix deployment script
5a94ba1
@rstormsf
add test for #exchangeRate
19418d2
@rstormsf
Merge pull request #8 from rstormsf/feature/contribution
2415e1b 
add tests to initialize, exchangeRate
Janther and others added 28 commits October 11, 2017 17:05
@Janther
adding collector functionality
a5aec46
@Janther
fixing tests
8587e54
@Janther
Whitelisting
759fd98
@Janther
Adding collector Cap
a3f1dda
@Janther
Rollback on the rate
7972d54
@rstormsf
Merge pull request #24 from Janther/feature/collector
fee61c4 
 adding collector functionality
@dariusdev
Merge pull request #10 from BlockchainLabsNZ/feature/contribution
78464b7 
Feature/contribution
@rstormsf
remove isContract
09b2a74
@Janther
Merge pull request #25 from rstormsf/feature/contribution
4de7ed7 
remove isContract
@dariusdev
fix naming
8c99136
@dariusdev
add tests for community holders and devholders
b343d5c
@dariusdev
Merge pull request #11 from BlockchainLabsNZ/feature/contribution
751dac5 
Feature/contribution
@dariusdev
fix comment
3616379
@dariusdev
revert private to public
d5537e2
@dariusdev
the range for 30% bonus was too small. Fix tests and formula
ec34af7
@Janther
changing the name of overloaded function to be easily accessed by jav…
a2e01a2 
…ascript
@rstormsf
Merge pull request #28 from Janther/feature/contribution
11a95b3 
changing the name of overloaded function to be easily accessed by javascript
@Janther
Exchanger can exchange at any time after the contribution has started.
a44f502
@Janther
Addressing Comments
e13e3ab
@dariusdev
Add one test case for lowercased whitelist addresses and added aigang…
8b46579 
… T&C
@dariusdev
Merge pull request #12 from Janther/feature/contribution
8200037 
Feature/contribution from hanther
@rstormsf
change to require and remove check from approve, based on bokky's audit
0a71fcc
@dariusdev
add one more flat file
a763d03
@dariusdev
Merge pull request #13 from AigangNetwork/improvement
4d5fb09 
change to require and remove check from approve, based on bokky's audit
@dariusdev
update readme
fda7866
@dariusdev
increase unlocking for 10%
fd4e5d7
@Janther
Changes before Deployment
0638abf
@dariusdev
update tests after disabling remainHolder
6e8100f
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 6e8100f on AigangNetwork:master into ** on BlockchainLabsNZ:master**.

@OperationNine OperationNine merged commit f90179b into BlockchainLabsNZ:master Jan 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@OperationNine @coveralls @dariusdev @Janther @rstormsf