aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move zeroEx.exchange.getAvailableContractAddressesAsync to zeroEx.getAvailabl...Leonid Logvinov2017-07-066-78/+71
* 0.8.0v0.8.0Leonid Logvinov2017-07-051-1/+1
* Add publish date for 0.8.0 in CHANGELOG.mdLeonid Logvinov2017-07-051-1/+1
* Merge pull request #90 from 0xProject/subscribe-tokenLeonid2017-07-0520-72/+410
|\
| * Merge branch 'master' into subscribe-tokenLeonid Logvinov2017-07-051-1/+1
| |\ | |/ |/|
* | Run umd tests only on masterLeonid Logvinov2017-07-051-1/+1
| * Add order hash schemaLeonid Logvinov2017-07-051-0/+5
| * Merge branch 'master' into subscribe-tokenLeonid Logvinov2017-07-053-5/+8
| |\ | |/ |/|
* | Merge pull request #93 from 0xProject/testrpc-snapshotLeonid2017-07-052-4/+6
|\ \
| * | Rename CONTRACTS_COMMIT to CONTRACTS_COMMIT_HASHLeonid Logvinov2017-07-051-3/+3
| * | Change prepublish to prepublishOnlyLeonid Logvinov2017-07-051-1/+1
| * | Use testrpc snapshots in testsLeonid Logvinov2017-07-051-3/+5
|/ /
* | Change gitter link badge to 0xproject/LobbyLeonid2017-07-051-1/+1
* | Add npm version badgeLeonid2017-07-051-0/+1
| * Rearrange methods in event utilsLeonid Logvinov2017-07-051-13/+13
| * Add underscore in front of _getBigNumberWrappingEventCallbackLeonid Logvinov2017-07-051-2/+2
| * Use string templateLeonid Logvinov2017-07-051-1/+1
| * Make all fields of subscriptionOpts schema optionalLeonid Logvinov2017-07-052-4/+3
| * move order hash schema to a separate fileLeonid Logvinov2017-07-055-10/+8
| * Fix CHANGELOG entryLeonid Logvinov2017-07-051-1/+1
| * Add exchangeContractAddress to an order in schema testsLeonid Logvinov2017-07-051-0/+1
| * Fix order schema (add exchangeContractAddress)Leonid Logvinov2017-07-051-1/+2
| * Fix the bug when didn't invalidate etherToken contract instanceLeonid Logvinov2017-07-053-0/+5
| * Update CHANGELOG.mdLeonid Logvinov2017-07-051-0/+5
| * Make this.proxy.invalidateContractInstance and this.tokenRegistry.invalidateC...Leonid Logvinov2017-07-053-8/+8
| * Make invalidateContractInstancesAsync private on exchange and tokenLeonid Logvinov2017-07-053-10/+10
| * Add parameter validation for subscribeAsyncLeonid Logvinov2017-07-052-0/+10
| * Add assert.doesBelongToStringEnumLeonid Logvinov2017-07-051-0/+11
| * Add StringEnum typeLeonid Logvinov2017-07-051-1/+4
| * Use .bignumber for BigNumber comparationLeonid Logvinov2017-07-051-2/+2
| * Use orderHashSchema to validate order hashLeonid Logvinov2017-07-054-14/+9
| * Refactor event testsLeonid Logvinov2017-07-052-17/+12
| * Add tests for order hash SchemaLeonid Logvinov2017-07-052-1/+26
| * Add orderHashSchemaLeonid Logvinov2017-07-042-1/+8
| * Add tests for subscriptionOptsSchema and blockParamSchemaLeonid Logvinov2017-07-041-0/+38
| * Handle errors from pseudo-async subscription testsLeonid Logvinov2017-07-042-10/+10
| * Register new schemas within schema validatorLeonid Logvinov2017-07-041-0/+5
| * Add index_filter_values_schema.ts and subscription_opts_schema.tsLeonid Logvinov2017-07-042-0/+32
| * Make IndexedFilterValues type scricterLeonid Logvinov2017-07-041-1/+1
| * Add CHANGELOG.md entryLeonid Logvinov2017-07-041-0/+1
| * Fix commentsLeonid Logvinov2017-07-042-7/+6
| * Merge branch 'master' into subscribe-tokenLeonid2017-07-047-14/+41
| |\ | |/ |/|
* | Merge pull request #89 from 0xProject/proxyLeonid2017-07-047-14/+41
|\ \
| * | Use call instead of use in the commentsLeonid Logvinov2017-07-042-6/+6
| * | Fix the commentLeonid Logvinov2017-07-041-1/+1
| * | Bump the minor version in CHANGELOG.mdLeonid Logvinov2017-07-041-1/+1
| * | Update CHANGELOG.mdLeonid Logvinov2017-07-041-1/+2
| * | Add zeroEx.proxy.getAuthorizedAddressesAsync and testsLeonid Logvinov2017-07-043-0/+24
| * | Make proxy wrapper public on zeroEx instanceLeonid Logvinov2017-07-043-8/+10
* | | Merge pull request #87 from 0xProject/wrap-log-bignumberLeonid2017-07-044-57/+407
|\ \ \
| | | * Add initial implementation and tests for zeroEx.token.subscribeAsyncLeonid Logvinov2017-07-047-37/+240
| | |/ | |/|
| * | Rename _wrapEventCallback to _getBigNumberWrappingEventCallbackLeonid Logvinov2017-07-041-2/+2
| * | Fix merge problemsLeonid Logvinov2017-07-042-37/+358
| * | Merge branch 'master' into wrap-log-bignumberLeonid2017-07-0425-246/+687
| |\ \ | |/ / |/| |
* | | Merge pull request #82 from 0xProject/add-exchange-address-to-order-structLeonid2017-07-0425-165/+509
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into add-exchange-address-to-order-structLeonid2017-07-045-73/+193
| |\ \ | |/ / |/| |
* | | Merge pull request #88 from 0xProject/greenkeeper/chai-as-promised-7.1.0Leonid2017-07-041-1/+1
|\ \ \
| * | | chore(package): update chai-as-promised to version 7.1.0greenkeeper[bot]2017-07-031-1/+1
* | | | Merge pull request #86 from 0xProject/subscribe-async-event-namesLeonid2017-07-031-0/+3
|\ \ \ \
| * | | | Assert correct event names in subscribeAsync testsLeonid Logvinov2017-07-011-0/+3
* | | | | Merge pull request #85 from 0xProject/greenkeeper/ethereumjs-testrpc-4.0.1Leonid2017-07-034-99/+193
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix test failures caused by testrpc new eth_sign behaviourLeonid Logvinov2017-07-013-98/+192
| * | | | chore(package): update ethereumjs-testrpc to version 4.0.1greenkeeper[bot]2017-06-291-1/+1
| |/ / /
| | * | Stop passing exchangeContractAddress to utils.getOrderHashHexLeonid Logvinov2017-07-043-10/+5
| | * | Await ZRX callLeonid Logvinov2017-07-041-1/+1
| | * | Fix the commentLeonid Logvinov2017-07-041-1/+1
| | * | Rename invalidateContractInstanceAsync to invalidateContractInstancesAsyncLeonid Logvinov2017-07-042-2/+2
| | * | Fix _getProxyContractAsync function nameLeonid Logvinov2017-07-041-2/+2
| | * | Fix commentLeonid Logvinov2017-07-041-1/+1
| | * | Fix commentLeonid Logvinov2017-07-011-1/+1
| | * | Fix commentLeonid Logvinov2017-07-011-1/+1
| | * | Remove constructorLeonid Logvinov2017-07-011-3/+0
| | * | Fix proxy commentLeonid Logvinov2017-07-011-1/+1
| | * | Fix namingLeonid Logvinov2017-07-011-2/+3
| | * | Fix a typo in authorizedLeonid Logvinov2017-07-011-3/+3
| | * | Fix a bug in getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-07-011-2/+7
| | * | Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-07-011-1/+1
| | * | Change 'changes' to 'latest changes' for no good reason in CHANGELOG.mdLeonid Logvinov2017-07-011-1/+1
| | * | Add tests for getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-06-301-0/+12
| | * | Remove unused code from test/proxy_wrapper_test.tsLeonid Logvinov2017-06-301-12/+0
| | * | Add a test for a ProxyWrapperLeonid Logvinov2017-06-301-0/+35
| | * | Fix a typo in authorizedLeonid Logvinov2017-06-302-2/+2
| | * | Rename _proxy to _proxyWrapperLeonid Logvinov2017-06-301-4/+4
| | * | Make zeroEx.getOrderHashHex non-asyncLeonid Logvinov2017-06-302-10/+10
| | * | Fix typo in getAvailableContractAddressesAsyncLeonid Logvinov2017-06-302-3/+3
| | * | Implement getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-06-301-0/+16
| | * | Store ProxyWrapper instance in ExchangeWrapperLeonid Logvinov2017-06-301-1/+4
| | * | Add ProxyWrapper instance to zeroExLeonid Logvinov2017-06-301-1/+5
| | * | Add Proxy wrapperLeonid Logvinov2017-06-301-0/+36
| | * | Add type for a ProxyContractLeonid Logvinov2017-06-301-0/+6
| | * | Make it clear that we are using a fake address in testsLeonid Logvinov2017-06-301-2/+2
| | * | Rename Exchange.json to Exchange_v1.jsonLeonid Logvinov2017-06-302-1/+1
| | * | Factor out ZRXtokenAddress variableLeonid Logvinov2017-06-301-1/+2
| | * | Rename ZeroExError.CONTRACT_DOES_NOT_EXIST to ZeroExError.EXCHANGE_CONTRACT_D...Leonid Logvinov2017-06-302-1/+2
| | * | Fix a typo in a nameLeonid Logvinov2017-06-301-2/+2
| | * | Factor out exchangeArtifacts variableLeonid Logvinov2017-06-301-1/+2
| | * | Check that artefacts by networkId are not undefined before getting the addressLeonid Logvinov2017-06-301-2/+5
| | * | Fix a typo in a nameLeonid Logvinov2017-06-301-1/+1
| | * | Fix a typo in a nameLeonid Logvinov2017-06-302-3/+3
| | * | Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-2/+2
| | * | Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-1/+1
| | * | Mve schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-1/+1
| | * | Make getOrderHashHex a non-async functionLeonid Logvinov2017-06-302-14/+3
| | * | Improve CHANGELOG commentsLeonid Logvinov2017-06-301-2/+2
| | * | Update CHANGELOG.mdLeonid Logvinov2017-06-281-0/+1
| | * | Update contract artefactsLeonid Logvinov2017-06-287-17/+126
| | * | Remove update_contracts call from circleci.ymlLeonid Logvinov2017-06-281-1/+0
| | * | Remove custom Schema type and use one from jsonschemaLeonid Logvinov2017-06-284-13/+6
| | * | Add CHANGELOG.md entryLeonid Logvinov2017-06-271-0/+4
| | * | Remove _getExchangeAddressAsyncLeonid Logvinov2017-06-272-11/+1
| | * | Allow multiple exchange versions t be functional at the same timeLeonid Logvinov2017-06-279-90/+222
| | * | Update copyfiles to copy nested artifactsLeonid Logvinov2017-06-271-1/+1
| | * | Move exchange artifacts to an exchange subfolderLeonid Logvinov2017-06-272-1/+1
| |/ /
| | * Check for a BigNumber instanceLeonid Logvinov2017-07-041-1/+8
| | * Use _.isString instead of instanceofLeonid Logvinov2017-07-041-1/+1
| | * Wrap all event args in a newer version of BigNumber and test itLeonid Logvinov2017-07-023-22/+44
| |/ |/|
* | Fix contracts repo commit in circle.ymlLeonid Logvinov2017-07-021-1/+1
|/
* Add the 0xproject profile flag to the AWS cli command so that devs can have t...Fabio Berger2017-06-271-1/+1
* 0.7.1v0.7.1Fabio Berger2017-06-271-1/+1
* Add 0.7.1 release notesFabio Berger2017-06-271-1/+4
* Change all the dates from July to June in changelogFabio Berger2017-06-271-5/+11
* Additional EtherToken comment changesFabio Berger2017-06-271-10/+10
* Improve EtherToken commentsFabio Berger2017-06-271-10/+10
* Merge pull request #81 from 0xProject/addWrappedETHSupportLeonid2017-06-276-4/+205
|\
| * Merge branch 'addWrappedETHSupport' of github.com:0xProject/0x.js into addWra...Fabio Berger2017-06-270-0/+0
| |\
| | * Remove .only from describeLeonid Logvinov2017-06-271-1/+1
| | * Rename INSUFFICIENT_WETH_BALANCE_FOR_WITHDRAWL to INSUFFICIENT_WETH_BALANCE_F...Leonid Logvinov2017-06-273-3/+3
| * | refactor getBalanceInEthAsync to getBalanceInWeiAsync and change the test ass...Fabio Berger2017-06-273-25/+30
| * | Fix typoFabio Berger2017-06-273-3/+3
| |/
| * Implement EtherTokenWrapper and tests, with deposit and withdraw methodsFabio Berger2017-06-265-0/+194
| * Add missing return commentFabio Berger2017-06-261-0/+1
| * Re-wrap BigNumber returned from web3 in `getBalanceInEthAsync`Fabio Berger2017-06-261-1/+2
* | Merge pull request #79 from 0xProject/integration-testsLeonid2017-06-235-4/+74
|\ \
| * | Rename KOVAN_URL to KOVAN_RPC_URLLeonid Logvinov2017-06-232-2/+2
| * | Simplify integration testsLeonid Logvinov2017-06-231-34/+4
| * | Add comment before declarationsLeonid Logvinov2017-06-231-1/+1
| * | Refactor KOVAN_URL to constants and fetch mnemonic from package.jsonLeonid Logvinov2017-06-232-2/+7
| * | Add kovan integration testsLeonid Logvinov2017-06-234-4/+99
* | | Merge pull request #80 from 0xProject/greenkeeper/web3-typescript-typings-0.0.10Leonid2017-06-231-1/+1
|\ \ \ | |_|/ |/| |
| * | chore(package): update web3-typescript-typings to version 0.0.10greenkeeper[bot]2017-06-231-1/+1
|/ /
* | Fix version in CHANGELOGFabio Berger2017-06-231-1/+1
* | 0.7.0v0.7.0Fabio Berger2017-06-231-1/+1
* | Add changelog for v0.7.2Fabio Berger2017-06-231-0/+6
|/
* Fix incorrect merge consequencesLeonid Logvinov2017-06-231-3/+3
* Merge pull request #72 from 0xProject/fill-order-amuontLeonid2017-06-232-6/+60
|\
| * Merge branch 'master' into fill-order-amuontLeonid2017-06-2322-112/+701
| |\ | |/ |/|
* | Merge pull request #78 from 0xProject/update-contractsFabio Berger2017-06-236-17/+622
|\ \
| * | Update contractsLeonid Logvinov2017-06-226-17/+622
|/ /
* | Merge pull request #77 from 0xProject/revert-71-lodash-tree-shakeLeonid2017-06-2215-93/+76
|\ \
| * | Revert "Use different lodash import syntax which allows to include only used ...Leonid2017-06-2215-93/+76
|/ /
* | Merge pull request #73 from 0xProject/json-docsLeonid2017-06-221-1/+3
|\ \
| * | Set content typeLeonid Logvinov2017-06-221-1/+1
| * | Grant read permissions to all usersLeonid Logvinov2017-06-221-1/+1
| * | Auto-upload json docs on releaseLeonid Logvinov2017-06-221-1/+3
|/ /
| * Add test for return amount from fillOrdersUpToAsyncLeonid Logvinov2017-06-221-0/+6
| * Return filledTakerTokenAmount from fillOrdersUpToAsyncLeonid Logvinov2017-06-221-3/+10
| * Add test for cancelOrderAsync return valueLeonid Logvinov2017-06-221-0/+4
| * Return cancelledAmount from cancelOrderAsyncLeonid Logvinov2017-06-221-1/+6
| * Add simple test checking that fillOrderAsync return filled amountLeonid Logvinov2017-06-221-0/+10
| * Fix return commentLeonid Logvinov2017-06-221-1/+1
| * Return filledAmount from fillOrderAsyncLeonid Logvinov2017-06-212-1/+24
|/
* Rename Log*Args to Log*ContractEventArgsLeonid Logvinov2017-06-212-5/+5
* 0.6.2v0.6.2Leonid Logvinov2017-06-211-1/+1
* Revert "Temporarily use forked version of truffle-contract to reduce the bundle"Leonid Logvinov2017-06-212-8/+18
* Updat CHANGELOG.md with v0.6.2Leonid Logvinov2017-06-211-1/+5
* Merge pull request #70 from 0xProject/greenkeeper/@types/node-8.0.1Leonid2017-06-211-1/+1
|\
| * chore(package): update @types/node to version 8.0.1greenkeeper[bot]2017-06-211-1/+1
* | Merge pull request #71 from 0xProject/lodash-tree-shakeLeonid2017-06-2115-76/+93
|\ \
| * | Fall back to import x = require() syntaxLeonid Logvinov2017-06-2116-33/+32
| * | Use different lodash import syntax which allows to include only used functionsLeonid Logvinov2017-06-2116-76/+94
| |/
* / Temporarily use forked version of truffle-contract to reduce the bundleLeonid Logvinov2017-06-212-18/+8
|/
* Connect to github over https so that it works without authenticationLeonid Logvinov2017-06-202-3/+3
* Add Greenkeeper badgeLeonid2017-06-201-0/+1
* Move out of @0xproject scopeLeonid Logvinov2017-06-201-1/+1
* Merge pull request #69 from 0xProject/improveReadmeFabio Berger2017-06-201-2/+49
|\
| * Add documentation sectionFabio Berger2017-06-201-3/+3
| * Include two links to the documentationFabio Berger2017-06-201-1/+3
| * Add the installation instructions to the READMEFabio Berger2017-06-201-2/+32
| * Improve the READMEFabio Berger2017-06-191-2/+17
* | Add missing semi-colonFabio Berger2017-06-201-1/+1
* | Add newline between type defsFabio Berger2017-06-201-0/+1
* | Improve commentFabio Berger2017-06-201-3/+3
* | 0.6.1Leonid Logvinov2017-06-201-1/+1
* | Update CHANGELOG.mdLeonid Logvinov2017-06-201-1/+4
* | Fix tslint issueFabio Berger2017-06-191-1/+2
|/
* Update version in package.jsonFabio Berger2017-06-191-1/+1
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-06-1916-81/+394
|\
| * Merge pull request #68 from 0xProject/changelogLeonid2017-06-191-0/+12
| |\
| | * Remove coveralls integration from CHANGELOG.mdLeonid Logvinov2017-06-191-2/+1
| | * Add CHANGELOG.mdLeonid Logvinov2017-06-191-0/+13
| |/
| * Merge pull request #66 from 0xProject/event-typesLeonid2017-06-193-2/+36
| |\
| | * Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgsLeonid Logvinov2017-06-193-7/+7
| | * Merge branch 'master' into event-typesLeonid2017-06-1511-23/+29
| | |\ | | |/ | |/|
| * | Merge pull request #67 from 0xProject/web3-providerFabio Berger2017-06-1511-23/+29
| |\ \
| | * | Fix bug in 0x.js tests when passing Web3 instead of Web3 ProviderLeonid Logvinov2017-06-151-1/+1
| | * | Switch back to using Web3.Provider, not Web3Provider in internal classesLeonid Logvinov2017-06-151-4/+3
| | * | Add explaining comment for the web3Provider typeLeonid Logvinov2017-06-151-1/+5
| | * | Make ZeroEx constructor accept Web3Provider instead of Web3 instanceLeonid Logvinov2017-06-1511-24/+27
| |/ /
| | * Add actual type for contract event argumentsLeonid Logvinov2017-06-153-2/+36
| |/
| * Merge pull request #65 from 0xProject/coverallsLeonid2017-06-154-13/+125
| |\
| | * Add badge to READMELeonid Logvinov2017-06-151-0/+1
| | * Report test coverage on CILeonid Logvinov2017-06-151-0/+1
| | * Add node script to report coverageLeonid Logvinov2017-06-151-0/+1
| | * Add coveralls as a dependencyLeonid Logvinov2017-06-152-13/+122
| |/
| * Remove unused importLeonid Logvinov2017-06-151-1/+0
| * 0.5.2Leonid Logvinov2017-06-151-1/+1
| * Fix bug in postinstall scriptLeonid Logvinov2017-06-151-1/+1
| * 0.5.1Leonid Logvinov2017-06-151-1/+1
| * Add postrelease script to publish assets to githubLeonid Logvinov2017-06-152-8/+193
| * Set NODE_ENV to production for production builds and don't rely on webpack mi...Leonid Logvinov2017-06-151-1/+1
| * Fix lodash import bug in webpack configLeonid Logvinov2017-06-151-1/+1
| * Update web3-provider-engine cause the console.log issue was fixed and the new...Leonid Logvinov2017-06-152-43/+8
* | Add and improve commentsFabio Berger2017-06-164-17/+43
|/
* 0.5.0v0.5.0Leonid Logvinov2017-06-141-1/+1
* Remove types that are not used in public interface from export and rename Eve...Leonid Logvinov2017-06-145-19/+14
* Merge branch 'master' of github.com:0xProject/0x.jsLeonid Logvinov2017-06-141-1/+1
|\
| * Update doc:json command to exclude privates and externalsFabio Berger2017-06-141-1/+1
* | 0.4.0Leonid Logvinov2017-06-141-1/+1
|/
* Merge pull request #64 from 0xProject/eventsLeonid2017-06-146-31/+74
|\
| * Address feedbackLeonid Logvinov2017-06-141-2/+2
| * Rename ZeroExEvent to EventEmitterLeonid Logvinov2017-06-133-14/+14
| * Revert "0.4.0"Leonid Logvinov2017-06-131-1/+1
| * Add tests for stopWatchingAsyncLeonid Logvinov2017-06-131-0/+20
| * 0.4.0Leonid Logvinov2017-06-131-1/+1
| * Bind watch function on an eventLeonid Logvinov2017-06-131-1/+1
| * Refactor subscription to return zeroExSignature objectLeonid Logvinov2017-06-135-28/+51
| * 0.3.0v0.3.0Leonid Logvinov2017-06-131-1/+1
|/
* Add getContractAddressAsync and testsLeonid Logvinov2017-06-132-0/+16
* 0.2.3v0.2.3Leonid Logvinov2017-06-131-1/+1
* Merge pull request #63 from 0xProject/api-refactorLeonid2017-06-1311-18/+38
|\
| * Fix testLeonid Logvinov2017-06-131-1/+1
| * Fix testLeonid Logvinov2017-06-131-1/+1
| * Change UMD bundle nameLeonid Logvinov2017-06-131-2/+2
| * Export DoneCallbackLeonid Logvinov2017-06-131-0/+1
| * Introduce index.ts file which defines public interfaceLeonid Logvinov2017-06-1310-16/+35
|/
* 0.2.2v0.2.2Leonid Logvinov2017-06-121-1/+1
* Remove src from npmignoreLeonid Logvinov2017-06-121-1/+0
* 0.2.1v0.2.1Leonid Logvinov2017-06-121-1/+1
* Don't prefix main and types path in package.json with ./Leonid Logvinov2017-06-121-2/+2
* 0.2.0v0.2.0Leonid Logvinov2017-06-121-1/+1
* Change main file name from 0x.js.ts to 0x.tsLeonid Logvinov2017-06-1210-11/+11
* Duplicate truffle contracts typesLeonid Logvinov2017-06-112-1/+9
* Add type referencesLeonid Logvinov2017-06-111-0/+2
* Add main and types fields to package.jsonLeonid Logvinov2017-06-111-0/+2
* Revert "Make private"Leonid Logvinov2017-06-111-1/+0
* 0.1.0Leonid Logvinov2017-06-111-1/+1
* Make privateLeonid Logvinov2017-06-111-0/+1
* Add 0xproject scopeLeonid Logvinov2017-06-111-1/+2
* Merge pull request #62 from 0xProject/privateLeonid2017-06-118-172/+173
|\
| * Merge branch 'master' into privateLeonid2017-06-116-36/+86
| |\ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 10:22:01 +0800