Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update changelogs for unpublished packages | Fabio Berger | 2018-10-18 | 2 | -3/+19 |
| | |||||
* | refactor: fix anchor so it doesn't keep re-rendering the anchor icon | Fabio Berger | 2018-10-18 | 1 | -12/+18 |
| | |||||
* | nit: remove todo | Fabio Berger | 2018-10-17 | 1 | -1/+0 |
| | |||||
* | nit: don't init scrolledToId | Fabio Berger | 2018-10-17 | 1 | -4/+2 |
| | |||||
* | nit: use styled-component instead of react-state for onHover | Fabio Berger | 2018-10-17 | 2 | -27/+14 |
| | |||||
* | nit: use ObjectMap | Fabio Berger | 2018-10-17 | 1 | -1/+1 |
| | |||||
* | chore: Add topBar menu in wiki mobile sidebar menu | Fabio Berger | 2018-10-17 | 1 | -1/+29 |
| | |||||
* | chore: Rename "Documentation" to "Docs" in mobile menu | Fabio Berger | 2018-10-17 | 1 | -1/+1 |
| | |||||
* | chore: Add topBar menu items to mobile drawer | Fabio Berger | 2018-10-17 | 4 | -27/+65 |
| | |||||
* | chore: componentize the sidebar header | Fabio Berger | 2018-10-17 | 3 | -55/+70 |
| | |||||
* | chore: Add missing responsive classes | Fabio Berger | 2018-10-17 | 1 | -0/+12 |
| | |||||
* | chore: Fix logo on mobile topBar | Fabio Berger | 2018-10-17 | 1 | -2/+2 |
| | |||||
* | chore: fix linter | Fabio Berger | 2018-10-17 | 2 | -11/+1 |
| | |||||
* | chore: initalize _urlIntervalCheckId | Fabio Berger | 2018-10-17 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev-section-redesign' into reSkinReferenceDocs | Fabio Berger | 2018-10-16 | 360 | -47294/+15243 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dev-section-redesign: (87 commits) Added note about restriction on `testDirectory` fix(dev-utils): Make chai a dev dependency since exported interface depends on it Add changelog entries fix(subproviders): make web3-provider-engine types a 'dependency' so it's available to users of the library fix(sra-spec): make @loopback/openapi-v3-types a 'dependency' so it's available to users of the library fix(sol-cov): make @types/solidity-parser-antlr a 'dependency' so it's available to users of the library fix(dev-utils): make web3-provider-engine types a 'dependency' so it's available to users of the library fix(0x.js): make web3-provider-engine types a 'dependency' so it's available to users of the library fix(monorepo-scripts): Move the creation of the `.installation-test` directory OUTSIDE of the monorepo root, so that the installed packages can't reference the hoisted node_modules folder Remove ContractNotFound errors in contract-wrappers Update prettierignore Update website to use the new unsubscribeAll method in contract-wrappers In abi-gen-wrappers, ./wrappers -> ./src/generated-wrappers In contract-wrappers, remove setProvider and add unsubscribeAll method. take out explicit children definition in props Update json-schemas for contract-wrappers Add OrThrow suffix to getContractAddressesForNetwork remove unused import Update CHANGELOG.json for all changed packages Remove ContractAddresses from packages/types (mistake after rebase) ... | ||||
| * | merge development | Fabio Berger | 2018-10-16 | 361 | -47297/+15287 |
| |\ | |||||
| | * | Added note about restriction on `testDirectory` | Fabio Berger | 2018-10-16 | 1 | -0/+3 |
| | | | |||||
| | * | Merge pull request #1105 from 0xProject/feature/contracts-artifacts-re-org | Kadinsky | 2018-10-16 | 338 | -47248/+14527 |
| | |\ | | | | | | | | | Reorganize and modularize generated contract wrappers and artifacts | ||||
| | | * | fix(dev-utils): Make chai a dev dependency since exported interface depends ↵ | Fabio Berger | 2018-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | on it | ||||
| | | * | Add changelog entries | Fabio Berger | 2018-10-16 | 5 | -0/+35 |
| | | | | |||||
| | | * | fix(subproviders): make web3-provider-engine types a 'dependency' so it's ↵ | Fabio Berger | 2018-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | available to users of the library | ||||
| | | * | fix(sra-spec): make @loopback/openapi-v3-types a 'dependency' so it's ↵ | Fabio Berger | 2018-10-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | available to users of the library | ||||
| | | * | fix(sol-cov): make @types/solidity-parser-antlr a 'dependency' so it's ↵ | Fabio Berger | 2018-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | available to users of the library | ||||
| | | * | fix(dev-utils): make web3-provider-engine types a 'dependency' so it's ↵ | Fabio Berger | 2018-10-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | available to users of the library | ||||
| | | * | fix(0x.js): make web3-provider-engine types a 'dependency' so it's available ↵ | Fabio Berger | 2018-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | to users of the library | ||||
| | | * | fix(monorepo-scripts): Move the creation of the `.installation-test` ↵ | Fabio Berger | 2018-10-16 | 1 | -7/+1 |
| | | | | | | | | | | | | | | | | directory OUTSIDE of the monorepo root, so that the installed packages can't reference the hoisted node_modules folder | ||||
| | | * | Remove ContractNotFound errors in contract-wrappers | Alex Browne | 2018-10-16 | 8 | -79/+5 |
| | | | | |||||
| | | * | Update prettierignore | Alex Browne | 2018-10-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Update website to use the new unsubscribeAll method in contract-wrappers | Alex Browne | 2018-10-16 | 1 | -6/+5 |
| | | | | |||||
| | | * | In abi-gen-wrappers, ./wrappers -> ./src/generated-wrappers | Alex Browne | 2018-10-16 | 17 | -16/+12860 |
| | | | | |||||
| | | * | In contract-wrappers, remove setProvider and add unsubscribeAll method. | Alex Browne | 2018-10-16 | 14 | -72/+34 |
| | | | | |||||
| | | * | Update json-schemas for contract-wrappers | Alex Browne | 2018-10-16 | 4 | -87/+22 |
| | | | | |||||
| | | * | Add OrThrow suffix to getContractAddressesForNetwork | Alex Browne | 2018-10-16 | 4 | -7/+8 |
| | | | | |||||
| | | * | Update CHANGELOG.json for all changed packages | Alex Browne | 2018-10-16 | 6 | -2/+46 |
| | | | | |||||
| | | * | Remove ContractAddresses from packages/types (mistake after rebase) | Alex Browne | 2018-10-16 | 1 | -22/+0 |
| | | | | |||||
| | | * | Fix bug introduced during rebase | Alex Browne | 2018-10-16 | 1 | -0/+1 |
| | | | | |||||
| | | * | Fix failing doc generation tests | Alex Browne | 2018-10-16 | 8 | -19/+29 |
| | | | | |||||
| | | * | Fix linter errors in contract-wrappers | Alex Browne | 2018-10-16 | 3 | -5/+4 |
| | | | | |||||
| | | * | Add resolveJsonModule: true to test_installation.ts | Alex Browne | 2018-10-16 | 1 | -0/+1 |
| | | | | |||||
| | | * | Create CHANGELOG.json for three new packages | Alex Browne | 2018-10-16 | 3 | -0/+33 |
| | | | | |||||
| | | * | Add README.md for each new package | Alex Browne | 2018-10-16 | 4 | -1/+209 |
| | | | | |||||
| | | * | Update .gitignore and .prettierignore | Alex Browne | 2018-10-16 | 4 | -31/+0 |
| | | | | |||||
| | | * | Improve error handling for unknown network ids in contract-wrappers | Alex Browne | 2018-10-16 | 9 | -18/+31 |
| | | | | |||||
| | | * | Apply various PR feedback | Alex Browne | 2018-10-16 | 20 | -39/+25 |
| | | | | |||||
| | | * | Remove as any hack from artifacts in contracts package | Alex Browne | 2018-10-16 | 3 | -42/+38 |
| | | | | |||||
| | | * | Use contractAddresses directly in revert_validation_test.ts | Alex Browne | 2018-10-16 | 1 | -6/+4 |
| | | | | |||||
| | | * | Update .gitattributes | Alex Browne | 2018-10-16 | 1 | -1/+2 |
| | | | | |||||
| | | * | Introduce new contract-addresses package and use it everywhere | Alex Browne | 2018-10-16 | 33 | -112/+276 |
| | | | | |||||
| | | * | Remove networks/addresses from contract-artifacts package | Alex Browne | 2018-10-16 | 9 | -206/+9 |
| | | | | |||||
| | | * | Remove unused abi-gen dependencies | Alex Browne | 2018-10-16 | 2 | -2/+0 |
| | | | | |||||
| | | * | Remove unused copyfiles dependencies | Alex Browne | 2018-10-16 | 22 | -36/+0 |
| | | | | |||||
| | | * | Appease linter | Alex Browne | 2018-10-16 | 6 | -4/+16 |
| | | | | |||||
| | | * | Update order-watcher to use new migrations functions | Alex Browne | 2018-10-16 | 4 | -15/+18 |
| | | | | |||||
| | | * | Add new runMigrationsOnce method to migrations. Update contract-wrappers to ↵ | Alex Browne | 2018-10-16 | 15 | -105/+94 |
| | | | | | | | | | | | | | | | | use it. | ||||
| | | * | Fix linter errors in contract-wrappers | Alex Browne | 2018-10-16 | 5 | -6/+5 |
| | | | | |||||
| | | * | Cleanup migrations and contracts package. Make contracts private again. | Alex Browne | 2018-10-16 | 5 | -16/+13 |
| | | | | |||||
| | | * | Remove generated artifacts in the contracts package | Alex Browne | 2018-10-16 | 36 | -36120/+0 |
| | | | | |||||
| | | * | Add missing dependency to abi-gen-wrappers | Alex Browne | 2018-10-16 | 1 | -0/+1 |
| | | | | |||||
| | | * | Update testnet-faucets and website to work with new artifacts and abi-gen ↵ | Alex Browne | 2018-10-16 | 2 | -5/+33 |
| | | | | | | | | | | | | | | | | wrappers | ||||
| | | * | update order-watcher to use new artifacts and abi-gen wrappers packages | Alex Browne | 2018-10-16 | 8 | -98/+43 |
| | | | | |||||
| | | * | update asset-buyer to use new artifacts and abi-gen wrappers packages | Alex Browne | 2018-10-16 | 3 | -24/+19 |
| | | | | |||||
| | | * | update fill-scenarios to use new artifacts and abi-gen wrappers packages | Alex Browne | 2018-10-16 | 4 | -33/+6 |
| | | | | |||||
| | | * | update order-utils to use new artifacts and abi-gen wrappers packages | Alex Browne | 2018-10-16 | 7 | -39/+13 |
| | | | | |||||
| | | * | update contract_wrappers to use new artifacts and abi-gen wrappers packages | Alex Browne | 2018-10-16 | 15 | -134/+147 |
| | | | | |||||
| | | * | Create abi-gen-wrappers package | Alex Browne | 2018-10-16 | 8 | -139/+67 |
| | | | | |||||
| | | * | Create contract-artifacts package (needed to solve dependency cycle) | Alex Browne | 2018-10-16 | 20 | -0/+6270 |
| | | | | |||||
| | | * | Remove artifacts from migrations package and update contract-wrappers ↵ | Alex Browne | 2018-10-16 | 87 | -49977/+493 |
| | | | | | | | | | | | | | | | | accordingly | ||||
| | | * | Add generated contract wrappers in contracts package to gitignore | Alex Browne | 2018-10-16 | 35 | -30015/+2 |
| | | | | |||||
| | | * | Automatically collapse contract artifacts by adding them to .gitattributes | Alex Browne | 2018-10-16 | 1 | -0/+3 |
| | | | | |||||
| | | * | Change @0xproject/contracts version number back to 2.1.48 | Alex Browne | 2018-10-16 | 2 | -2/+2 |
| | | | | |||||
| | | * | Update .prettierignore | Alex Browne | 2018-10-16 | 1 | -5/+2 |
| | | | | |||||
| | | * | Update contract-wrappers package to use new contracts package for generated ↵ | Alex Browne | 2018-10-16 | 20 | -161/+1569 |
| | | | | | | | | | | | | | | | | files | ||||
| | | * | Move generated contract wrappers and artifacts into contracts package | Alex Browne | 2018-10-16 | 209 | -2461/+64959 |
| | | | | |||||
| | * | | Merge pull request #1135 from 0xProject/feature/instant-sliding-error | Steve Klebanoff | 2018-10-16 | 5 | -6/+152 |
| | |\ \ | | | |/ | | |/| | [instant] Generic sliding error component | ||||
| | | * | take out explicit children definition in props | Steve Klebanoff | 2018-10-16 | 1 | -1/+0 |
| | | | | |||||
| | | * | remove unused import | Steve Klebanoff | 2018-10-16 | 1 | -1/+0 |
| | | | | |||||
| | | * | move z-index setting to zero instant container, and add ability for zindex ↵ | Steve Klebanoff | 2018-10-16 | 3 | -2/+10 |
| | | | | | | | | | | | | | | | | to be set on container | ||||
| | | * | get rid of unused marginLeft and marginRight props | Steve Klebanoff | 2018-10-16 | 1 | -4/+0 |
| | | | | |||||
| | | * | better private function syntax | Steve Klebanoff | 2018-10-16 | 1 | -2/+2 |
| | | | | |||||
| | | * | dont need constructor just to set state | Steve Klebanoff | 2018-10-16 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | git status | ||||
| | | * | change to ? syntax instead of number | undefined | Steve Klebanoff | 2018-10-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | suggestions from code review: renaming timeoutNumber to timeoutId, sharing ↵ | Steve Klebanoff | 2018-10-16 | 2 | -23/+19 |
| | | | | | | | | | | | | | | | | interface, renaming component | ||||
| | | * | add semicolons | Steve Klebanoff | 2018-10-16 | 1 | -2/+2 |
| | | | | |||||
| | | * | feat(instant): add sliding error | Steve Klebanoff | 2018-10-13 | 5 | -6/+152 |
| | | | | |||||
| | | * | feat: add Steve to team page | Steve Klebanoff | 2018-10-13 | 2 | -0/+11 |
| | | | | |||||
| | * | | feat: update CODEOWNERS for asset-buyer, instant, and website | Brandon Millman | 2018-10-16 | 1 | -1/+3 |
| | | | | |||||
| | * | | chore: Export Stats from types, not indirectly from OrderWatcher | Fabio Berger | 2018-10-15 | 1 | -1/+2 |
| | | | | |||||
| | * | | chore: Export stats type from 0x.js | Fabio Berger | 2018-10-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge pull request #1118 from BEcorp/development | Kadinsky | 2018-10-15 | 5 | -1/+40 |
| | |\ \ | | | | | | | | | | | [order-watcher] Public function getStats | ||||
| | | * \ | Merge branch 'development' into development | Andrew Maurer | 2018-10-13 | 139 | -1396/+3898 |
| | | |\ \ | |||||
| | | * | | | Exported Stats in OW package | amaurer | 2018-10-13 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Fixes per converstaion, stats interface to pub | amaurer | 2018-10-12 | 3 | -9/+9 |
| | | | | | | |||||
| | | * | | | Fixed accidental carriage return removal in index.ts | amaurer | 2018-10-08 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Changed getWatchedOrders to getStats and returns Stats object | amaurer | 2018-10-08 | 4 | -10/+16 |
| | | | | | | |||||
| | | * | | | Fix lint issues | amaurer | 2018-10-06 | 2 | -2/+1 |
| | | | | | | |||||
| | | * | | | Fixed linting issue | amaurer | 2018-10-06 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Update order-watcher changelog | amaurer | 2018-10-06 | 1 | -0/+9 |
| | | | | | | |||||
| | | * | | | Added comments to new getWatchCounts function | amaurer | 2018-10-06 | 1 | -0/+4 |
| | | | | | | |||||
| | | * | | | Added orderWatchCount to return total count of orders watched. | amaurer | 2018-10-06 | 2 | -0/+20 |
| | | | | | | |||||
| | * | | | | Merge pull request #1134 from ↵ | Brandon Millman | 2018-10-15 | 3 | -38/+140 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | 0xProject/feature/contract-wrappers/forwarder-wrapper-validation [contract-wrappers] Add optional validation to the forwarder wrapper | ||||
| | | * | | | feat(contract-wrappers): add optional validation to the forwarder wrapper | Brandon Millman | 2018-10-13 | 3 | -38/+140 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to the approach taken in exchange wrapper, make a call to an rpc node in order to simulate the transaction before actually sending the transaction. The decorator will parse revert reasons and other types of errors into canonical errors that a consumer of the library expects when interacting with a contract wrapper. | ||||
| | * | | | fix: linter | F. Eugene Aumson | 2018-10-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fix: use python's extsplit, not manual splicing | F. Eugene Aumson | 2018-10-13 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | feat(python/order_utils): project stub | F. Eugene Aumson | 2018-10-13 | 15 | -1/+364 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An empty project, with respect to functionality, but one configured with a test framework, linters, CI integration, etc. https://app.asana.com/0/836857747873847/839549782781239/f | ||||
| | | * | | | feat: project stub for python order utilities | F. Eugene Aumson | 2018-10-13 | 15 | -1/+364 |
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | An empty project, with respect to functionality, but one configured with a test framework, linters, CI integration, etc. https://app.asana.com/0/836857747873847/839549782781239/f | ||||
| | * | | | Merge pull request #1132 from 0xProject/removeRollbarUMD | Kadinsky | 2018-10-13 | 3 | -3/+44 |
| | |\ \ \ | | | | | | | | | | | | | fix(website): replace Rollbar UMD with regular npm package | ||||
| | | * | | | Update yarn.lock | Fabio Berger | 2018-10-11 | 1 | -7/+0 |
| | | | | | | |||||
| | | * | | | fix(website): replace Rollbar UMD with regular npm package | Fabio Berger | 2018-10-11 | 3 | -3/+51 |
| | | | | | | |||||
| | * | | | | Merge pull request #1128 from 0xProject/feature/add-steve-to-team | Steve Klebanoff | 2018-10-12 | 2 | -0/+11 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | [website] add Steve to team page | ||||
| | | * | | | feat: add Steve to team page | Steve Klebanoff | 2018-10-11 | 2 | -0/+11 |
| | | | | | | |||||
| | * | | | | Use medium+ resource class for build-website (#1129) | Alex Browne | 2018-10-12 | 1 | -0/+1 |
| | | |/ / | | |/| | | |||||
* | | | | | chore: don't use Container in react-shared, react-docs yet | Fabio Berger | 2018-10-16 | 5 | -68/+18 |
| | | | | | |||||
* | | | | | chore: remove unused prop | Fabio Berger | 2018-10-16 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | chore: Remove unused prop | Fabio Berger | 2018-10-16 | 2 | -6/+1 |
| | | | | | |||||
* | | | | | chore: convert to stateless component | Fabio Berger | 2018-10-16 | 1 | -7/+3 |
| | | | | | |||||
* | | | | | chore: simplify | Fabio Berger | 2018-10-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | style: improve menu & logo alignment | Fabio Berger | 2018-10-16 | 1 | -2/+5 |
| | | | | | |||||
* | | | | | chore: Implement newest topBar | Fabio Berger | 2018-10-16 | 4 | -77/+25 |
| | | | | | |||||
* | | | | | chore: remove unused imports | Fabio Berger | 2018-10-16 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | chore: get menu onHover darken back | Fabio Berger | 2018-10-16 | 1 | -37/+27 |
| | | | | | |||||
* | | | | | chore: change landing "build on 0x" to link to developer home, not 0x.js docs | Fabio Berger | 2018-10-16 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | chore: remove wiki from main website topBar | Fabio Berger | 2018-10-16 | 1 | -32/+1 |
| | | | | | |||||
* | | | | | chore: Replace FAQ with Developer home in footer | Fabio Berger | 2018-10-16 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Replace sandbox with wiki in developer popover | Fabio Berger | 2018-10-16 | 1 | -5/+4 |
| | | | | | |||||
* | | | | | chore: move wiki to Developers section | Fabio Berger | 2018-10-16 | 3 | -149/+65 |
| | | | | | |||||
* | | | | | chore: fix padding issue | Fabio Berger | 2018-10-16 | 1 | -3/+5 |
| | | | | | |||||
* | | | | | chore: replace Github with Wiki in topBar and refactor so can display ↵ | Fabio Berger | 2018-10-16 | 1 | -15/+21 |
| | | | | | | | | | | | | | | | | | | | | internal & external links | ||||
* | | | | | feat: highlighted sidebar as you scroll on doc reference pages | Fabio Berger | 2018-10-16 | 5 | -20/+58 |
| | | | | | |||||
* | | | | | chore: Remove unused state | Fabio Berger | 2018-10-15 | 1 | -19/+1 |
| | | | | | |||||
* | | | | | Chore: Only render one sidebar at a time | Fabio Berger | 2018-10-15 | 2 | -3/+5 |
| | | | | | |||||
* | | | | | fix: menu item overflow issue | Fabio Berger | 2018-10-15 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | chore: improve rendering of sidebar top section on mobile | Fabio Berger | 2018-10-15 | 2 | -2/+6 |
| | | | | | |||||
* | | | | | chore: fix missed class rename | Fabio Berger | 2018-10-15 | 1 | -11/+1 |
| | | | | | |||||
* | | | | | fix: Nested a tag warning in console by not rendering a tags within type ↵ | Fabio Berger | 2018-10-15 | 3 | -43/+54 |
| | | | | | | | | | | | | | | | | | | | | definition popovers | ||||
* | | | | | chore: improve colors | Fabio Berger | 2018-10-15 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | chore: many small stylistic changes | Fabio Berger | 2018-10-15 | 8 | -9/+110 |
| | | | | | |||||
* | | | | | chore: improve styling of sidebar | Fabio Berger | 2018-10-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | chore: fix key issue | Fabio Berger | 2018-10-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | chore: round border of code snippets | Fabio Berger | 2018-10-15 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | chore: only show sidebar once docs have loaded | Fabio Berger | 2018-10-14 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | fix: Dropdown component so that re-clicking the activeNode when dropdown is ↵ | Fabio Berger | 2018-10-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | open, closes it | ||||
* | | | | | Fix sidebar top so long titles display correctly | Fabio Berger | 2018-10-14 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Chore: remove unused imports | Fabio Berger | 2018-10-13 | 1 | -6/+3 |
| | | | | | |||||
* | | | | | Fix: Make width variable | Fabio Berger | 2018-10-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Remove doc menus from main topBar | Fabio Berger | 2018-10-13 | 1 | -65/+4 |
| | | | | | |||||
* | | | | | Implement new version dropdown and remove it from nestedTopBar | Fabio Berger | 2018-10-13 | 5 | -62/+124 |
| | | | | | |||||
* | | | | | Fix sidebar shifting onHover due to scrollbar width | Fabio Berger | 2018-10-13 | 1 | -2/+11 |
| | | | | | |||||
* | | | | | fix: Remove unnecessary onClick prop from NestedSidebar, since one can ↵ | Fabio Berger | 2018-10-13 | 2 | -16/+3 |
| | | | | | | | | | | | | | | | | | | | | listen to container element onClick | ||||
* | | | | | Pass down sidebar instead of sectionNameToLinks | Fabio Berger | 2018-10-13 | 4 | -19/+17 |
| | | | | | |||||
* | | | | | Make all doc reference pages responsive | Fabio Berger | 2018-10-12 | 11 | -11/+33 |
| | | | | | |||||
* | | | | | Improve loading | Fabio Berger | 2018-10-12 | 1 | -26/+17 |
| | | | | | |||||
* | | | | | If sidebar menu item links to internal page, no longer open in new tab | Fabio Berger | 2018-10-12 | 1 | -15/+0 |
| | | | | | |||||
* | | | | | Add Getting starter sidebar header | Fabio Berger | 2018-10-12 | 11 | -35/+24 |
| | | | | | |||||
* | | | | | Refactor Home so that Dev section chrome is reusable across pages | Fabio Berger | 2018-10-12 | 14 | -854/+780 |
| | | | | | |||||
* | | | | | chore: update yarn.lock | Fabio Berger | 2018-10-11 | 1 | -7/+0 |
| | | | | | |||||
* | | | | | style: Make width of developer section same as rest of website (1064px) | Fabio Berger | 2018-10-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | merge dev-section-redesign | Fabio Berger | 2018-10-11 | 122 | -1386/+3478 |
|\| | | | | |||||
| * | | | | Merge branch 'development' into dev-section-redesign | Fabio Berger | 2018-10-11 | 122 | -1393/+3478 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (62 commits) Fix linter error Upgrade ethereum-types Lint and update deps Be more explicit with falsiness Add type to cssRuleIfExists Fix issue where we throw if non-numeric characters are used in input Upgrade to more recent types, fix yarn.lock [fix]: [testnet-faucet] Exit 1 on build fail Explains tools we want them to use Add note about button Add dev-tools-pages bundles to gitignore Improve README Fix button and center Increase max bundle size for instant Add stuff Initial project scaffolding Change tslint config to remove conflicts with prettier fix: [testnet-faucet] Signing of orders Update the CHANGELOG Add comments for expiryBuffer ... | ||||
| | * | | | Merge pull request #1125 from 0xProject/feature/starter-dev-tools-pages | Leonid Logvinov | 2018-10-11 | 24 | -39/+1305 |
| | |\ \ \ | | | | | | | | | | | | | Initial project scaffolding for dev tools pages | ||||
| | | * | | | Fix linter error | Leonid Logvinov | 2018-10-11 | 1 | -2/+0 |
| | | | | | | |||||
| | | * | | | Explains tools we want them to use | Fabio Berger | 2018-10-11 | 1 | -0/+14 |
| | | | | | | |||||
| | | * | | | Add note about button | Fabio Berger | 2018-10-11 | 1 | -0/+4 |
| | | | | | | |||||
| | | * | | | Add dev-tools-pages bundles to gitignore | Fabio Berger | 2018-10-11 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Improve README | Fabio Berger | 2018-10-11 | 1 | -12/+27 |
| | | | | | | |||||
| | | * | | | Fix button and center | Fabio Berger | 2018-10-11 | 2 | -10/+12 |
| | | | | | | |||||
| | | * | | | Add stuff | Fabio Berger | 2018-10-10 | 14 | -43/+936 |
| | | | | | | |||||
| | | * | | | Initial project scaffolding | Leonid Logvinov | 2018-10-10 | 16 | -91/+342 |
| | | |/ / | |||||
| | * | | | Merge pull request #1114 from 0xProject/feature/instant/redux-styles-container | Francesco Agosti | 2018-10-11 | 24 | -126/+691 |
| | |\ \ \ | | | | | | | | | | | | | [instant] Add styles and redux to instant | ||||
| | | * | | | Upgrade ethereum-types | fragosti | 2018-10-11 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Lint and update deps | fragosti | 2018-10-11 | 2 | -3/+3 |
| | | | | | | |||||
| | | * | | | Be more explicit with falsiness | fragosti | 2018-10-11 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Add type to cssRuleIfExists | fragosti | 2018-10-11 | 1 | -1/+2 |
| | | | | | | |||||
| | | * | | | Fix issue where we throw if non-numeric characters are used in input | fragosti | 2018-10-11 | 1 | -2/+7 |
| | | | | | | |||||
| | | * | | | Upgrade to more recent types, fix yarn.lock | fragosti | 2018-10-11 | 2 | -10/+5 |
| | | | | | | |||||
| | | * | | | Increase max bundle size for instant | fragosti | 2018-10-11 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Change tslint config to remove conflicts with prettier | fragosti | 2018-10-10 | 1 | -1/+2 |
| | | | | | | |||||
| | | * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-10-10 | 78 | -1354/+1518 |
| | | |\| | | | | | | | | | | | | | | | | | | | | feature/instant/redux-styles-container | ||||
| | | * | | | Fix empty input bug | fragosti | 2018-10-10 | 2 | -5/+9 |
| | | | | | | |||||
| | | * | | | Center 0x instant | fragosti | 2018-10-10 | 1 | -3/+4 |
| | | | | | | |||||
| | | * | | | Apply linter | fragosti | 2018-10-05 | 6 | -12/+10 |
| | | | | | | |||||
| | | * | | | Create SelectedAssetInputAmount | fragosti | 2018-10-05 | 6 | -15/+72 |
| | | | | | | |||||
| | | * | | | Add Input and AmountInput component | fragosti | 2018-10-05 | 5 | -3/+75 |
| | | | | | | |||||
| | | * | | | Add border radios | fragosti | 2018-10-05 | 2 | -2/+2 |
| | | | | | | |||||
| | | * | | | Add box shadow and default box-sizing: border-box to container | fragosti | 2018-10-05 | 5 | -9/+11 |
| | | | | | | |||||
| | | * | | | Add BuyButton and other small improvement | fragosti | 2018-10-05 | 7 | -19/+147 |
| | | | | | | |||||
| | | * | | | Add faux order details section | fragosti | 2018-10-05 | 3 | -40/+15 |
| | | | | | | |||||
| | | * | | | Create zrx instant container heading | fragosti | 2018-10-05 | 3 | -21/+37 |
| | | | | | | |||||
| | | * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-10-05 | 90 | -398/+508 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | feature/instant/redux-styles-container | ||||
| | | * | | | | apply prettier | fragosti | 2018-10-05 | 1 | -7/+1 |
| | | | | | | | |||||
| | | * | | | | Fix currupted yarn lock file | fragosti | 2018-10-05 | 1 | -6/+6 |
| | | | | | | | |||||
| | | * | | | | Remove deps we probably dont need | fragosti | 2018-10-05 | 2 | -49/+35 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-10-05 | 22 | -556/+758 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | feature/instant/redux-styles-container | ||||
| | | * | | | | | Fix linting problems | fragosti | 2018-10-05 | 3 | -4/+4 |
| | | | | | | | | |||||
| | | * | | | | | Improve utilities and try to use them in simple form component | fragosti | 2018-10-05 | 8 | -23/+89 |
| | | | | | | | | |||||
| | | * | | | | | Add Flex and Container component | fragosti | 2018-10-05 | 3 | -0/+91 |
| | | | | | | | | |||||
| | | * | | | | | Add some ui components | fragosti | 2018-10-04 | 7 | -14/+172 |
| | | | | | | | | |||||
| | | * | | | | | Add Inter UI font | fragosti | 2018-10-04 | 2 | -2/+7 |
| | | | | | | | | |||||
| | | * | | | | | Add redux to 0x instant | fragosti | 2018-10-04 | 6 | -26/+60 |
| | | | | | | | | |||||
| | | * | | | | | Add styled-components with theme | fragosti | 2018-10-04 | 4 | -2/+70 |
| | | | | | | | | |||||
| | * | | | | | | [fix]: [testnet-faucet] Exit 1 on build fail | Jacob Evans | 2018-10-11 | 1 | -18/+17 |
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | If we detect any compilation errors then exit with 1 | ||||
| | * | | | | | Merge pull request #1116 from 0xProject/feature/asset-buyer/api-tweaks | Brandon Millman | 2018-10-10 | 7 | -18/+40 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | [asset-buyer] Fix order expiration calc bug and expose gas options to executeBuyQuote | ||||
| | | * \ \ \ \ | Merge branch 'development' into feature/asset-buyer/api-tweaks | Brandon Millman | 2018-10-10 | 69 | -1242/+1477 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Define bundlewatch.ci.repoBranchBase Stop accesing ethers private methods Fix merge conflicts Fix ethers build issue Upgrade ethers.js version Fix branch name Add max sizes Use bundlewatch instead of bundlesize Move Metamask Error to OrderErrors Update the exported types for the packages which touch RPC providers Throw and handle errors from Providers. Clarifies use of schemas outside of Javascript/TypeScript. Detect MM on signature validation failure. Return SignedOrder from signing utils. Update 0x.js Changelog Add eth_signTypedData support to our wallet subproviders Move SignTypedData to utils package Introduce Metamask Subprovider. Expose eth_signTypedData functionality for order signing | ||||
| | | * | | | | | | Update the CHANGELOG | Brandon Millman | 2018-10-10 | 1 | -0/+8 |
| | | | | | | | | | |||||
| | | * | | | | | | Add comments for expiryBuffer | Brandon Millman | 2018-10-10 | 2 | -2/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Fix incorrect affiliate fee calculations and associated tests | Brandon Millman | 2018-10-06 | 2 | -14/+20 |
| | | | | | | | | | |||||
| | | * | | | | | | Increase default expiryBufferSeconds from 15 to 300 (5 minutes) | Brandon Millman | 2018-10-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Add comments for gasPrice and gasLimit | Brandon Millman | 2018-10-06 | 1 | -0/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Fix order expiration calc bug and expose gas options to executeBuyQuote | fragosti | 2018-10-06 | 3 | -2/+8 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | fix: [testnet-faucet] Signing of orders | Jacob Evans | 2018-10-10 | 1 | -3/+1 |
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Signing of orders changed in order-utils but forgot to update testnet faucet | ||||
| | * | | | | | Merge pull request #1122 from 0xProject/feature/new-ethers | Leonid Logvinov | 2018-10-09 | 16 | -24/+29 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Upgrade ethers.js version | ||||
| | | * | | | | | Define bundlewatch.ci.repoBranchBase | Leonid Logvinov | 2018-10-09 | 1 | -1/+2 |
| | | | | | | | | |||||
| | | * | | | | | Stop accesing ethers private methods | Leonid Logvinov | 2018-10-09 | 3 | -9/+7 |
| | | | | | | | | |||||
| | | * | | | | | Fix merge conflicts | Leonid Logvinov | 2018-10-09 | 1 | -0/+39 |
| | | | | | | | | |||||
| | | * | | | | | Fix ethers build issue | Leonid Logvinov | 2018-10-09 | 4 | -52/+19 |
| | | | | | | | | |||||
| | | * | | | | | Upgrade ethers.js version | Leonid Logvinov | 2018-10-09 | 11 | -11/+11 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #1123 from 0xProject/feature/artifacts | Leonid Logvinov | 2018-10-09 | 3 | -14/+87 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Use bundlewatch instead of bundlesize | ||||
| | | * | | | | | Fix branch name | Leonid Logvinov | 2018-10-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Add max sizes | Leonid Logvinov | 2018-10-09 | 1 | -2/+4 |
| | | | | | | | | |||||
| | | * | | | | | Use bundlewatch instead of bundlesize | Leonid Logvinov | 2018-10-09 | 3 | -14/+85 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #1102 from 0xProject/feature/0x.js/eip712-sign-typed-data | Jacob Evans | 2018-10-09 | 53 | -1204/+1361 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | [0x.js][order-utils][web3-wrapper] Expose eth_signTypedData functionality for order signing | ||||
| | | * | | | | | Move Metamask Error to OrderErrors | Jacob Evans | 2018-10-09 | 3 | -10/+9 |
| | | | | | | | | |||||
| | | * | | | | | Update the exported types for the packages which touch RPC providers | Jacob Evans | 2018-10-09 | 5 | -3/+24 |
| | | | | | | | | |||||
| | | * | | | | | Throw and handle errors from Providers. | Jacob Evans | 2018-10-09 | 23 | -150/+208 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In web3 wrapper when a response contains an error field we throw this rather than return response.result which is often undefined. In Signature Utils we handle the error thrown when a user rejects the signing dialogue to prevent double signing. Exposed the ZeroExTransaction JSON schema. In Website only use the MetamaskSubprovider if we can detect the provider is Metamask | ||||
| | | * | | | | | Detect MM on signature validation failure. | Jacob Evans | 2018-10-08 | 1 | -24/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report a developer friendly error in this event to educate them on the compatability wrapper MetamaskSubprovider | ||||
| | | * | | | | | Return SignedOrder from signing utils. | Jacob Evans | 2018-10-05 | 25 | -192/+380 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a helper back in EIP712Utils for code cleanup. Moved constants in order-utils into the constants object | ||||
| | | * | | | | | Update 0x.js Changelog | Jacob Evans | 2018-10-05 | 1 | -0/+18 |
| | | | | | | | | |||||
| | | * | | | | | Add eth_signTypedData support to our wallet subproviders | Jacob Evans | 2018-10-05 | 20 | -86/+326 |
| | | | | | | | | |||||
| | | * | | | | | Move SignTypedData to utils package | Jacob Evans | 2018-10-05 | 9 | -152/+234 |
| | | | | | | | | |||||
| | | * | | | | | Introduce Metamask Subprovider. | Jacob Evans | 2018-10-05 | 15 | -444/+277 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MM has a number of inconsistencies with other providers when implementing the JSON RPC interface. This subprovider wraps those nuances so they do not leak into the rest of our code | ||||
| | | * | | | | | Expose eth_signTypedData functionality for order signing | Jacob Evans | 2018-10-05 | 10 | -531/+245 |
| | | |/ / / / | |||||
* | | | | | | | fix(website): remove deadzone between "Developers" menu item and dropdown so ↵ | Fabio Berger | 2018-10-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | it never closes when hovering between the two | ||||
* | | | | | | | fix(website): Avoid hover activated dropdown from closing when activeNode is ↵ | Fabio Berger | 2018-10-11 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicked | ||||
* | | | | | | | Replace Rollbar UMD with regular import | Fabio Berger | 2018-10-10 | 3 | -3/+44 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'development' into dev-section-redesign | Fabio Berger | 2018-10-09 | 98 | -460/+879 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Clarifies use of schemas outside of Javascript/TypeScript. Fix typo Add asset-buyer to published packages section in README Publish Updated CHANGELOGS Update BuyQuote interface Add missing default options Remove unused constants Add fee order with a takerFee Add additional order factory methods and refactor test to use them Add comments about buy quote calculation Update CHANGELOG Fix linter Add additional test for slippage Add buy_quote_calculator_test | ||||
| * | | | | | Merge pull request #1121 from nebkor/development | Fabio Berger | 2018-10-09 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Clarifies use of schemas outside of Javascript/TypeScript. | ||||
| | * | | | | Clarifies use of schemas outside of Javascript/TypeScript. | Joe Ardent | 2018-10-08 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Fix typo | Brandon Millman | 2018-10-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add asset-buyer to published packages section in README | Brandon Millman | 2018-10-05 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
| * | | | Publishethereum-types@1.0.11contracts@2.1.49@0xproject/website@0.0.54@0xproject/web3-wrapper@3.0.3@0xproject/utils@2.0.2@0xproject/typescript-typings@3.0.2@0xproject/types@1.1.4@0xproject/tslint-config@1.0.8@0xproject/testnet-faucets@1.0.51@0xproject/subproviders@2.0.7@0xproject/sra-spec@1.0.6@0xproject/sra-report@1.0.13@0xproject/sol-resolver@1.0.14@0xproject/sol-doc@1.0.2@0xproject/sol-cov@2.1.7@0xproject/sol-compiler@1.1.7@0xproject/react-shared@1.0.15@0xproject/react-docs@1.0.13@0xproject/order-watcher@2.1.1@0xproject/order-utils@1.0.7@0xproject/monorepo-scripts@1.0.11@0xproject/migrations@1.0.14@0xproject/metacoin@0.0.23@0xproject/json-schemas@1.0.7@0xproject/instant@0.0.2@0xproject/fill-scenarios@1.0.7@0xproject/dev-utils@1.0.12@0xproject/contract-wrappers@2.0.2@0xproject/connect@3.0.1@0xproject/base-contract@3.0.1@0xproject/asset-buyer@2.0.0@0xproject/assert@1.0.13@0xproject/abi-gen@1.0.130x.js@1.0.8 | Brandon Millman | 2018-10-05 | 34 | -260/+260 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.8 - @0xproject/abi-gen@1.0.13 - @0xproject/assert@1.0.13 - @0xproject/asset-buyer@2.0.0 - @0xproject/base-contract@3.0.1 - @0xproject/connect@3.0.1 - @0xproject/contract-wrappers@2.0.2 - contracts@2.1.49 - @0xproject/dev-utils@1.0.12 - ethereum-types@1.0.11 - @0xproject/fill-scenarios@1.0.7 - @0xproject/instant@0.0.2 - @0xproject/json-schemas@1.0.7 - @0xproject/metacoin@0.0.23 - @0xproject/migrations@1.0.14 - @0xproject/monorepo-scripts@1.0.11 - @0xproject/order-utils@1.0.7 - @0xproject/order-watcher@2.1.1 - @0xproject/react-docs@1.0.13 - @0xproject/react-shared@1.0.15 - @0xproject/sol-compiler@1.1.7 - @0xproject/sol-cov@2.1.7 - @0xproject/sol-doc@1.0.2 - @0xproject/sol-resolver@1.0.14 - @0xproject/sra-report@1.0.13 - @0xproject/sra-spec@1.0.6 - @0xproject/subproviders@2.0.7 - @0xproject/testnet-faucets@1.0.51 - @0xproject/tslint-config@1.0.8 - @0xproject/types@1.1.4 - @0xproject/typescript-typings@3.0.2 - @0xproject/utils@2.0.2 - @0xproject/web3-wrapper@3.0.3 - @0xproject/website@0.0.54 | ||||
| * | | | Updated CHANGELOGS | Brandon Millman | 2018-10-05 | 56 | -141/+251 |
| | |/ | |/| | |||||
| * | | Merge pull request #1113 from 0xProject/feature/asset-buyer/tests | Brandon Millman | 2018-10-05 | 7 | -58/+366 |
| |\ \ | | | | | | | | | [asset-buyer] Rework min / max rate calc and add tests | ||||
| | * | | Update BuyQuote interface | Brandon Millman | 2018-10-05 | 5 | -40/+73 |
| | | | | |||||
| | * | | Add missing default options | Brandon Millman | 2018-10-04 | 1 | -3/+6 |
| | | | | |||||
| | * | | Remove unused constants | Brandon Millman | 2018-10-04 | 1 | -3/+0 |
| | | | | |||||
| | * | | Add fee order with a takerFee | Brandon Millman | 2018-10-04 | 1 | -2/+6 |
| | | | | |||||
| | * | | Add additional order factory methods and refactor test to use them | Brandon Millman | 2018-10-04 | 2 | -61/+61 |
| | | | | |||||
| | * | | Add comments about buy quote calculation | Brandon Millman | 2018-10-04 | 1 | -0/+2 |
| | | | | |||||
| | * | | Update CHANGELOG | Brandon Millman | 2018-10-04 | 1 | -0/+4 |
| | | | | |||||
| | * | | Fix linter | Brandon Millman | 2018-10-04 | 1 | -2/+0 |
| | | | | |||||
| | * | | Add additional test for slippage | Brandon Millman | 2018-10-04 | 2 | -18/+70 |
| | | | |