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

Support multiple module types #305

Merged
merged 32 commits into from
Oct 4, 2018
Merged

Support multiple module types #305

merged 32 commits into from
Oct 4, 2018

Commits on Oct 2, 2018

  1. WIP

    @adamdossa
    adamdossa committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    fc0bace View commit details
    Browse the repository at this point in the history

  2. Fixes

    @adamdossa
    adamdossa committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    a925a8c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development-1.5.0' into support_multiple_module_types 

    # Conflicts:
#	contracts/modules/Checkpoint/ERC20DividendCheckpointFactory.sol
#	contracts/modules/Checkpoint/EtherDividendCheckpointFactory.sol
#	contracts/tokens/SecurityToken.sol
    @adamdossa
    adamdossa committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    4838de7 View commit details
    Browse the repository at this point in the history

  4. Size too big...

    @adamdossa
    adamdossa committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    59cb476 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2018

  1. WIP

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    ce06984 View commit details
    Browse the repository at this point in the history

  2. WIP

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    ceed74e View commit details
    Browse the repository at this point in the history

  3. Go back to in-lined internals

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    e7caf0d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development-1.5.0' into support_multiple_module_types 

    # Conflicts:
#	contracts/modules/Checkpoint/ERC20DividendCheckpointFactory.sol
#	contracts/modules/Checkpoint/EtherDividendCheckpointFactory.sol
#	contracts/tokens/SecurityToken.sol
    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    f1c6aa4 View commit details
    Browse the repository at this point in the history

  5. Remove merge cruft

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    0a00f95 View commit details
    Browse the repository at this point in the history

  6. More merge cruft

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    85a8ba6 View commit details
    Browse the repository at this point in the history

  7. WIP fixes

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    f31a001 View commit details
    Browse the repository at this point in the history

  8. Still too big

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    a37a776 View commit details
    Browse the repository at this point in the history

  9. Working

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    5c5dbd5 View commit details
    Browse the repository at this point in the history

  10. Remove commented lines

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    80bfbb1 View commit details
    Browse the repository at this point in the history

  11. Fix test cases

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    5a7657b View commit details
    Browse the repository at this point in the history

  12. More fixes

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    5278696 View commit details
    Browse the repository at this point in the history

  13. Remove kludge

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    3b0f0be View commit details
    Browse the repository at this point in the history

  14. Fix some more tests

    @adamdossa
    adamdossa committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    b91c14e View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2018

  1. move investors data and logic into the library

    @SatyamSB
    SatyamSB committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    b37b605 View commit details
    Browse the repository at this point in the history

  2. minor naming fix

    @SatyamSB
    SatyamSB committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    11f6e60 View commit details
    Browse the repository at this point in the history

  3. cleanup

    @SatyamSB
    SatyamSB committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    e7a290d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'support_multiple_module_types' into some-changes-adampr

    @SatyamSB
    SatyamSB committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    6fe5614 View commit details
    Browse the repository at this point in the history

  5. add some improvements

    @SatyamSB
    SatyamSB committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    2b50c16 View commit details
    Browse the repository at this point in the history

  6. added a missing semi-colon

    @maxsam4
    maxsam4 committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    d5e0a7f View commit details
    Browse the repository at this point in the history

  7. Fixes based on comments

    @adamdossa
    adamdossa committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    f4869dd View commit details
    Browse the repository at this point in the history

  8. Remove empty module

    @adamdossa
    adamdossa committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    a810f91 View commit details
    Browse the repository at this point in the history

  9. Add forceBurn to fuzz testing for checkpoints

    @adamdossa
    adamdossa committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    2952dc4 View commit details
    Browse the repository at this point in the history

  10. resolve conflicts

    @SatyamSB
    SatyamSB committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    acbc3f5 View commit details
    Browse the repository at this point in the history

  11. minor fix

    @SatyamSB
    SatyamSB committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    7e2859b View commit details
    Browse the repository at this point in the history

  12. remove investorCount

    @SatyamSB
    SatyamSB committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    6d8bcee View commit details
    Browse the repository at this point in the history

  13. Merge pull request #314 from PolymathNetwork/some-changes-adampr 

    Migrate the investors logic from ST to library
    @satyamakgec
    satyamakgec authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    e4817d3 View commit details
    Browse the repository at this point in the history

  14. Small update

    @adamdossa
    adamdossa committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    1b4a549 View commit details
    Browse the repository at this point in the history