aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #429 from 0xProject/fix/incorrectDepsFabio Berger2018-03-042-2/+3
|\
| * Move web3 typings from devDeps to depsFabio Berger2018-03-032-2/+3
* | Update all mentions of the repo name being `0x.js` to `0x-monorepo`Fabio Berger2018-03-042-2/+2
|/
* Add dependenciesLeonid Logvinov2018-02-281-0/+1
* Add ethers-contracts as a dependencyLeonid Logvinov2018-02-281-0/+1
* Move BaseContract to web3WrapperLeonid Logvinov2018-02-283-77/+1
* Remove unused paramLeonid Logvinov2018-02-281-1/+1
* Add txData to async callsLeonid Logvinov2018-02-282-3/+10
* Include ethers typesLeonid Logvinov2018-02-282-0/+2
* Create ethers-typescript-typingsLeonid Logvinov2018-02-281-29/+0
* Rewrite templates to decode call data on transactionsLeonid Logvinov2018-02-281-0/+1
* Fix buildLeonid Logvinov2018-02-281-5/+5
* Use the same templates as 0x.jsLeonid Logvinov2018-02-288-146/+1
* Add CHANGELOG entryLeonid Logvinov2018-02-281-0/+1
* Add support for ABIv2 to abi-genLeonid Logvinov2018-02-284-5/+5
* Allow users to specify the contracts backend in abi-genLeonid Logvinov2018-02-2814-62/+137
* Merge branch 'development' into fix/unsubscribeAllLeonid Logvinov2018-02-287-64/+141
|\
| * Merge branch 'development' into feature/0x.js/lowercase-addressesJacob Evans2018-02-278-31/+82
| |\
| * | Check isETHAddressHex before lowercaseJacob Evans2018-02-277-63/+55
| * | Check maker is valid addressJacob Evans2018-02-231-3/+8
| * | Lowercase public addressesJacob Evans2018-02-236-89/+172
* | | Rename _unsubscribeAll to unsubscribeAllLeonid Logvinov2018-02-278-11/+12
| |/ |/|
* | Merge pull request #385 from 0xProject/feature/0x_config_validationLeonid Logvinov2018-02-248-30/+84
|\ \ | |/ |/|
| * Remove unused importLeonid Logvinov2018-02-211-1/+1
| * Change assert.doesConformToShema interfaceLeonid Logvinov2018-02-211-4/+4
| * Remove type-level validationLeonid Logvinov2018-02-154-27/+12
| * Fix testsLeonid Logvinov2018-02-155-9/+13
| * Add entries to the CHANGELOGLeonid Logvinov2018-02-153-4/+6
| * Better validate ZeroExConfig on public networksLeonid Logvinov2018-02-155-33/+96
* | Publishcontracts@2.1.13@0xproject/website@0.0.16@0xproject/testnet-faucets@1.0.14@0xproject/dev-utils@0.1.0@0xproject/connect@0.6.0Brandon Millman2018-02-171-9/+9
* | Add docs staging to 0x.js packageBrandon Millman2018-02-151-0/+24
|/
* Publishcontracts@2.1.12@0xproject/website@0.0.15@0xproject/testnet-faucets@1.0.13@0xproject/monorepo-scripts@0.1.11@0xproject/deployer@0.0.9@0xproject/connect@0.5.8Fabio Berger2018-02-101-9/+9
* Publishcontracts@2.1.11@0xproject/website@0.0.14@0xproject/testnet-faucets@1.0.12@0xproject/monorepo-scripts@0.1.10@0xproject/deployer@0.0.8@0xproject/connect@0.5.7Fabio Berger2018-02-101-12/+12
* Merge pull request #389 from 0xProject/fix/npmInclusionIssuesFabio Berger2018-02-102-0/+14
|\
| * Add PR number to CHANGELOGsFabio Berger2018-02-101-1/+1
| * ignore all files starting with dots in all sub-packagesFabio Berger2018-02-101-1/+1
| * Add correct npmignore to 0x.js and update CHANGELOGFabio Berger2018-02-102-0/+14
* | Simplify standard postpublish script and remove them from some private packagesBrandon Millman2018-02-091-1/+1
|/
* Publishcontracts@2.1.10@0xproject/website@0.0.13@0xproject/testnet-faucets@1.0.11@0xproject/deployer@0.0.7Brandon Millman2018-02-081-8/+8
* Update CHANGELOGsBrandon Millman2018-02-081-0/+5
* Fix ABI error messageLeonid Logvinov2018-02-071-1/+0
* Fix linter errorsLeonid Logvinov2018-02-072-2/+3
* Use abi-gen for events in 0x.jsLeonid Logvinov2018-02-078-120/+76
* Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0712-27/+26
|\
| * Move BlockParamLiteral to shared types packageJacob Evans2018-02-0711-14/+23
| * Move BlockParam and BlockParamLiteral to shared typesJacob Evans2018-02-072-14/+4
* | Add types-bn package to 0x.js and testnet-faucetsBrandon Millman2018-02-071-0/+1
|/
* 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-061-10/+10
* Revert "Temp"Leonid Logvinov2018-02-061-1/+0
* Add dates to CHANGELOGsLeonid Logvinov2018-02-061-1/+1
* Merge branch 'development' of github.com:0xProject/0x.js into developmentLeonid Logvinov2018-02-064-4/+33
|\
| * Change CHANGELOGsLeonid Logvinov2018-02-061-1/+1
| * 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-0537-348/+107
| | |\
| | * | 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
| * | | Add PR numberLeonid Logvinov2018-02-051-1/+1
| * | | Fix an exception when a signature collision happensLeonid Logvinov2018-02-051-0/+4
| | |/ | |/|
* / | TempLeonid Logvinov2018-02-061-0/+1
|/ /
* | Merge branch 'development' into feature/build_watchLeonid2018-02-053-19/+30
|\ \
| * | 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-011-18/+21
| * | Fix linter errorsLeonid Logvinov2018-02-011-2/+2
| * | Update changelogLeonid Logvinov2018-02-011-0/+4
| * | don't remove maker/zrx order from cache twiceLuke Autry2018-02-011-1/+5
* | | Fix errors after TS upgradeLeonid Logvinov2018-02-011-4/+4
* | | Upgrade TS to the newest versionLeonid Logvinov2018-02-011-1/+1
* | | Add build:watch command to all TS packagesLeonid Logvinov2018-02-011-0/+1
|/ /
* | Merge branch 'development' into feature/tslint-config/underscore-protected-me...Brandon Millman2018-02-017-1/+1
|\ \
| * \ Merge pull request #346 from joincivil/feature/abi-gen-partialsLeonid2018-01-317-1/+1
| |\ \
| | * | Updated contract generation in 0x to new abi-gen CLIOlaf Tomalka2018-01-317-1/+1
* | | | Fix lint errorsBrandon Millman2018-01-3112-29/+29
|/ / /
* | | Make an RPC constructor param implicitLeonid Logvinov2018-01-3010-10/+10
* | | Fix tslint issuesLeonid Logvinov2018-01-302-5/+5
* | | Normalize the dependenciesLeonid Logvinov2018-01-303-14/+11
* | | Make awaitTransactionMinedAsync non-generic againLeonid Logvinov2018-01-301-4/+4
* | | Remove truffle from testsLeonid Logvinov2018-01-3011-154/+24
* | | Refactor contracts tests to not use injected web3 instanceLeonid Logvinov2018-01-3018-144/+23
| |/ |/|
* | 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-301-18/+21
* | Add PR numberFabio Berger2018-01-301-1/+1
* | Add config file specifically in prettier command and fix filesFabio Berger2018-01-3063-10080/+10080
* | Fix prettierFabio Berger2018-01-3063-10083/+10080
* | 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-301-18/+21
* | Move @0xproject/types to dependenciesLeonid Logvinov2018-01-301-1/+1
|/
* Run prettierAmir Bandeali2018-01-261-10/+7
* Update changelogAmir Bandeali2018-01-261-1/+2
* Add Rinkeby addresses to artifactsAmir Bandeali2018-01-265-0/+15
* PublishLeonid Logvinov2018-01-251-18/+21
* 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
* Prettier newlineJacob Evans2018-01-191-1/+1
* PrettierJacob Evans2018-01-191-0/+1
* Update CHANGELOG, rebase on developmentJacob Evans2018-01-191-0/+3
* Reject negative amounts in isValidBaseUnitAmountJacob Evans2018-01-191-0/+47
* Re-add changelog for 0x.jsFabio Berger2018-01-191-1/+1
* Merge pull request #322 from 0xProject/fix/ci-timeLeonid2018-01-185-27/+6
|\
| * Remove unused dependenciesLeonid Logvinov2018-01-172-14/+0
| * Remove trailing slashLeonid Logvinov2018-01-171-1/+1
| * 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-181-11/+9
* | 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-181-21/+23
* | Update CHANGELOGBrandon Millman2018-01-181-1/+1
* | 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
|/
* Merge pull request #319 from 0xProject/feature/final-monorepoLeonid2018-01-133-18/+12
|\
| * Add postpublish scriptsLeonid Logvinov2018-01-132-16/+12
| * Remove redundant type refsLeonid Logvinov2018-01-131-2/+0
* | Merge pull request #312 from 0xProject/feature/error-reporting-intervalsLeonid2018-01-1310-60/+94
|\ \ | |/ |/|
| * Return after checking for an error and add an explanatory commentLeonid Logvinov2018-01-131-1/+2
| * Apply prettierLeonid Logvinov2018-01-111-11/+9
| * Update the CHANGELOGLeonid Logvinov2018-01-111-0/+5
| * Make some callbacks failable and add error handlingLeonid Logvinov2018-01-119-60/+88
* | Prettify package.json filesLeonid Logvinov2018-01-121-11/+9
* | 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-111-4/+4
|/
* 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-111-19/+21
* Update CHANGELOGs before publishLeonid Logvinov2018-01-111-0/+4
* 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-101-0/+1
* Include web3 types via typeRoots and factor out common parts of tsconfig.jsonLeonid Logvinov2018-01-104-11/+12
* Apply prettify on json and md filesLeonid Logvinov2018-01-0412-1943/+1937
* Fix linter errorsLeonid Logvinov2018-01-047-8/+7
* Use configured version of bignumber in all packagesLeonid Logvinov2018-01-0431-37/+31
* Fix formattingLeonid Logvinov2018-01-032-4/+0
* Apply prettier configLeonid Logvinov2018-01-0350-1252/+2289
* Publishcontracts@2.1.1@0xproject/website@0.0.4@0xproject/monorepo-scripts@0.1.2@0xproject/kovan_faucets@1.0.2@0xproject/dev-utils@0.0.30x.js@0.29.0Fabio Berger2017-12-281-9/+9
* Add dates to CHANGELOG entriesFabio Berger2017-12-281-1/+1
* Merge pull request #285 from 0xProject/fix/underscorePrivateBrandon Millman2017-12-2213-236/+236
|\
| * Add some missed underscores, update changelog and commentsBrandon Millman2017-12-214-6/+6
| * Merge branch 'development' into fix/underscorePrivateBrandon Millman2017-12-2112-27/+427
| |\
| * | Add new underscore-privates rule to @0xproject/tslint-config and fix lint errorsBrandon Millman2017-12-2012-231/+231
* | | Add to CHANGELOGFabio Berger2017-12-211-0/+5
* | | Refactor toBaseUnitAmount so that it throws if user supplies unitAmount with ...Fabio Berger2017-12-212-0/+10
* | | Make assertion stricter so that one cannot submit invalid baseUnit amounts to...Fabio Berger2017-12-212-1/+7
| |/ |/|
* | Publishcontracts@2.1.0@0xproject/website@0.0.3@0xproject/monorepo-scripts@0.1.1@0xproject/kovan_faucets@1.0.1@0xproject/dev-utils@0.0.20x.js@0.28.0Leonid Logvinov2017-12-211-9/+9
* | Update CHANGELOGsLeonid Logvinov2017-12-201-1/+1
* | Add slashes to base URLsLeonid Logvinov2017-12-201-3/+3
* | Fix linter issueLeonid Logvinov2017-12-201-1/+0
* | Fix WETH symbolLeonid Logvinov2017-12-201-1/+1
* | Update snapshot and artifactsLeonid Logvinov2017-12-203-3/+3
* | Fix test descriptionLeonid Logvinov2017-12-201-1/+1
* | Fix a typoLeonid Logvinov2017-12-201-1/+1
* | Add err==null assertionsLeonid Logvinov2017-12-201-0/+4
* | Add WETH9 testsLeonid Logvinov2017-12-203-4/+58
* | Use the new snapshot including WETH9 and it's artifactsLeonid Logvinov2017-12-203-5/+5
* | Fix WETH events watchingLeonid Logvinov2017-12-202-3/+3
* | Fix a typoLeonid Logvinov2017-12-201-1/+1
* | Init the _etherTokenContractsByAddressLeonid Logvinov2017-12-201-1/+1
* | Export new public typesLeonid Logvinov2017-12-201-0/+3
* | Update CHANGELOGLeonid Logvinov2017-12-201-0/+4
* | Make order watcher react to new etherToken eventsLeonid Logvinov2017-12-201-0/+33
* | Add EtherToken events to the ABILeonid Logvinov2017-12-202-2/+36
* | Enable multiple EtherTokenContract instancesLeonid Logvinov2017-12-201-4/+9
* | Add etherToken.getLogsAsync and etherToken.subscribe with testsLeonid Logvinov2017-12-207-8/+272
|/
* Don't throw in transformersLeonid Logvinov2017-12-201-1/+1
* Update CHANGELOGLeonid Logvinov2017-12-191-0/+1
* Throw a better error message when taker is null|undefined or anything but not...Leonid Logvinov2017-12-196-24/+87
* Fix commentsLeonid Logvinov2017-12-192-2/+2
* Fix linter issuesLeonid Logvinov2017-12-193-4/+4
* Rename SubscriptionOpts to BlockRangeLeonid Logvinov2017-12-199-33/+34
* Merge pull request #267 from 0xProject/refactor/passInEtherTokenAddressFabio Berger2017-12-1910-50/+40
|\
| * Add additional public changes introduced to changelogFabio Berger2017-12-191-1/+3
| * Add entry to CHANGELOGFabio Berger2017-12-171-0/+4
| * Modify the etherToken wrapper methods to accept an etherTokenAddress as the f...Fabio Berger2017-12-176-46/+21
| * Fix documentation issue where `unsubscribeAll` shown as method on every contr...Fabio Berger2017-12-173-4/+13
* | Move web3 import after subprovider imports in test web3_factoryBrandon Millman2017-12-182-4/+10
|/
* Fix redundant spacesLeonid Logvinov2017-12-162-6/+6
* Fix testsLeonid Logvinov2017-12-151-0/+1
* Fix 0x.js unused varsLeonid Logvinov2017-12-1525-94/+13
* Add a newlineLeonid Logvinov2017-12-151-1/+2
* Name a variableLeonid Logvinov2017-12-151-1/+2
* Fix a conditionalLeonid Logvinov2017-12-151-5/+1
* Fix linter errorsLeonid Logvinov2017-12-143-3/+3
* Add a function to init token balancesLeonid Logvinov2017-12-142-4/+30
* Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokensLeonid Logvinov2017-12-144-11/+14
* Add DummyToken to gitignoreLeonid Logvinov2017-12-141-0/+1
* Add DummyToken to artifacts listLeonid Logvinov2017-12-141-0/+2
* Increase mocha timeoutLeonid Logvinov2017-12-141-1/+1
* Add DummyToken to artifacts listLeonid Logvinov2017-12-141-1/+1
* Update addresses and add DummyToken artifactLeonid Logvinov2017-12-145-4/+27
* Fix CI buildLeonid Logvinov2017-12-141-1/+1
* Move shared types to types packageLeonid Logvinov2017-12-143-29/+7
* Move more shared utils into utils package and reuse themLeonid Logvinov2017-12-1422-163/+28
* Move 0x.js temnplates to 0x.js instead of having them as a separate packageLeonid Logvinov2017-12-146-0/+103
* Remove generated contracts and ignore them. Add a prebuild command to regener...Leonid Logvinov2017-12-147-2165/+8
* Rename blockAndLogStreamer to blockAndLogStreamerIfExistsLeonid Logvinov2017-12-121-14/+18
* Publishwebsite@0.0.2contracts@2.0.0abi-gen-templates@0.0.2@0xproject/web3-wrapper@0.1.0@0xproject/utils@0.1.0@0xproject/types@0.1.0@0xproject/tslint-config@0.2.1@0xproject/subproviders@0.1.0@0xproject/monorepo-scripts@0.1.0@0xproject/json-schemas@0.6.10@0xproject/connect@0.3.0@0xproject/assert@0.0.7@0xproject/abi-gen@0.0.20x.js@0.27.2Brandon Millman2017-12-091-9/+9
* Add scope to abi-gen dependency in 0x.jsBrandon Millman2017-12-091-1/+1
* Merge branch 'development' into feature/addSubprovidersFabio Berger2017-12-0922-269/+77
|\
| * Refactor networkId out of web3WrapperLeonid Logvinov2017-12-089-21/+29
| * Refactor web3Wrapper to a separate packageLeonid Logvinov2017-12-0722-251/+51
* | Merge branch 'development' into feature/addSubprovidersFabio Berger2017-12-071-7/+7
|\|
| * Use same versions of dependencies everywhereLeonid Logvinov2017-12-061-8/+8
* | Merge branch 'development' into feature/addSubprovidersFabio Berger2017-12-0621-301/+2316
|\|
| * Address feedbackLeonid Logvinov2017-12-061-1/+1
| * Regenerate filesLeonid Logvinov2017-12-065-5/+5
| * Make fileExtension configurableLeonid Logvinov2017-12-061-1/+1
| * Rename abi-gen to typed-contractsLeonid Logvinov2017-12-066-13/+13
| * Remove TODOsLeonid Logvinov2017-12-051-2/+0
| * Fix a commentLeonid Logvinov2017-12-051-5/+5
| * Add a commentLeonid Logvinov2017-12-051-0/+1
| * Fix a typoLeonid Logvinov2017-12-051-1/+1
| * Update commentLeonid Logvinov2017-12-025-5/+5
| * Add comments before generated contractsLeonid Logvinov2017-12-025-0/+20
| * Use our promisifyLeonid Logvinov2017-12-023-18/+23
| * Make target optionalLeonid Logvinov2017-12-021-1/+1
| * Remove es6-promisifyLeonid Logvinov2017-12-022-7/+0
| * Remove all contract wrapperLeonid Logvinov2017-12-021-98/+0
| * Add async prefixLeonid Logvinov2017-12-021-1/+1
| * Adjust 0x.js to use generated wrappersLeonid Logvinov2017-12-027-24/+43
| * Remove old contract typingsLeonid Logvinov2017-12-021-154/+11
| * Add depencies and a command to generate contract wrappersLeonid Logvinov2017-12-021-0/+3
| * Add promisifyLeonid Logvinov2017-12-021-0/+24
| * Add class utilsLeonid Logvinov2017-12-021-0/+17
| * Add generated contract wrappersLeonid Logvinov2017-12-026-0/+2176
* | Move testrpc to top-level package.json and standardize some versionsFabio Berger2017-12-051-2/+1
|/
* PublishLeonid Logvinov2017-11-291-1/+1
* Export TransactionOpts typeLeonid Logvinov2017-11-292-0/+5
* PublishLeonid Logvinov2017-11-291-4/+4
* Update CHANGELOGLeonid Logvinov2017-11-291-2/+2
* Merge pull request #235 from 0xProject/feature/gasPriceGasLimitLeonid2017-11-2912-152/+170
|\
| * Improve the commentLeonid Logvinov2017-11-291-1/+3
| * Add CHANGELOG commentLeonid Logvinov2017-11-291-0/+1
| * Add a HACK commentLeonid Logvinov2017-11-291-0/+3
| * Normalise subprovider namesLeonid Logvinov2017-11-293-6/+6
| * Remove a commentLeonid Logvinov2017-11-291-1/+0
| * Fix a typoLeonid Logvinov2017-11-291-1/+1
| * Pin testrpc versionLeonid Logvinov2017-11-291-1/+1
| * Remove gas params from testsLeonid Logvinov2017-11-291-6/+0
| * Add fake gas estimate suprovider for testsLeonid Logvinov2017-11-295-3/+37
| * Fix testsLeonid Logvinov2017-11-281-0/+5
| * Fix a commentLeonid Logvinov2017-11-281-4/+4
| * Fix testsLeonid Logvinov2017-11-281-0/+1
| * Increase gas marginLeonid Logvinov2017-11-281-2/+1
| * Fix defaults for shouldValidateLeonid Logvinov2017-11-281-7/+21
| * Update MAX_REASONABLE_GAS_COST_IN_WEILeonid Logvinov2017-11-281-1/+1
| * Add gas margin and remove undefined valuesLeonid Logvinov2017-11-281-10/+14
| * Update testrpcLeonid Logvinov2017-11-281-1/+1
| * Add an initializer for txOpts in etherTokenLeonid Logvinov2017-11-281-2/+6
| * Add CHANGELOG entryLeonid Logvinov2017-11-281-0/+1
| * Add option config for gasPrice and gasLimit for every transaction sending methodLeonid Logvinov2017-11-285-138/+95
* | Change interval to 1hLeonid Logvinov2017-11-291-1/+1