aboutsummaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Expand)AuthorAgeFilesLines
* Change rpcUrls keys back into string literalsBrandon Millman2018-02-071-4/+4
* Add types-bn package to 0x.js and testnet-faucetsBrandon Millman2018-02-072-0/+2
* PrettierBrandon Millman2018-02-072-2/+3
* Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0727-162/+91
|\
| * Reword comment on anyJacob Evans2018-02-061-1/+2
| * Merge pull request #363 from 0xProject/refactor/subproviders/injected-provide...Jacob Evans2018-02-064-7/+13
| |\
| | * Link to the wiki article in the READMEJacob Evans2018-02-061-0/+2
| | * Justify the any usageJacob Evans2018-02-061-1/+2
| | * ChangelogJacob Evans2018-02-031-1/+5
| | * Change the InjectedWeb3Subprovider to accept Web3.ProviderJacob Evans2018-02-032-6/+5
| * | Publishcontracts@2.1.9@0xproject/website@0.0.12@0xproject/testnet-faucets@1.0.10@0xproject/monorepo-scripts@0.1.9@0xproject/deployer@0.0.6Leonid Logvinov2018-02-0617-77/+77
| * | Revert "Temp"Leonid Logvinov2018-02-066-78/+0
* | | Addressed comments and update 0xProject/types-ethereumjs-util depsBrandon Millman2018-02-0612-106/+77
* | | Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-06110-6927/+6078
|\| |
| * | Add dates to CHANGELOGsLeonid Logvinov2018-02-062-2/+2
| * | Merge branch 'development' of github.com:0xProject/0x.js into developmentLeonid Logvinov2018-02-066-13/+55
| |\ \
| | * | Change CHANGELOGsLeonid Logvinov2018-02-062-2/+2
| | * | Merge branch 'development' into fix/abi_decoder_colisionLeonid2018-02-064-4/+29
| | |\ \
| | | * | Fix a typoLeonid Logvinov2018-02-061-1/+1
| | | * | Fix prettierLeonid Logvinov2018-02-051-1/+0
| | | * | Merge branch 'development' into fix/ether_token_addressLeonid2018-02-05238-8708/+8247
| | | |\ \
| | | * | | Add regression testsLeonid Logvinov2018-02-051-0/+12
| | | * | | Improve the comment and fix an exceptionLeonid Logvinov2018-02-051-3/+7
| | | * | | Update CHANGELOGLeonid Logvinov2018-01-301-0/+4
| | | * | | Fix linter errorsLeonid Logvinov2018-01-301-1/+0
| | | * | | Add zeroEx.etherToken.getContractAddressifExistsLeonid Logvinov2018-01-303-2/+11
| | * | | | Use forEach instead of mapLeonid Logvinov2018-02-052-4/+8
| | * | | | Add PR numberLeonid Logvinov2018-02-051-1/+1
| | * | | | Fix an exception when a signature collision happensLeonid Logvinov2018-02-052-5/+18
| | | |/ / | | |/| |
| * / | | TempLeonid Logvinov2018-02-066-0/+78
| |/ / /
| * | | Add missing comasLeonid Logvinov2018-02-052-2/+2
| * | | Merge branch 'development' into feature/build_watchLeonid2018-02-0591-6894/+5856
| |\ \ \ | | | |/ | | |/|
| | * | Update contract versions, fix testsAmir Bandeali2018-02-0327-88/+90
| | * | Rename directoriesAmir Bandeali2018-02-0363-6429/+5551
| | * | Rename previous contracts, fix imports, add nested file structureAmir Bandeali2018-02-0325-34/+32
| | * | Move all contracts into a single directoryFabio Berger2018-02-0324-7/+8
| | * | Update importFabio Berger2018-02-031-1/+1
| | * | Fix importFabio Berger2018-02-031-1/+1
| | * | Get rid of suffixed contract versioning and replace it with a poor-mans packa...Fabio Berger2018-02-0326-346/+136
| | * | Add solc 0.4.19Remco Bloemen2018-02-022-0/+23
| | * | Publishcontracts@2.1.8@0xproject/website@0.0.11@0xproject/testnet-faucets@1.0.9@0xproject/monorepo-scripts@0.1.8@0xproject/deployer@0.0.5Leonid Logvinov2018-02-0118-107/+124
| | * | Fix linter errorsLeonid Logvinov2018-02-011-2/+2
| | * | Update changelogLeonid Logvinov2018-02-011-0/+4
| | * | Merge pull request #357 from ERCdEX/luke/zrx_order_watch_cacheLeonid2018-02-011-1/+5
| | |\ \
| | | * | don't remove maker/zrx order from cache twiceLuke Autry2018-02-011-1/+5
| | * | | Add OrderWatcherConfig to the list of public typesLeonid Logvinov2018-02-011-0/+1
| | |/ /
| * | | Merge pull request #359 from 0xProject/feature/ts-2.7Leonid2018-02-0518-21/+21
| |\ \ \
| | * | | Fix errors after TS upgradeLeonid Logvinov2018-02-011-4/+4
| | * | | Upgrade TS to the newest versionLeonid Logvinov2018-02-0117-17/+17
| * | | | Add build:watch to README'sLeonid Logvinov2018-02-029-0/+54
| |/ / /
| * / / Add build:watch command to all TS packagesLeonid Logvinov2018-02-0115-0/+15
| |/ /
* | | PrettierBrandon Millman2018-02-011-1/+1
* | | Update testnet-faucets READMEBrandon Millman2018-02-011-3/+11
* | | Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0177-720/+1306
|\| |
| * | PrettierBrandon Millman2018-02-012-2/+5
| * | Merge branch 'development' into feature/tslint-config/underscore-protected-me...Brandon Millman2018-02-019-18/+39
| |\ \
| | * \ Merge pull request #346 from joincivil/feature/abi-gen-partialsLeonid2018-01-319-18/+39
| | |\ \
| | | * | Updated contract generation in 0x to new abi-gen CLIOlaf Tomalka2018-01-317-1/+1
| | | * | Removed deprecated CLI optionsOlaf Tomalka2018-01-311-19/+2
| | | * | Added PR # to the changelog of abi-genOlaf Tomalka2018-01-271-1/+3
| | | * | Added CLI options for explicit specifying location of partials and main templateOlaf Tomalka2018-01-272-14/+50
| * | | | Add PR number to changelogBrandon Millman2018-01-311-1/+1
| * | | | Fix lint errorsBrandon Millman2018-01-3117-55/+54
| * | | | Add protected keyword to underscore lint ruleBrandon Millman2018-01-313-3/+8
| |/ / /
| * | | Remove unused propFabio Berger2018-01-311-1/+0
| * | | Merge pull request #351 from 0xProject/feature/portal-ledger-supportFabio Berger2018-01-3153-645/+1204
| |\ \ \
| | * | | Fix prettierFabio Berger2018-01-311-9/+1
| | * | | Uppercase Networks enum valuesFabio Berger2018-01-317-22/+22
| | * | | Make default gasPrice more readableFabio Berger2018-01-311-1/+3
| | * | | Fix prettier messFabio Berger2018-01-311-6/+3
| | * | | Fix linter errorsFabio Berger2018-01-3121-72/+20
| | * | | Shrink imgFabio Berger2018-01-311-0/+0
| | * | | Fix all setState calls after unmounted errors. Decided to create our own flag...Fabio Berger2018-01-317-43/+90
| | * | | Fix bug where we were return undefined instead of the empty objectFabio Berger2018-01-311-1/+1
| | * | | Default the derivation path to that found in the Ledger subproviderFabio Berger2018-01-311-1/+4
| | * | | Add browser data to dialog infoFabio Berger2018-01-311-1/+1
| | * | | Add Rinkeby supportFabio Berger2018-01-302-6/+3
| | * | | Pass in whether we want the personal message prefix appended and never append...Fabio Berger2018-01-302-1/+20
| | * | | Merge branch 'development' into feature/portal-ledger-supportFabio Berger2018-01-3048-214/+334
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Wholesale replace the tokenByAddress and de-dup properlyFabio Berger2018-01-304-26/+31
| | * | | Call destroy ealier so that web3Wrapper stops polling for userAddress/network...Fabio Berger2018-01-302-3/+8
| | * | | Disallow negative amountsFabio Berger2018-01-301-1/+1
| | * | | Remove the ability to clear tokenByAddress. It should simply be updated.Fabio Berger2018-01-304-14/+0
| | * | | Use live backend on developmentFabio Berger2018-01-291-1/+1
| | * | | Fetch default gasPrice from our ethGasStation API mirror and set it for all t...Fabio Berger2018-01-291-3/+34
| | * | | remove unused typeFabio Berger2018-01-291-10/+0
| | * | | Small improvementsFabio Berger2018-01-291-2/+2
| | * | | Fix bug related to balance/allowance fetching being asyncFabio Berger2018-01-291-0/+14
| | * | | Add missing entries for Ropsten and Rinkeby testnets, added Ropsten to Ledger...Fabio Berger2018-01-296-23/+32
| | * | | Re-set Ledger config dialog to connect step if dialog is closedFabio Berger2018-01-291-0/+1
| | * | | Add flash message instructing user to confirm tx on LedgerFabio Berger2018-01-291-0/+13
| | * | | Add the stack trace to help with debuggingFabio Berger2018-01-291-1/+1
| | * | | Make it such that users can switch between Ledger accounts without first swit...Fabio Berger2018-01-293-9/+12
| | * | | Use colors module and remove in-lined colorsFabio Berger2018-01-292-7/+10
| | * | | Replace heavy loading animation with simple circular loaderFabio Berger2018-01-295-41/+14
| | * | | Add network name to the select providerFabio Berger2018-01-291-12/+15
| | * | | Fix bug where could not switch to Ledger and backFabio Berger2018-01-296-31/+65
| | * | | Implement just-in-time loading of token balances & allowancesFabio Berger2018-01-2823-295/+384
| | * | | Initial Ledger support implementationFabio Berger2018-01-2824-163/+559
| | * | | Remove unused Ledgerco importFabio Berger2018-01-282-2/+0
| | * | | Add light blue as our accent colorFabio Berger2018-01-281-0/+1
| | * | | Properly detect user signing cancellation on Metamask, Parity signer and LedgerFabio Berger2018-01-286-7/+7
* | | | | Fix lint errorsBrandon Millman2018-01-311-0/+2
* | | | | Add order signing and dispensing ability to faucetBrandon Millman2018-01-318-39/+159
|/ / / /
* | | | Change orderLeonid Logvinov2018-01-301-1/+1
* | | | Separate npm scripts in contractsLeonid Logvinov2018-01-301-2/+3
* | | | Remove a semicolonLeonid Logvinov2018-01-301-1/+1
* | | | Fix glob patternsLeonid Logvinov2018-01-301-1/+1
* | | | Remove constructor argLeonid Logvinov2018-01-302-4/+5
* | | | Remove authorized address magic from testsLeonid Logvinov2018-01-301-8/+1
* | | | Remove accounts magic from testsLeonid Logvinov2018-01-303-8/+4
* | | | Make an RPC constructor param implicitLeonid Logvinov2018-01-3023-26/+27
* | | | Remove no-unused-variabe ruleLeonid Logvinov2018-01-301-1/+0
* | | | Fix tslint issuesLeonid Logvinov2018-01-303-7/+6
* | | | Use an enum for contract nameLeonid Logvinov2018-01-3013-47/+60
* | | | Remove promisified web3 functions from testsLeonid Logvinov2018-01-302-14/+12
* | | | Remove truffle as a dependencyLeonid Logvinov2018-01-301-1/+0
* | | | Fix prettierLeonid Logvinov2018-01-303-23/+11
* | | | Normalize the dependenciesLeonid Logvinov2018-01-3020-91/+67
* | | | Add --bail to mocha configLeonid Logvinov2018-01-301-1/+1
* | | | Make awaitTransactionMinedAsync non-generic againLeonid Logvinov2018-01-303-13/+13
* | | | Add back the artifactsLeonid Logvinov2018-01-3016-0/+6408
* | | | Remove duplicate codeLeonid Logvinov2018-01-302-55/+0
* | | | Remove truffle from testsLeonid Logvinov2018-01-3072-7162/+649
* | | | Refactor contracts tests to not use injected web3 instanceLeonid Logvinov2018-01-3037-126/+89
* | | | Remove truffle from Exchange testsLeonid Logvinov2018-01-303-20/+65
* | | | Remove truffle from ZRXToken testsLeonid Logvinov2018-01-301-11/+19
* | | | Remove truffle from UnlimitedAllowanceToken testsLeonid Logvinov2018-01-302-5/+26
* | | | Remove truffle from UnlimitedAllowanceTokenV2 testsLeonid Logvinov2018-01-305-14/+22
* | | | Remove truffle from TokenRegistry testsLeonid Logvinov2018-01-301-12/+28
* | | | Remove truffle from MultiSigWalletWithTimeLock testsLeonid Logvinov2018-01-301-4/+10
* | | | Remove truffle from MultiSigWalletWithTimeLockExceptRemoveAuthAddr testsLeonid Logvinov2018-01-302-14/+32
* | | | Remove truffle from Ether Token testsLeonid Logvinov2018-01-301-12/+24
* | | | Remove truffle from tokenTransferProxy testsLeonid Logvinov2018-01-302-39/+37
* | | | Remove truffle from tokenTransferProxy testsLeonid Logvinov2018-01-3014-54/+76
| |/ / |/| |
* | | Publishcontracts@2.1.7@0xproject/website@0.0.10@0xproject/testnet-faucets@1.0.8@0xproject/monorepo-scripts@0.1.7@0xproject/deployer@0.0.4Fabio Berger2018-01-3018-101/+118
* | | Add PR numberFabio Berger2018-01-301-1/+1
* | | Add config file specifically in prettier command and fix filesFabio Berger2018-01-30376-34256/+34256
* | | Fix prettierFabio Berger2018-01-30376-34276/+34256
* | | Fix prettierFabio Berger2018-01-301-3/+6
* | | Add shouldAddPersonalMessagePrefix param to signOrderHashAsync instead of try...Fabio Berger2018-01-305-21/+44
* | | Publishcontracts@2.1.6@0xproject/website@0.0.9@0xproject/testnet-faucets@1.0.7@0xproject/monorepo-scripts@0.1.6@0xproject/deployer@0.0.3Leonid Logvinov2018-01-3018-101/+118
* | | Move @0xproject/types to dependenciesLeonid Logvinov2018-01-301-1/+1
* | | Updated web3-typescript-typings changelogOlaf Tomalka2018-01-261-0/+1
* | | Fixed getTransactionReceipt not returning nullOlaf Tomalka2018-01-261-2/+2
| |/ |/|
* | Run prettierAmir Bandeali2018-01-268-55/+38
* | Update changelogAmir Bandeali2018-01-261-1/+2
* | Add Rinkeby addresses to artifactsAmir Bandeali2018-01-265-0/+15
* | Fix bad merge on package.jsonBrandon Millman2018-01-251-1/+1
* | Merge branch 'development' into feature/kovan-faucets/all-testnet-supportBrandon Millman2018-01-2522-105/+128
|\|
| * PublishLeonid Logvinov2018-01-2518-104/+121
| * Update the CHANGELOGLeonid Logvinov2018-01-241-0/+1
| * Fix the bug making it impossible to specify the custom ZRX addressLeonid Logvinov2018-01-243-0/+5
* | Respond to GH comments and add /info endpointBrandon Millman2018-01-253-5/+64
* | Change package name to @0xproject/testnet-faucetsBrandon Millman2018-01-242-2/+2
* | Implement testnet faucets for any testnet available via infuraBrandon Millman2018-01-247-59/+80
* | Rename to testnet-faucetsBrandon Millman2018-01-2417-4/+4
|/
* Fix fill/cancel order by looking for NoError instead of empty blockchainErr g...Fabio Berger2018-01-221-2/+2
* Merge branch 'development' into feature/separate-deployerLeonid2018-01-1913-59/+144
|\
| * Add our mainnet and kovan nodes as backups for Portal requestsFabio Berger2018-01-191-2/+2
| * Fix bug hiding the user info from topBarFabio Berger2018-01-191-1/+1
| * Merge pull request #328 from 0xProject/fix/website/alphanumeric-token-symbolJacob Evans2018-01-191-4/+4
| |\
| | * Allow Token symbols to be alphanumericJacob Evans2018-01-191-4/+4
| * | Prettier newlineJacob Evans2018-01-191-1/+1
| * | PrettierJacob Evans2018-01-193-3/+8
| * | Update CHANGELOG, rebase on developmentJacob Evans2018-01-191-0/+3
| * | Should not -> cannotJacob Evans2018-01-191-1/+1
| * | Reject negative amounts in isValidBaseUnitAmountJacob Evans2018-01-193-0/+59
| * | Re-add changelog for 0x.jsFabio Berger2018-01-191-1/+1
| |/
| * Fix prettierLeonid Logvinov2018-01-183-46/+56
| * Merge pull request #325 from 0xProject/fix/portal-bugsLeonid2018-01-187-19/+27
| |\
| | * Use intervalUtils.clearAsyncExcludingInterval instead of calling clearInterva...Fabio Berger2018-01-182-4/+4
| | * Add discourse forum to Community section of website footerFabio Berger2018-01-183-0/+7
| | * Remove dead-codeFabio Berger2018-01-181-5/+0
| | * Fix Portal topbar so that it displays the mobile menuFabio Berger2018-01-181-8/+6
| | * Add missing onError callbacksFabio Berger2018-01-182-2/+10
| | * Fix balance page copy to refer to the Wrap ETH tab instead of a "convert" buttonFabio Berger2018-01-181-1/+1
* | | Add a comment about a yarn bugLeonid Logvinov2018-01-191-1/+3
* | | Move tests to a separate folderLeonid Logvinov2018-01-1811-12/+13
* | | Change file layoutLeonid Logvinov2018-01-1813-12/+12
* | | Add bin definitionLeonid Logvinov2018-01-181-0/+3
* | | Add postpublish scripts and READMELeonid Logvinov2018-01-182-0/+112
* | | Fix a linkLeonid Logvinov2018-01-181-1/+1
* | | Fix merge conflictsLeonid Logvinov2018-01-181-8/+1
* | | Fix merge conflictsLeonid Logvinov2018-01-181-6/+0
* | | Move deployer to a separate packageLeonid Logvinov2018-01-1837-16/+122
|/ /
* | Merge pull request #322 from 0xProject/fix/ci-timeLeonid2018-01-1812-33/+14
|\ \
| * | Enable restrict-plus-operands and fix issues detectedLeonid Logvinov2018-01-175-4/+5
| * | Remove unused dependenciesLeonid Logvinov2018-01-172-14/+0
| * | Fix a stupid RPC bug which caused the port togo over 65535Leonid Logvinov2018-01-171-1/+1
| * | Remove trailing slashLeonid Logvinov2018-01-171-1/+1
| * | Test deployer separately from contractsLeonid Logvinov2018-01-171-1/+2
| * | Return is pensing events are undefinedLeonid Logvinov2018-01-161-0/+4
| * | Remove umd testsLeonid Logvinov2018-01-162-12/+1
* | | Run prettier to revert formatting changes made by the lerna publish stepBrandon Millman2018-01-187-41/+24
* | | Publishcontracts@2.1.4@0xproject/website@0.0.7@0xproject/monorepo-scripts@0.1.4@0xproject/kovan_faucets@1.0.50x.js@0.30.0Brandon Millman2018-01-1818-104/+121
* | | Update CHANGELOGBrandon Millman2018-01-183-4/+4
| |/ |/|
* | Merge pull request #321 from 0xProject/fix/fill-up-to-validationLeonid2018-01-183-4/+38
|\ \
| * | Fix the typosLeonid Logvinov2018-01-172-5/+5
| * | Update the CHANGELOGLeonid Logvinov2018-01-161-0/+1
| * | Fix fillOrdersUpTo balances validationLeonid Logvinov2018-01-162-2/+18
| * | Add a regression test for fillUpToValidationLeonid Logvinov2018-01-161-1/+18
| |/
* | Added PR number to web3 typings changelogOlaf Tomalka2018-01-161-1/+1
* | Fix web3 typing defaultAccount not allowing `undefined`Olaf Tomalka2018-01-152-1/+2
|/
* Merge pull request #319 from 0xProject/feature/final-monorepoLeonid2018-01-1326-41/+1782
|\
| * Add postpublish scriptsLeonid Logvinov2018-01-1312-32/+120
| * Add chai-as-promised-typescript-typingsLeonid Logvinov2018-01-137-5/+1321
| * Remove redundant type refsLeonid Logvinov2018-01-135-7/+4
| * Add web3-typescript-typings and chai-as-promised-typescript-typings to the ma...Leonid Logvinov2018-01-121-3/+3
| * Import chai-as-promised-typescript-typingsLeonid Logvinov2018-01-125-0/+340
* | Merge pull request #312 from 0xProject/feature/error-reporting-intervalsLeonid2018-01-1312-62/+116
|\ \
| * | Return after checking for an error and add an explanatory commentLeonid Logvinov2018-01-131-1/+2
| * | Apply prettierLeonid Logvinov2018-01-116-38/+23
| * | Update the CHANGELOGLeonid Logvinov2018-01-112-0/+8
| * | Make some callbacks failable and add error handlingLeonid Logvinov2018-01-119-60/+88
| * | Add an error handler parameter to intervalsLeonid Logvinov2018-01-111-2/+19
* | | Stop appending /v0 to HttpClient api endpoint urlsBrandon Millman2018-01-133-8/+9
* | | Improve HttpClient errorsBrandon Millman2018-01-133-5/+22
| |/ |/|
* | Fix @bmilman linkedin linkLeonid Logvinov2018-01-121-1/+1
* | Add new team photosLeonid Logvinov2018-01-123-4/+6
* | Add a CHANGELOG to a websiteLeonid Logvinov2018-01-121-0/+5
* | Add @tom and @dekz while removing @PhABCLeonid Logvinov2018-01-122-14/+26
* | Prettify package.json filesLeonid Logvinov2018-01-126-38/+23
* | Fix a version in web3-typescript-typings CHANGELOGLeonid Logvinov2018-01-111-1/+1
* | Publishweb3-typescript-typings@0.9.3contracts@2.1.3@0xproject/website@0.0.6@0xproject/kovan_faucets@1.0.40x.js@0.29.2Leonid Logvinov2018-01-118-22/+24
* | Add types for getData on a web3 contractLeonid Logvinov2018-01-112-4/+7
* | Add types for getData on a web3 contractLeonid Logvinov2018-01-111-0/+1
|/
* Add forgotten CHANGELOG changesLeonid Logvinov2018-01-111-1/+1
* Publishweb3-typescript-typings@0.9.1contracts@2.1.2@0xproject/website@0.0.5@0xproject/monorepo-scripts@0.1.3@0xproject/kovan_faucets@1.0.3@0xproject/dev-utils@0.0.40x.js@0.29.1Leonid Logvinov2018-01-1116-91/+106
* Update CHANGELOGs before publishLeonid Logvinov2018-01-113-1/+9
* Fix ts error in portal after enabling more strict checksLeonid Logvinov2018-01-1012-38/+42
* Fix a compiler error in abi-genLeonid Logvinov2018-01-102-2/+9
* Fix a compiler error with constructor enumLeonid Logvinov2018-01-101-1/+1
* Update READMELeonid Logvinov2018-01-101-2/+2
* Fix linter issuesLeonid Logvinov2018-01-103-10/+1
* Fix callback typesLeonid Logvinov2018-01-109-157/+203
* Return to old way of including web3 typesLeonid Logvinov2018-01-1011-10/+13
* Import web3-typescript-typings to monorepoLeonid Logvinov2018-01-105-119/+162
* 0.9.0Leonid Logvinov2018-01-101-1/+1
* Manually apply #14Leonid Logvinov2018-01-103-9/+6
* Added stateMutability to ABIsOlaf Tomalka2018-01-101-0/+5
* 0.8.0Leonid Logvinov2018-01-101-1/+1
* Fix types definition in package.jsonLeonid Logvinov2018-01-101-2/+2
* 0.7.2Leonid Logvinov2018-01-101-1/+1
* Fix ContractInstance new() not parsing properlyOlaf Tomalka2018-01-101-1/+1
* Made the callback in filter.stopWatching optionalOlaf Tomalka2018-01-101-1/+1
* Add new to contract interfaceAmir Bandeali2018-01-101-0/+1
* fix typoAmir Bandeali2018-01-101-1/+1
* 0.7.1Leonid Logvinov2018-01-101-1/+1
* Make transactionIndex nullableLeonid Logvinov2018-01-101-1/+1