Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/development' into website | Fred Carlsen | 2018-12-05 | 419 | -1691/+11537 |
|\ | | | | | | | | | | | # Conflicts: # packages/website/package.json # packages/website/ts/style/colors.ts | ||||
| * | Merge pull request #1384 from 0xProject/feature/contracts-monorepo-3 | Leonid Logvinov | 2018-12-05 | 50 | -56/+332 |
| |\ | | | | | | | Contracts monorepo 4 feat | ||||
| | * | Merge pull request #1374 from 0xProject/feature/contracts-monorepo-4 | Leonid Logvinov | 2018-12-05 | 50 | -56/+332 |
| | |\ | | | | | | | | | Contracts monorepo 4 | ||||
| | | * | De-nest libs contracts | Leonid Logvinov | 2018-12-05 | 31 | -50/+50 |
| | | | | |||||
| | | * | Enable libs tests on CI | Leonid Logvinov | 2018-12-04 | 1 | -0/+2 |
| | | | | |||||
| | | * | Import TestLibs contract from @0x/contracts-libs | Leonid Logvinov | 2018-12-04 | 1 | -2/+1 |
| | | | | |||||
| | | * | Refactor out libs into @0x/contracts-libs | Leonid Logvinov | 2018-12-04 | 49 | -51/+326 |
| | |/ | |||||
| * | | chore: Remove increaseTimeAsync from DutchAuction. | Jacob Evans | 2018-12-05 | 1 | -39/+0 |
| | | | | | | | | | | | | Dutch auctions can be made in the past so we do not need to artificially increase time | ||||
| * | | Merge pull request #1382 from 0xProject/fix/instant/center-powered-by | Steve Klebanoff | 2018-12-05 | 4 | -7/+11 |
| |\ \ | | | | | | | | | [instant] Center powered by and change to text to Connect | ||||
| | * | | Wallet prompt tweaks per Chris's comment | Steve Klebanoff | 2018-12-05 | 3 | -6/+10 |
| | | | | |||||
| | * | | Please unlock -> Click to connect | Steve Klebanoff | 2018-12-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix(instant): center powered by 0x svg | Steve Klebanoff | 2018-12-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1379 from 0xProject/fix/instant/overlay-color | Brandon Millman | 2018-12-05 | 3 | -3/+10 |
| |\ \ \ | | | | | | | | | | | [instant] add stable class name to overlay close button and adjust overlay color | ||||
| | * | | | fix(instant): remove extra container around the button | Brandon Millman | 2018-12-05 | 1 | -11/+15 |
| | | | | | |||||
| | * | | | feat(instant): give a stable class name to the close button on the overlay | Brandon Millman | 2018-12-05 | 2 | -9/+12 |
| | | | | | |||||
| | * | | | fix(instant): lighten the overlay color to 0.7 opacity from 0.9 | Brandon Millman | 2018-12-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1381 from 0xProject/feature/magic-input-error | Steve Klebanoff | 2018-12-05 | 5 | -8/+23 |
| |\ \ \ \ | | | | | | | | | | | | | [instant] Magic input to trigger error for production Rollbar testing | ||||
| | * | | | | Use git sha and npm version from constants | Steve Klebanoff | 2018-12-05 | 1 | -3/+9 |
| | | | | | | |||||
| | * | | | | Add GIT_SHA and NPM_VERSION constants, report git and npm version in error | Steve Klebanoff | 2018-12-05 | 4 | -8/+11 |
| | | | | | | |||||
| | * | | | | feat(instant): input to trigger error for rollbar testing | Steve Klebanoff | 2018-12-05 | 2 | -0/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #1371 from ↵ | Steve Klebanoff | 2018-12-05 | 3 | -5/+19 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | 0xProject/feature/instant/log-decimals-and-add-event-properties feat(instant): More event properties for tracking | ||||
| | * | | | | ethBalanceInUnitAmount -> lastEthBalanceInUnitAmount | Steve Klebanoff | 2018-12-05 | 3 | -2/+2 |
| | | | | | | |||||
| | * | | | | feat(instant): Add eth balance, eth address, token symbol and decimals to ↵ | Steve Klebanoff | 2018-12-04 | 2 | -4/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | event properties | ||||
| * | | | | | Merge pull request #1380 from 0xProject/instant/fix/heap-analytics-id-prod | Steve Klebanoff | 2018-12-05 | 3 | -3/+3 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | [instant] Ensure build process receives build arguments | ||||
| | * | | | | Ensure build process receives build arguments | Steve Klebanoff | 2018-12-05 | 3 | -3/+3 |
| | | |/ / | | |/| | | | | | | | | | | | | See https://github.com/entropitor/dotenv-cli/issues/8 | ||||
| * | | | | Merge pull request #1376 from 0xProject/feature/instant/padding-spacing-polish | Francesco Agosti | 2018-12-05 | 4 | -4/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | [instant] Reduce vertical padding in instant | ||||
| | * | | | polish: reduce vertical padding in instant | fragosti | 2018-12-05 | 4 | -4/+4 |
| |/ / / | |||||
| * | | | Merge pull request #1373 from 0xProject/feature/contracts-monorepo-3 | Leonid Logvinov | 2018-12-05 | 50 | -55/+337 |
| |\ \ \ | | | |/ | | |/| | Contracts monorepo III | ||||
| | * | | Add missing dependency | Leonid Logvinov | 2018-12-04 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fix homepage link | Leonid Logvinov | 2018-12-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Enable contract utils tests | Leonid Logvinov | 2018-12-04 | 1 | -0/+2 |
| | | | | |||||
| | * | | Refactor @0x/contracts-utils from @0x/contracts-core | Leonid Logvinov | 2018-12-04 | 49 | -55/+334 |
| |/ / | |||||
| * | | Merge pull request #1311 from 0xProject/feature/contracts-monorepo-2 | Leonid Logvinov | 2018-12-04 | 95 | -359/+1036 |
| |\ \ | | | | | | | | | Contracts monorepo II | ||||
| | * | | Fix calldata related linter errors | Leonid Logvinov | 2018-12-04 | 1 | -6/+6 |
| | | | | |||||
| | * | | Add missing dependency | Leonid Logvinov | 2018-12-04 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fix merge conflict | Leonid Logvinov | 2018-12-04 | 1 | -7/+12 |
| | | | | |||||
| | * | | Merge branch 'development' into feature/contracts-monorepo-2 | Leonid Logvinov | 2018-12-04 | 69 | -84/+1752 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1225 from 0xProject/feature/contracts/dutch-auction | Jacob Evans | 2018-12-04 | 10 | -1/+708 |
| |\ \ \ | | | | | | | | | | | Implement Basic Dutch Auction | ||||
| | * | | | chore: Move to new structure | Jacob Evans | 2018-12-04 | 2 | -0/+0 |
| | | | | | |||||
| | * | | | chore: SafeMath and if statement in getAuctionDetails | Jacob Evans | 2018-12-04 | 1 | -10/+18 |
| | | | | | |||||
| | * | | | chore: Add RevertReasons for DutchAuction. Test revert reasons | Jacob Evans | 2018-12-04 | 4 | -14/+51 |
| | | | | | |||||
| | * | | | chore: Use SafeMath where possible | Jacob Evans | 2018-12-04 | 1 | -15/+34 |
| | | | | | |||||
| | * | | | chore: Clean up documentation | Jacob Evans | 2018-12-04 | 2 | -30/+58 |
| | | | | | |||||
| | * | | | chore: Work around for Ganache timestamp bug | Jacob Evans | 2018-12-04 | 1 | -17/+14 |
| | | | | | |||||
| | * | | | chore: Return excess to buyer | Jacob Evans | 2018-12-04 | 2 | -29/+58 |
| | | | | | |||||
| | * | | | chore: update documentation | Jacob Evans | 2018-12-04 | 2 | -14/+25 |
| | | | | | |||||
| | * | | | chore: taker address and zrx fee test | Jacob Evans | 2018-12-04 | 1 | -1/+46 |
| | | | | | |||||
| | * | | | chore: Rename price to amount. Encode parameters in makerAssetData | Jacob Evans | 2018-12-04 | 2 | -134/+149 |
| | | | | | |||||
| | * | | | chore: time movement for geth | Jacob Evans | 2018-12-04 | 2 | -31/+68 |
| | | | | | |||||
| | * | | | feat: Dutch Auction | Jacob Evans | 2018-12-04 | 8 | -1/+482 |
| | | | | | |||||
| * | | | | Merge pull request #1372 from 0xProject/fix/instant/single-asset | Brandon Millman | 2018-12-04 | 2 | -5/+6 |
| |\ \ \ \ | | | | | | | | | | | | | [instant] render token selector when only one asset is available | ||||
| | * | | | | fix(instant): render token selector when only one asset is available | Brandon Millman | 2018-12-04 | 2 | -5/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #1370 from ↵ | Steve Klebanoff | 2018-12-04 | 4 | -6/+14 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | 0xProject/feature/instant/explicitly-enable-heap-dev [instant] Must explicitly specify when want to send to heap when developing | ||||
| | * | | | | updating .env example | Steve Klebanoff | 2018-12-04 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | feat(instant): have to use INSTANT_HEAP_FORCE_DEVELOPMENT to report to heap ↵ | Steve Klebanoff | 2018-12-04 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | in development | ||||
| * | | | | | Merge pull request #1367 from 0xProject/fix/instant/dai | Brandon Millman | 2018-12-04 | 3 | -2/+16 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | [asset-buyer][instant] support DAI in instant | ||||
| | * | | | | feat(instant): update DAI token color | Brandon Millman | 2018-12-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | fix(asset-buyer): update SRA order provider to include DAI | Brandon Millman | 2018-12-04 | 2 | -1/+15 |
| | | | | | | |||||
| * | | | | | Merge pull request #1353 from 0xProject/feature/website/instant-marketing | Francesco Agosti | 2018-12-04 | 22 | -2/+683 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | [website] instant marketing page shell | ||||
| | * | | | | feat(website): implement rest of links | Brandon Millman | 2018-11-29 | 3 | -55/+77 |
| | | | | | | |||||
| | * | | | | feat(website): implement link directly to configure | Brandon Millman | 2018-11-29 | 4 | -6/+36 |
| | | | | | | |||||
| | * | | | | feat(website): optionally show configurator | Brandon Millman | 2018-11-29 | 1 | -3/+4 |
| | | | | | | |||||
| | * | | | | feature(website): add configurator shell | Brandon Millman | 2018-11-29 | 2 | -0/+8 |
| | | | | | | |||||
| | * | | | | fix(website): instant marketing page need more background color | Brandon Millman | 2018-11-29 | 3 | -5/+4 |
| | | | | | | |||||
| | * | | | | fix(website): instant marketing page shadows | Brandon Millman | 2018-11-29 | 4 | -148/+47 |
| | | | | | | |||||
| | * | | | | fix(website): change instant marketing page styling to non mono font except ↵ | Brandon Millman | 2018-11-29 | 2 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | the 0 in 0x | ||||
| | * | | | | chore(website): random fixes for mobile optimization | Brandon Millman | 2018-11-29 | 4 | -36/+63 |
| | | | | | | |||||
| | * | | | | feat(website): add extra assets for instant marketing page | Brandon Millman | 2018-11-29 | 15 | -8/+354 |
| | | | | | | |||||
| | * | | | | feat(website): fix screenshots in marketing page for small screens | Brandon Millman | 2018-11-29 | 2 | -11/+31 |
| | | | | | | |||||
| | * | | | | feat(website): need more section for instant marketing page | Brandon Millman | 2018-11-29 | 3 | -2/+52 |
| | | | | | | |||||
| | * | | | | feature(website): add links to instant marketing page | Brandon Millman | 2018-11-29 | 1 | -8/+51 |
| | | | | | | |||||
| | * | | | | fix(website): update instant page CTA font | Brandon Millman | 2018-11-29 | 1 | -7/+1 |
| | | | | | | |||||
| | * | | | | feat(website): instant features section | Brandon Millman | 2018-11-29 | 6 | -31/+55 |
| | | | | | | |||||
| | * | | | | feat(website): add screenshots to instant page | Brandon Millman | 2018-11-29 | 10 | -1/+85 |
| | | | | | | |||||
| | * | | | | feat(website): implement introducing 0x instant header | Brandon Millman | 2018-11-29 | 3 | -1/+48 |
| | | | | | | |||||
| | * | | | | feat(website): add header and footer to instant page | Brandon Millman | 2018-11-29 | 1 | -1/+46 |
| | | | | | | |||||
| | * | | | | feat(website): scaffolding for instant page | Brandon Millman | 2018-11-29 | 4 | -0/+42 |
| | | | | | | |||||
| * | | | | | Merge pull request #1295 from 0xProject/feature/instant/rollbar-env | Steve Klebanoff | 2018-12-04 | 12 | -40/+253 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | [instant] Rollbar | ||||
| | * | | | | Fix variable name | Steve Klebanoff | 2018-12-01 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Take out https:// prefix | Steve Klebanoff | 2018-12-01 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'development' into feature/instant/rollbar-env | Steve Klebanoff | 2018-12-01 | 3 | -0/+11 |
| | |\ \ \ \ | |||||
| | * | | | | | get rid of double private def | Steve Klebanoff | 2018-12-01 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | update with new CDN | Steve Klebanoff | 2018-12-01 | 1 | -2/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'feature/instant/prod-env-switches-cdn' into ↵ | Steve Klebanoff | 2018-12-01 | 174 | -630/+7531 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | feature/instant/rollbar-env | ||||
| | * \ \ \ \ \ | Merge branch 'development' into feature/instant/rollbar-env | Steve Klebanoff | 2018-11-27 | 116 | -414/+1033 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | EMBEDDED_DOMAINS -> HOST_DOMAINS | Steve Klebanoff | 2018-11-27 | 2 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Host whitelist so we don't get errors from embedded site | Steve Klebanoff | 2018-11-22 | 2 | -1/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | Linting | Steve Klebanoff | 2018-11-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'development' into feature/instant/rollbar-env | Steve Klebanoff | 2018-11-22 | 44 | -139/+348 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Better env var names for source map plugin | Steve Klebanoff | 2018-11-22 | 1 | -5/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Shorter validateRollbarPresence logic | Steve Klebanoff | 2018-11-22 | 1 | -11/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use ROLLBAR_ENABLED constant, and change ROLLBAR_ENVIRONMENT to ↵ | Steve Klebanoff | 2018-11-22 | 3 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INSTANT_ENVIRONMENT | ||||
| | * | | | | | | | | Report when cant update balance | Steve Klebanoff | 2018-11-22 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Takeout redundant check, and make function name more clear | Steve Klebanoff | 2018-11-22 | 1 | -7/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Move rollbar setup into function, move setting up into provider | Steve Klebanoff | 2018-11-22 | 3 | -36/+35 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Always report unexpected errors. Move error message generation into helper ↵ | Steve Klebanoff | 2018-11-22 | 3 | -23/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function, and add tests | ||||
| | * | | | | | | | | Linting | Steve Klebanoff | 2018-11-21 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Ensure we publish Instant with rollbar settings | Steve Klebanoff | 2018-11-21 | 1 | -1/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | TODO note | Steve Klebanoff | 2018-11-21 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Explicit error reporting | Steve Klebanoff | 2018-11-21 | 4 | -3/+12 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Force source maps on staging and dogfood | Steve Klebanoff | 2018-11-21 | 1 | -2/+26 |
| | | | | | | | | | | |||||
| | * | | | | | | | | feat(instant): Report errors to rollbar | Steve Klebanoff | 2018-11-21 | 3 | -0/+78 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use sourcemap loader | Steve Klebanoff | 2018-11-21 | 1 | -0/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Introduce rollbar plugin | Steve Klebanoff | 2018-11-21 | 5 | -15/+74 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Send in rollbar environment | Steve Klebanoff | 2018-11-21 | 1 | -8/+20 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1365 from 0xProject/fix/instant/token-selector | Brandon Millman | 2018-12-04 | 9 | -14/+30 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | [instant] various polish items | ||||
| | * | | | | | | | | | fix(instant): remove screenshot from dev index.html | Brandon Millman | 2018-12-04 | 2 | -6/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix(instant): darken overlay color | Brandon Millman | 2018-12-01 | 3 | -1/+7 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | feat(instant): add token symbol to buy button text | Brandon Millman | 2018-12-01 | 3 | -5/+16 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix(instant): update zrx icon | Brandon Millman | 2018-12-01 | 1 | -2/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix(instant): DGD and DGX colors | Brandon Millman | 2018-12-01 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix(instant) various token selector fixes | Brandon Millman | 2018-12-01 | 3 | -4/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1364 from ↵ | Francesco Agosti | 2018-12-04 | 9 | -8/+27 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/instant/allow-env-vars-in-env-file [instant] Add dotenv to make env dependencies more explicit | ||||
| | * | | | | | | | | | feat: add dotenv to make env dependencies more explicit | fragosti | 2018-12-01 | 9 | -9/+28 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #1366 from 0xProject/feature/instant/provider-name | Brandon Millman | 2018-12-04 | 6 | -7/+16 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | [instant] provide a custom wallet display name option | ||||
| | * | | | | | | | | | feat(instant): provide a custom wallet display name | Brandon Millman | 2018-12-01 | 6 | -7/+16 |
| | |/ / / / / / / / | |||||
| | | | | | | | | * | Don't start the provider by default | Leonid Logvinov | 2018-12-04 | 4 | -3/+25 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Refactour out the contracts testing options into a separate markdown file | Leonid Logvinov | 2018-12-03 | 3 | -92/+50 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Use lodash _.startsWith | Leonid Logvinov | 2018-12-03 | 1 | -3/+5 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Remove contracts package authors from package.json | Leonid Logvinov | 2018-12-03 | 3 | -3/+0 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Update packages/sol-resolver/src/resolvers/npm_resolver.ts | Fabio B | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| | | | | | | | | * | Update packages/sol-resolver/src/resolvers/npm_resolver.ts | Fabio B | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| | | | | | | | | * | Update packages/sol-compiler/src/compiler.ts | Fabio B | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| | | | | | | | | * | Update packages/sol-compiler/CHANGELOG.json | Fabio B | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| | | | | | | | | * | Update contracts/multisig/README.md | Fabio B | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| | | | | | | | | * | Move more devDependencies of contracts-tst-utils to dependencies | Leonid Logvinov | 2018-12-03 | 1 | -7/+7 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Update contracts-test-utils README | Leonid Logvinov | 2018-12-03 | 1 | -75/+19 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Make chai-as-promised a dependency | Leonid Logvinov | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Make sol-cov a dependency of @0x/contracts/test-utils | Leonid Logvinov | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix hardcoded path in release notes fetching | Leonid Logvinov | 2018-12-03 | 2 | -9/+7 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Rename contract_templates to abi-gen-templates | Leonid Logvinov | 2018-12-03 | 5 | -6/+6 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Update yarn.lock | Leonid Logvinov | 2018-12-03 | 1 | -4/+45 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix merge conflict | Leonid Logvinov | 2018-12-03 | 1 | -5/+0 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Remove unused dependencies | Leonid Logvinov | 2018-12-03 | 2 | -10/+0 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix package description | Leonid Logvinov | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix a typo in a prettierignore | Leonid Logvinov | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Clean up READMEs | Leonid Logvinov | 2018-12-03 | 2 | -22/+6 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Remove .solhintignore | Leonid Logvinov | 2018-12-03 | 1 | -3/+0 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Remove CHANGELOG entries | Leonid Logvinov | 2018-12-03 | 1 | -115/+1 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Remove duplicates combinatorial utils from core contracts | Leonid Logvinov | 2018-12-03 | 3 | -114/+4 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Ignore generated files in multisig contracts | Leonid Logvinov | 2018-12-03 | 8 | -4497/+4 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Run both core and multisig contracts tests on CI | Leonid Logvinov | 2018-12-03 | 1 | -2/+5 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix linter issues | Leonid Logvinov | 2018-12-03 | 3 | -1/+9 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Use assetProxyOwner instead of the multisig in the core contracts tests | Leonid Logvinov | 2018-12-03 | 2 | -47/+55 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Remove multisig contracts from the core list of contracts | Leonid Logvinov | 2018-12-03 | 4 | -13/+4 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix an issue when we tried to append base contracts path to absolute imports ↵ | Leonid Logvinov | 2018-12-03 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (NPM) in sol-compiler | ||||
| | | | | | | | | * | Add support for scoped packages resolving to NPMResoler | Leonid Logvinov | 2018-12-03 | 2 | -2/+20 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Refactor contracts-core into contracts-multisig, contracts-core and ↵ | Leonid Logvinov | 2018-12-03 | 82 | -213/+5670 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contracts-test-utils | ||||
| | | | | | | | | * | Replace packages/contracts with contracts/core | Leonid Logvinov | 2018-12-03 | 1 | -45/+4 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #1310 from 0xProject/feature/contracts-monorepo | Leonid Logvinov | 2018-12-03 | 167 | -167/+263 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Contracts monorepo I | ||||
| | * | | | | | | | Move MultiAssetProxy to the contracts monorepo | Leonid Logvinov | 2018-12-03 | 1 | -0/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove generated files | Leonid Logvinov | 2018-12-03 | 70 | -51512/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Rename calldata to callData because solhint doesn't like calldata (probably ↵ | Leonid Logvinov | 2018-12-03 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reserved keyword) and goes nuts | ||||
| | * | | | | | | | Update yarn.lock | Leonid Logvinov | 2018-12-03 | 1 | -21/+314 |
| | | | | | | | | | |||||
| | * | | | | | | | Add contracts to yarn workspaces | Leonid Logvinov | 2018-12-03 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Replace packages/contracts with contracts/core | Leonid Logvinov | 2018-12-03 | 9 | -256/+58 |
| | | | | | | | | | |||||
| | * | | | | | | | Add contracts/* to monorepo routes | Leonid Logvinov | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Move packages/contracts to contracts/core | Leonid Logvinov | 2018-12-03 | 226 | -0/+51512 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1362 from ↵ | Francesco Agosti | 2018-12-01 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 0xProject/fix/instant/push-to-history-broken-when-no-onpopstate [instant] Fix push to history issue on second full render of instant | ||||
| | * | | | | | | chore: lint | fragosti | 2018-12-01 | 3 | -7/+6 |
| | | | | | | | | |||||
| | * | | | | | | fix: push to history edge case for second render where onpopstate is not ↵ | fragosti | 2018-12-01 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defined on first render | ||||
| * | | | | | | | Merge pull request #1359 from 0xProject/feature/instant/prod-env-switches-cdn | Steve Klebanoff | 2018-12-01 | 10 | -40/+52 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | [instant] CDN-approach to identifying environments | ||||
| | * | | | | | | removing unused references | Steve Klebanoff | 2018-12-01 | 2 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Remove env var check for INSTANT_HEAP_ANALYTICS_ID_PRODUCTION since this is ↵ | Steve Klebanoff | 2018-12-01 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only needed on discharge | ||||
| | * | | | | | | takeout console.log | Steve Klebanoff | 2018-12-01 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'development' into feature/instant/prod-env-switches-cdn | Steve Klebanoff | 2018-12-01 | 166 | -498/+7397 |
| | |\| | | | | | |||||
| | * | | | | | | cdn -> dischargeTarget, and report to heap | Steve Klebanoff | 2018-12-01 | 7 | -16/+29 |
| | | | | | | | | |||||
| | * | | | | | | Take out old --env | Steve Klebanoff | 2018-11-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | cdn approach to identifyign environments | Steve Klebanoff | 2018-11-30 | 6 | -49/+20 |
| | | | | | | | | |||||
| | * | | | | | | Fix build command | Steve Klebanoff | 2018-11-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | feat(instant): Cleaner config-specific setup | Steve Klebanoff | 2018-11-30 | 6 | -23/+69 |
| | | | | | | | | |||||
| | * | | | | | | Set .env in builds, and update profile to use 0xproject | Steve Klebanoff | 2018-11-30 | 4 | -11/+8 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1342 from 0xProject/feature/instant/misc-close-analytics | Steve Klebanoff | 2018-12-01 | 3 | -0/+11 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | [instant] Close and View Transaction analytics events | ||||
| | * | | | | | | add missing import from merge | Steve Klebanoff | 2018-12-01 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'development' into feature/instant/misc-close-analytics | Steve Klebanoff | 2018-11-30 | 141 | -405/+7027 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | feat(instant): Close and View Transaction analytics events | Steve Klebanoff | 2018-11-28 | 3 | -1/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1348 from 0xProject/feature/instant/cdn-setup | Francesco Agosti | 2018-12-01 | 9 | -52/+47 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [instant] Remove commonjs bundle, productionize UMD bundle | ||||
| | * | | | | | | | | feat: remove instant from project references | fragosti | 2018-12-01 | 2 | -2/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | chore: deploy_live -> deploy_production | fragosti | 2018-12-01 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | feat: update tsconfig | fragosti | 2018-12-01 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix: address PR feedback | fragosti | 2018-12-01 | 5 | -8/+4 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | fix: add clarification to NOTE in README | fragosti | 2018-11-29 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | feat: add URL to other parts of README | fragosti | 2018-11-29 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | feat: write version info directly to exported object | fragosti | 2018-11-29 | 3 | -14/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | feat: add deploy_live command | fragosti | 2018-11-29 | 3 | -3/+25 |
| | | | | | | | | | |||||
| | * | | | | | | | feat: write version info to window | fragosti | 2018-11-29 | 2 | -0/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | feat: update README to reflect lack of commonjs module | fragosti | 2018-11-27 | 1 | -29/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | feat: make package private | fragosti | 2018-11-27 | 1 | -7/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1351 from 0xProject/fix/instant/instant-bounces-on-error | Francesco Agosti | 2018-12-01 | 4 | -6/+20 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [instant] Fix instant bouncing around / height changes, don't allow labels to wrap | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-12-01 | 75 | -306/+6685 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | fix/instant/instant-bounces-on-error | ||||
| * | | | | | | | | | feat(order_utils.py): schema resolver cache (#1317) | Daniel Pyrathon | 2018-12-01 | 4 | -38/+81 |
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implemented basic functionality for using cache layer of LocalRefResolver * Use `importlib` instead of `imp`, since it's been deprecated. Legacy `load_module()` reloads modules even if they are already imported, causing tests to fail when run in non-deterministic ordering, so we replace it with `import_module()` | ||||
| * | | | | | | | | Merge pull request #1343 from 0xProject/feature/instant/quote-analytics | Steve Klebanoff | 2018-11-30 | 7 | -12/+62 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [instant] Quote analytics | ||||
| | * | | | | | | | | assetAmount -> assetBuyAmount | Steve Klebanoff | 2018-11-30 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'development' into feature/instant/quote-analytics | Steve Klebanoff | 2018-11-29 | 77 | -157/+504 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Use base unit value | Steve Klebanoff | 2018-11-29 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Move fetch origin out of options | Steve Klebanoff | 2018-11-29 | 5 | -17/+16 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fetchedVia -> fetchOrigin | Steve Klebanoff | 2018-11-29 | 6 | -12/+16 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | QuoteFetchedVia -> QuoteFetchOrigin | Steve Klebanoff | 2018-11-29 | 7 | -14/+14 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Take out asset name and data as we can use the selected event properties | Steve Klebanoff | 2018-11-29 | 2 | -16/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Tracking quote errors | Steve Klebanoff | 2018-11-28 | 2 | -0/+23 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | feat(instant): Quote fetch tracking | Steve Klebanoff | 2018-11-28 | 7 | -9/+39 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1345 from 0xProject/fix/instant/progress-bar-bg | Steve Klebanoff | 2018-11-30 | 3 | -7/+35 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | [instant] Progress bar background | ||||
| | * | | | | | | | | | fix(instant): Progress bar background color should be 10% primary color | Steve Klebanoff | 2018-11-29 | 3 | -7/+35 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #1303 from 0xProject/feature/contracts/optimizedAbiEncoder | Amir Bandeali | 2018-11-30 | 41 | -1/+4913 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Optimized ABI Encoder | ||||
| | * | | | | | | | | | Fix import export so that it works with doc gen | Fabio Berger | 2018-11-30 | 1 | -2/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Ran prettier | Greg Hysen | 2018-11-29 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Changelog for ABI Encoder | Greg Hysen | 2018-11-29 | 1 | -0/+9 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Linter / Prettier | Greg Hysen | 2018-11-29 | 3 | -13/+13 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Explicit imports for calldata | Greg Hysen | 2018-11-29 | 19 | -43/+46 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Explicit imports for abstract data types. | Greg Hysen | 2018-11-29 | 17 | -35/+42 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Explicit imports for EVM Data Types | Greg Hysen | 2018-11-29 | 14 | -77/+88 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Optimize calldata by default. | Greg Hysen | 2018-11-29 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Explicit encoding rules in tests. | Greg Hysen | 2018-11-29 | 4 | -102/+106 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Changed constants to an exported enum; this is 0x convention | Greg Hysen | 2018-11-29 | 17 | -73/+75 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Use SolidityTypes from `ethereum-types` package. | Greg Hysen | 2018-11-29 | 9 | -20/+25 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Use ethUti.isValidAddress in encoder | Greg Hysen | 2018-11-29 | 2 | -9/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed build error: was using `this` instead of class name to reference a ↵ | Greg Hysen | 2018-11-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static function that used to be an instance method. | ||||
| | * | | | | | | | | | Style cleanup. Improved wording of some error messages. | Greg Hysen | 2018-11-29 | 11 | -36/+43 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Changed remaining instances of implicit `bool` casts to explicit lodash calls | Greg Hysen | 2018-11-29 | 3 | -5/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Changed from <string>.startsWith to _.startsWith | Greg Hysen | 2018-11-29 | 7 | -7/+7 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Switched implicit conversions to explicit lodash calls | Greg Hysen | 2018-11-29 | 4 | -9/+9 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Replaced null/undefined checks with lodash | Greg Hysen | 2018-11-29 | 9 | -28/+33 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Tests use to.be.deep.equal instead of JSON | Greg Hysen | 2018-11-29 | 4 | -252/+84 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Ran prettier | Greg Hysen | 2018-11-29 | 5 | -12/+23 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Comments to Set datatype | Greg Hysen | 2018-11-29 | 1 | -42/+35 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Linter on Calldata | Greg Hysen | 2018-11-29 | 1 | -20/+19 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Moved some consts outside of a loop | Greg Hysen | 2018-11-29 | 1 | -5/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added inline documentation for Calldata class | Greg Hysen | 2018-11-29 | 2 | -84/+147 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Linter for Calldata Block Iterator | Greg Hysen | 2018-11-29 | 2 | -13/+26 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Moved calldata iterator logic into its own iterator clas | Greg Hysen | 2018-11-29 | 5 | -62/+119 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Payload -> Blob, Dependent -> Pointer, Member -> Set | Greg Hysen | 2018-11-29 | 25 | -132/+130 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Comments for Address | Greg Hysen | 2018-11-29 | 1 | -5/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Comments for Array | Greg Hysen | 2018-11-29 | 1 | -16/+23 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Comments and inline documentation for dynamic bytes | Greg Hysen | 2018-11-29 | 4 | -29/+40 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Removed abstract Number class. | Greg Hysen | 2018-11-29 | 3 | -59/+67 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Abstracted out encoding/decoding of numeric values into its own utility. ↵ | Greg Hysen | 2018-11-29 | 9 | -81/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Could be useful elsewhere. | ||||
| | * | | | | | | | | | Final rounds on evm data types | Greg Hysen | 2018-11-29 | 4 | -42/+59 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Moved encoder selector check into DataType | Greg Hysen | 2018-11-29 | 2 | -14/+10 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Made default encoding/decoding rules global to all modules in encoder | Greg Hysen | 2018-11-29 | 3 | -16/+18 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Removed mapDataItemToDataType from Factory. Now its just ::create() | Greg Hysen | 2018-11-29 | 4 | -42/+25 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Some minor cleanup in ABI Encoder | Greg Hysen | 2018-11-29 | 5 | -25/+26 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Prepended `front` to function names in Queue | Greg Hysen | 2018-11-29 | 3 | -14/+14 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Ran prettier | Greg Hysen | 2018-11-29 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | moved abi encoder constants into utils dir | Greg Hysen | 2018-11-29 | 14 | -15/+15 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Split ABI Encoder/Decoder tests into separate files | Greg Hysen | 2018-11-29 | 10 | -1854/+1868 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge above | Greg Hysen | 2018-11-29 | 6 | -0/+390 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Ran prettier | Greg Hysen | 2018-11-29 | 14 | -376/+15 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Ran prettier | Greg Hysen | 2018-11-29 | 11 | -11/+10 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Split Calldata into multiple files - 1 class per file | Greg Hysen | 2018-11-29 | 14 | -535/+571 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Split EVM data types and factory into separate files | Greg Hysen | 2018-11-29 | 18 | -587/+769 |
| | | | | | | | | | | |