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.

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

Merge in latest dev-1.5.0 from polymath #6

Merged
merged 107 commits into from
Oct 4, 2018

Commits on Sep 26, 2018

  1. Add getDefaultExcluded

    adamdossa committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    c0f3630 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    45550bb View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

  1. Configuration menu
    Copy the full SHA
    8a0d25b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6120339 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dda3365 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9e9b0e3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1ebe0da View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f09c2f6 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b3c8d95 View commit details
    Browse the repository at this point in the history
  8. Update burn functions

    adamdossa committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    e70b072 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. Configuration menu
    Copy the full SHA
    d06a69f View commit details
    Browse the repository at this point in the history
  2. some fixes

    SatyamSB committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    825208e View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2 from PolymathNetwork/development-1.5.0

    Development 1.5.0
    glitch003 authored Sep 28, 2018
    Configuration menu
    Copy the full SHA
    6421e09 View commit details
    Browse the repository at this point in the history
  4. Updates

    adamdossa committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    4d6d169 View commit details
    Browse the repository at this point in the history
  5. Merge pull request PolymathNetwork#285 from PolymathNetwork/check-pau…

    …se-flow
    
    Check pause flow
    adamdossa authored Sep 28, 2018
    Configuration menu
    Copy the full SHA
    4570480 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3d75dda View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d8827f1 View commit details
    Browse the repository at this point in the history
  8. Event names modified

    VictorVicente committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    8a1d8f9 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fe71172 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8022b1b View commit details
    Browse the repository at this point in the history
  11. Merge pull request PolymathNetwork#283 from PolymathNetwork/withholdi…

    …ng_tax_on_dividends
    
    Minor changes and CLI support for withholding tax
    pabloruiz55 authored Sep 28, 2018
    Configuration menu
    Copy the full SHA
    2c818be View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    147d7cd View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    62b1dce View commit details
    Browse the repository at this point in the history
  14. Merge pull request PolymathNetwork#286 from PolymathNetwork/TravisCI-…

    …cron-jobs
    
    Travis ci cron jobs
    pabloruiz55 authored Sep 28, 2018
    Configuration menu
    Copy the full SHA
    2841e8a View commit details
    Browse the repository at this point in the history
  15. Optimisations

    adamdossa committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    23f5f98 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    0fd5637 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    4da0183 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2018

  1. WIP

    adamdossa committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    e94e025 View commit details
    Browse the repository at this point in the history
  2. Updates

    adamdossa committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    cd952c3 View commit details
    Browse the repository at this point in the history
  3. Add assertion

    adamdossa committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    e425691 View commit details
    Browse the repository at this point in the history
  4. Update interface

    adamdossa committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    7ad0c19 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6ca6b19 View commit details
    Browse the repository at this point in the history
  6. Update tests

    adamdossa committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    0384c3c View commit details
    Browse the repository at this point in the history
  7. Add module test cases

    adamdossa committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    9d547ec View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d2f3502 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2018

  1. Configuration menu
    Copy the full SHA
    c92ed87 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0ea44ab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    04fb3a1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6621d9e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6deb8e2 View commit details
    Browse the repository at this point in the history
  6. CLI typo

    VictorVicente committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    7eddf7d View commit details
    Browse the repository at this point in the history
  7. minor fixes

    SatyamSB committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    27e13cb View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c7ddbe5 View commit details
    Browse the repository at this point in the history
  9. Minor change

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    d56957f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    712ec47 View commit details
    Browse the repository at this point in the history
  11. Modify require text

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    d348ff8 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    1420bce View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    555aa9b View commit details
    Browse the repository at this point in the history
  14. Merge pull request PolymathNetwork#296 from PolymathNetwork/improve-g…

    …etter-mr
    
    Improve getAvailableModulesOfType() function of MR
    satyamakgec authored Oct 1, 2018
    Configuration menu
    Copy the full SHA
    befd377 View commit details
    Browse the repository at this point in the history
  15. WIP

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    37c59f7 View commit details
    Browse the repository at this point in the history
  16. Merge branch 'development-1.5.0' into fix_namespace_squatting_in_MR

    # Conflicts:
    #	contracts/ModuleRegistry.sol
    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    922f037 View commit details
    Browse the repository at this point in the history
  17. Fix

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    02d9426 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    dd7d1b0 View commit details
    Browse the repository at this point in the history
  19. Updates

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    fefbb87 View commit details
    Browse the repository at this point in the history
  20. More fixes for tests

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    626083a View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    3f6f9c5 View commit details
    Browse the repository at this point in the history
  22. Fix every test case (sigh)

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    c993c5f View commit details
    Browse the repository at this point in the history
  23. More test fixes

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    5a01e07 View commit details
    Browse the repository at this point in the history
  24. Last fix

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    0658566 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    1f557fd View commit details
    Browse the repository at this point in the history
  26. Fix modifyTicker

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    1c7ed17 View commit details
    Browse the repository at this point in the history
  27. Add more test cases

    adamdossa committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    37b0b96 View commit details
    Browse the repository at this point in the history
  28. Merge pull request PolymathNetwork#298 from PolymathNetwork/CLI-minor…

    …-updates
    
    Cli minor updates
    pabloruiz55 authored Oct 1, 2018
    Configuration menu
    Copy the full SHA
    d7fc06a View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Configuration menu
    Copy the full SHA
    0f98a41 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    213b318 View commit details
    Browse the repository at this point in the history
  3. test case typos fixed

    maxsam4 committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    9b626d5 View commit details
    Browse the repository at this point in the history
  4. small changelog fix

    SatyamSB committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    259a4de View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8dfa7b3 View commit details
    Browse the repository at this point in the history
  6. Merge pull request PolymathNetwork#297 from PolymathNetwork/fix_names…

    …pace_squatting_in_MR
    
    Fix namespace squatting in MR
    satyamakgec authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    e871913 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1d8f211 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9373adc View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    472b513 View commit details
    Browse the repository at this point in the history
  10. Update title

    adamdossa committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    c8195a5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    840fb8f View commit details
    Browse the repository at this point in the history
  12. Small fix

    adamdossa committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    b666431 View commit details
    Browse the repository at this point in the history
  13. Updated changelog

    maxsam4 committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    61056d8 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    efaaf5a View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    e9e31ac View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    8b79b91 View commit details
    Browse the repository at this point in the history
  17. Fix bad merge

    adamdossa committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    6f0f44e View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    4d81666 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    b756224 View commit details
    Browse the repository at this point in the history
  20. Removed more gas amounts

    maxsam4 committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    a15f2ef View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    b6981b2 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    bc24a72 View commit details
    Browse the repository at this point in the history
  23. Renamed a function

    Renamed `_CallERC20DividendDepositedEvent` to `_emitERC20DividendDepositedEvent`
    maxsam4 authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    ec34f02 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    aa1d100 View commit details
    Browse the repository at this point in the history
  25. Merge pull request PolymathNetwork#294 from PolymathNetwork/optimise_…

    …str_size
    
    Optimise STR
    adamdossa authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    c06beaa View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    803f537 View commit details
    Browse the repository at this point in the history
  27. Merge pull request PolymathNetwork#300 from PolymathNetwork/ganache-l…

    …imit
    
    Ganache limit changed to 8mm for tests
    satyamakgec authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    bd35cc9 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    7090b18 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    94495e3 View commit details
    Browse the repository at this point in the history
  30. Removed duplicate test case

    maxsam4 committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    8427603 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    e6a04e5 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    c2b8b06 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    c971a98 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    deeb1fe View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    9073afa View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    12879cd View commit details
    Browse the repository at this point in the history
  37. Merge pull request PolymathNetwork#301 from PolymathNetwork/CLI-minor…

    …-updates
    
    CLI: Gas limit for estimation
    pabloruiz55 authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    0d1c40b View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    bdcd843 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    874b81b View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    96399a7 View commit details
    Browse the repository at this point in the history
  41. Merge pull request PolymathNetwork#302 from PolymathNetwork/remove-lo…

    …g-oracles
    
    remove Log prefix from the oracles contract
    pabloruiz55 authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    8667113 View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    d391ea1 View commit details
    Browse the repository at this point in the history
  43. Merge pull request PolymathNetwork#303 from PolymathNetwork/CLI-minor…

    …-updates
    
    CLI dividend name
    pabloruiz55 authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    af9ae8c View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2018

  1. Merge pull request #5 from PolymathNetwork/development-1.5.0

    Development 1.5.0
    glitch003 authored Oct 4, 2018
    Configuration menu
    Copy the full SHA
    3904fa9 View commit details
    Browse the repository at this point in the history