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

feature/erc20 #183

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

feature/erc20 #183

wants to merge 19 commits into from

Commits on Aug 27, 2018

  1. Reumove unused packages

    makoto committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    0e0f407 View commit details
    Browse the repository at this point in the history
  2. Remove frontend related files

    makoto committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    bafa98e View commit details
    Browse the repository at this point in the history
  3. Remove unused files

    makoto committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    258fc9d View commit details
    Browse the repository at this point in the history
  4. Remove unused hidden files

    makoto committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    0abeffa View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    89bebac View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c0074e5 View commit details
    Browse the repository at this point in the history
  7. Merge pull request makoto#2 from noblocknoparty/npm

    Add npm module info and ignore node_modules
    makoto authored Aug 27, 2018
    Configuration menu
    Copy the full SHA
    cfd5293 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9830652 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. Add ability to override owner (makoto#3)

    * Add ability to override owner
    
    Needed for our incoming Deployer contract
    
    * Added tests for new owner override. Fixed various other tests.
    
    * Remove ENS stuff
    hiddentao authored Aug 29, 2018
    Configuration menu
    Copy the full SHA
    d0ad667 View commit details
    Browse the repository at this point in the history
  2. Get Travis CI automated build working (makoto#4)

    * try and get working travis ci working
    
    * run testrpc in bg
    
    * use npm instead of yarn for now
    
    * add yargs
    
    * try and fix build
    
    * add yarn.lock and updated README
    
    * Remove ens
    
    * remove crypto browserify
    
    * fix test bug
    
    * add linting back
    hiddentao authored Aug 29, 2018
    Configuration menu
    Copy the full SHA
    0949167 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. minor

    decanus committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    569ffc4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b29e695 View commit details
    Browse the repository at this point in the history
  3. added abstraction

    decanus committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    a0060ac View commit details
    Browse the repository at this point in the history
  4. test

    decanus committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    3072810 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into feature/erc20

    Dean Eigenmann authored Aug 30, 2018
    Configuration menu
    Copy the full SHA
    4d22974 View commit details
    Browse the repository at this point in the history
  6. Update EthConference.sol

    Dean Eigenmann authored Aug 30, 2018
    Configuration menu
    Copy the full SHA
    21b581e View commit details
    Browse the repository at this point in the history
  7. Added ERC20 conf

    decanus committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    4405193 View commit details
    Browse the repository at this point in the history
  8. mybad

    decanus committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    176b869 View commit details
    Browse the repository at this point in the history
  9. Update EthConference.sol

    Dean Eigenmann authored Aug 30, 2018
    Configuration menu
    Copy the full SHA
    9acc2b0 View commit details
    Browse the repository at this point in the history