aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* README on derivation pathJacob Evans2018-03-082-0/+13
* Use our dev seed derivation path.Jacob Evans2018-03-081-1/+3
* READMEJacob Evans2018-03-071-0/+20
* Add ledger-node package as optional dependencyJacob Evans2018-03-074-184/+208
* Force shouldGetChainCode to true in typesJacob Evans2018-03-061-2/+4
* Nuke tests for nowJacob Evans2018-03-066-230/+209
* Remove old ledgerJacob Evans2018-03-062-39/+0
* Update ledgerco packagesJacob Evans2018-03-065-32/+76
* Merge pull request #434 from 0xProject/addMissingReadmeInstructionsFabio Berger2018-03-0511-1/+79
|\
| * remove from devDepsFabio Berger2018-03-051-1/+0
| * Remove date for nowFabio Berger2018-03-051-1/+1
| * Add ethers typescript typings to 0x.js deps. The library works without this a...Fabio Berger2018-03-052-0/+5
| * Add missing instructions to add external types to tsconfig.json after instal...Fabio Berger2018-03-059-0/+74
|/
* Fix bugs in postpublish_utils.jsFabio Berger2018-03-051-3/+13
* Update @0xproject/utils in top-level package.jsonFabio Berger2018-03-051-1/+1
* Changelog tweaksFabio Berger2018-03-056-7/+7
* Publishweb3-typescript-typings@0.10.0ethers-typescript-typings@0.0.2contracts@2.1.14chai-typescript-typings@0.0.4chai-as-promised-typescript-typings@0.0.10@0xproject/website@0.0.17@0xproject/web3-wrapper@0.2.0@0xproject/utils@0.4.0@0xproject/types@0.3.0@0xproject/tslint-config@0.4.10@0xproject/testnet-faucets@1.0.15@0xproject/subproviders@0.6.0@0xproject/monorepo-scripts@0.1.12@0xproject/json-schemas@0.7.13@0xproject/dev-utils@0.2.0@0xproject/deployer@0.2.0@0xproject/connect@0.6.2@0xproject/base-contract@0.0.2@0xproject/assert@0.1.0@0xproject/abi-gen@0.2.40x.js@0.33.0Fabio Berger2018-03-0521-115/+114
* Updated CHANGELOGSFabio Berger2018-03-0511-12/+12
* Merge pull request #432 from 0xProject/improveLedgerSubproviderFabio Berger2018-03-044-6/+19
|\
| * Fix typoFabio Berger2018-03-042-2/+2
| * Add PR number to changelog entryFabio Berger2018-03-041-1/+1
| * Merge branch 'development' into improveLedgerSubproviderFabio Berger2018-03-0423-110/+245
| |\ | |/ |/|
* | Merge pull request #430 from 0xProject/0x.js/updateTypeDocFabio Berger2018-03-0414-91/+222
|\ \
| * | Remove unnecessary type assertionFabio Berger2018-03-041-1/+1
| * | Fix commentsFabio Berger2018-03-042-2/+2
| * | Add commentsFabio Berger2018-03-042-0/+6
| * | Don't need any external packages for 0x connect docs yetFabio Berger2018-03-042-2/+6
| * | Instead of adding `@0xproject/types` to tsconfig.json, let's only add it when...Fabio Berger2018-03-048-7/+33
| * | Fix stylingFabio Berger2018-03-041-22/+23
| * | Make prettier ignore postpublish_utilsFabio Berger2018-03-041-0/+1
| * | Merge branch 'development' into 0x.js/updateTypeDocFabio Berger2018-03-0431-71/+71
| |\ \
| * | | Add hack commentFabio Berger2018-03-041-0/+3
| * | | Add comment about typeDoc versionsFabio Berger2018-03-041-1/+1
| * | | Add support for merging multiple topLevel packages under a single section. Fo...Fabio Berger2018-03-031-20/+27
| * | | Because we now include non-0x.js source, the keys changed. Needed to add both...Fabio Berger2018-03-031-8/+25
| * | | Add support for backward compatibility for TypeDoc versions <0.9.0Fabio Berger2018-03-032-3/+11
| * | | Consolidate all same exports togetherFabio Berger2018-03-031-2/+1
| * | | Add @0xproject/types to 0x.js tsconfig `include` so that TypeDoc also include...Fabio Berger2018-03-031-0/+1
| * | | Fix small bug where onHover type declarations with comments was taking up the...Fabio Berger2018-03-031-1/+3
| * | | Update to custom typeDoc fork with latest version (TS 2.7.0 support) + a bug ...Fabio Berger2018-03-037-35/+91
* | | | Merge pull request #429 from 0xProject/fix/incorrectDepsFabio Berger2018-03-0410-18/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Move web3 typings from devDeps to depsFabio Berger2018-03-032-2/+3
| * | | remove extrenuous commaFabio Berger2018-03-031-1/+1
| * | | Add PR numberFabio Berger2018-03-033-3/+3
| * | | Add changelog entries from types and utilsFabio Berger2018-03-032-1/+3
| * | | Add changelog entry to subprovidersFabio Berger2018-03-031-0/+4
| * | | Remove extra commaFabio Berger2018-03-031-1/+1
| * | | Move web3 and ethers types to deps for utils packageFabio Berger2018-03-031-4/+4
| * | | Make web3 typings a dep for web3WrapperFabio Berger2018-03-031-2/+2
| * | | Make web3 typings a dep for subprovidersFabio Berger2018-03-031-2/+2
| * | | reorder depsFabio Berger2018-03-031-2/+2
| * | | Move ethers and web3 types to deps since both are required when interacting w...Fabio Berger2018-03-031-4/+4
| * | | Move web3 typings to dependencies since the types package cannot function wit...Fabio Berger2018-03-031-3/+3
| |/ /
| | * Add changelog update to subproviders packageFabio Berger2018-03-041-0/+4
| | * Add `numberOfAccounts` param to `LedgerSubprovider` method `getAccountsAsync`...Fabio Berger2018-03-043-6/+18
| |/ |/|
* | Update yarn.lockFabio Berger2018-03-041-26/+1
* | Update yarn.lockFabio Berger2018-03-041-1/+26
* | Update all mentions of the repo name being `0x.js` to `0x-monorepo`Fabio Berger2018-03-0431-71/+71
|/
* Improve repo description in READMEFabio Berger2018-03-031-1/+1
* Merge pull request #427 from 0xProject/fix/doc_bugsFabio Berger2018-03-0329-108/+315
|\
| * Small stylistic improvementsFabio Berger2018-03-032-4/+17
| * Improve icon sizesFabio Berger2018-03-033-0/+0
| * Fix comment and use named variable in conditionalFabio Berger2018-03-031-2/+3
| * Hash hash instead of prefixedHash to scrollToHash functionFabio Berger2018-03-034-8/+9
| * Fix link to intro tutorial wiki articleFabio Berger2018-03-031-1/+1
| * Make sure the page has loaded (including all images) before scrolling to hashFabio Berger2018-03-031-1/+2
| * Move onPageLoadAsync to utilsFabio Berger2018-03-032-9/+9
| * Give all container files the proper file suffix: tsFabio Berger2018-03-0210-0/+0
| * Add hash to URL onClickFabio Berger2018-03-021-1/+3
| * Add underline to internal linksxFabio Berger2018-03-021-1/+4
| * Undo config changesFabio Berger2018-03-021-3/+4
| * Merge branch 'development' into fix/doc_bugsFabio Berger2018-03-0210-3/+558
| |\ | |/ |/|
* | Merge pull request #425 from 0xProject/feature/build_watchLeonid Logvinov2018-03-029-3/+537
|\ \
| * | Adjust the testsLeonid Logvinov2018-03-023-42/+49
| * | Move tutorials to adhere to current dir structureLeonid Logvinov2018-03-023-0/+0
| * | Make tests slightly nicerLeonid Logvinov2018-03-021-16/+23
| * | Remove onlyLeonid Logvinov2018-03-021-1/+1
| * | Improve the commentsLeonid Logvinov2018-03-021-0/+4
| * | Improve the commentsLeonid Logvinov2018-03-021-1/+4
| * | Add comments to Arbitrage contractLeonid Logvinov2018-03-021-21/+28
| * | Don't pass tokenGet and tokenGive because we can get them from 0x orderLeonid Logvinov2018-03-022-14/+10
| * | Pretty-print ED contractsLeonid Logvinov2018-03-022-167/+167
| * | Make externalLeonid Logvinov2018-03-021-1/+1
| * | Fix a typoLeonid Logvinov2018-03-021-2/+2
| * | Change type to uint256Leonid Logvinov2018-03-021-1/+1
| * | Make setAllowances externalLeonid Logvinov2018-03-021-1/+1
| * | Fix the commentLeonid Logvinov2018-03-021-1/+1
| * | Put all ED contracts in one folderLeonid Logvinov2018-03-022-1/+1
| * | Move tutorials contracts to src folderLeonid Logvinov2018-03-023-8/+7
| * | Remove false-positive linter failure because of chai-as-pronmised incorrect t...Leonid Logvinov2018-03-021-0/+1
| * | Assert that the balances don't change if arbitrage failsLeonid Logvinov2018-03-021-4/+7
| * | Initial implementation of Arbitrage contract with testsLeonid Logvinov2018-03-029-1/+508
|/ /
* | Merge pull request #418 from 0xProject/feature/facuet/balance-checkJacob Evans2018-03-011-0/+21
|\ \
| * | Set max to 2 ETH/2 ZRXJacob Evans2018-03-011-4/+4
| * | Prevent a single account from draining the faucetJacob Evans2018-02-271-0/+21
| | * Update react-markdown, properly scroll to section for wiki internal links, co...Fabio Berger2018-03-0210-47/+93
| | * Update yarn lockFabio Berger2018-03-021-47/+185
| | * Use custom fork of react-highlight with support for Solidity syntax highlightingFabio Berger2018-03-021-1/+1
| | * Fix bug where contract event anchor ids were incorrectFabio Berger2018-03-011-2/+3
| |/ |/|
* | Add missing types from websiteFabio Berger2018-03-012-1/+6
* | Merge pull request #422 from 0xProject/feature/new-prettierLeonid Logvinov2018-02-2811-45/+45
|\ \
| * | Upgrate prettierLeonid Logvinov2018-02-2811-45/+45
* | | Merge pull request #423 from 0xProject/feature/base-contractLeonid Logvinov2018-02-2813-185/+301
|\ \ \
| * | | Add dependenciesLeonid Logvinov2018-02-282-0/+2
| * | | Update the READMELeonid Logvinov2018-02-281-4/+4
| * | | Move BaseContract to its own packageLeonid Logvinov2018-02-2811-185/+299
| |/ /
* | | Merge pull request #421 from 0xProject/moveOutDocGeneratorFabio Berger2018-02-2815-252/+317
|\ \ \ | |/ / |/| |
| * | remove unused importFabio Berger2018-02-281-1/+0
| * | Move more configs into docsInfo and remove logic that does not belong there e...Fabio Berger2018-02-2814-134/+165
| * | Update missed docsJsonRoot variablesFabio Berger2018-02-271-5/+2
| * | remove docsJsonRoot from docsInfoFabio Berger2018-02-277-14/+13
| * | Remove unused propsFabio Berger2018-02-262-6/+0
| * | Merge branch 'development' into moveOutDocGeneratorFabio Berger2018-02-2665-4524/+465
| |\|
| * | Begin refactoring out doc generator templateFabio Berger2018-02-225-106/+151
* | | Merge pull request #413 from 0xProject/feature/ethers-contractsLeonid Logvinov2018-02-2879-545/+749
|\ \ \
| * | | Add ethers-contracts as a dependencyLeonid Logvinov2018-02-281-0/+1
| * | | Include types for ethers-contractsLeonid Logvinov2018-02-281-0/+1
| * | | Fix the versionLeonid Logvinov2018-02-281-1/+1
| * | | Include types for ethers-contractsLeonid Logvinov2018-02-282-0/+2
| * | | Rename idx to iLeonid Logvinov2018-02-281-2/+2
| * | | Remove tslint disableLeonid Logvinov2018-02-281-1/+0
| * | | Move BaseContract to web3WrapperLeonid Logvinov2018-02-2810-272/+194
| * | | Merge ifsLeonid Logvinov2018-02-281-8/+6
| * | | Fix an option descriptionLeonid Logvinov2018-02-281-1/+1
| * | | Add link to the docsLeonid Logvinov2018-02-281-1/+1
| * | | Improve CHANGELOG entryLeonid Logvinov2018-02-281-1/+1
| * | | Remove unused paramLeonid Logvinov2018-02-281-1/+1
| * | | Add txData to async callsLeonid Logvinov2018-02-284-6/+14
| * | | Include ethers typesLeonid Logvinov2018-02-286-1/+10
| * | | Create ethers-typescript-typingsLeonid Logvinov2018-02-289-58/+94
| * | | Rewrite templates to decode call data on transactionsLeonid Logvinov2018-02-285-47/+33
| * | | Add to context dataLeonid Logvinov2018-02-283-0/+3
| * | | Use as a backend to decode event argsLeonid Logvinov2018-02-284-15/+46
| * | | Add as an option toLeonid Logvinov2018-02-282-1/+2
| * | | Change backend for contracts contractsLeonid Logvinov2018-02-283-8/+8
| * | | Fix namingsLeonid Logvinov2018-02-282-4/+4
| * | | Update template linkLeonid Logvinov2018-02-281-1/+1
| * | | Add PR numberLeonid Logvinov2018-02-282-3/+3
| * | | Fix buildLeonid Logvinov2018-02-282-6/+6
| * | | Use the same templates as 0x.jsLeonid Logvinov2018-02-2830-184/+178
| * | | Pass components to parameterTypeLeonid Logvinov2018-02-281-1/+1
| * | | Apply prettier after generating contractsLeonid Logvinov2018-02-282-3/+3
| * | | Add CHANGELOG entryLeonid Logvinov2018-02-281-0/+1
| * | | Fix build by using local events typesLeonid Logvinov2018-02-288-23/+72
| * | | Add support for ABIv2 to abi-genLeonid Logvinov2018-02-286-10/+35
| * | | Allow users to specify the contracts backend in abi-genLeonid Logvinov2018-02-2819-71/+199
| * | | Add data to TxDataLeonid Logvinov2018-02-282-0/+5
| * | | Pass whole txData to estimateGasLeonid Logvinov2018-02-281-1/+1
| * | | Fix default contract set calculationLeonid Logvinov2018-02-281-0/+3
| * | | Fix default pathsLeonid Logvinov2018-02-281-2/+2
| * | | Add web3Wrapper.callAsync and remove web3Wrapper.getContractInstanceLeonid Logvinov2018-02-283-10/+12
* | | | Merge pull request #420 from 0xProject/fix/multiple-return-docsLeonid Logvinov2018-02-281-5/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Fix a bug with displaying solidity functions returning multiple return valuesLeonid Logvinov2018-02-281-5/+11
|/ / /
* | | Merge pull request #415 from 0xProject/fix/unsubscribeAllLeonid Logvinov2018-02-289-12/+13
|\ \ \
| * \ \ Merge branch 'development' into fix/unsubscribeAllLeonid Logvinov2018-02-2811-71/+152
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #373 from 0xProject/feature/0x.js/lowercase-addressesFabio Berger2018-02-2811-70/+151
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'development' into feature/0x.js/lowercase-addressesJacob Evans2018-02-2768-4769/+1374
| |\ \ \ | |/ / / |/| | |
| * | | Lowercase web3 wrapper addressesJacob Evans2018-02-272-3/+9
| * | | Check isETHAddressHex before lowercaseJacob Evans2018-02-279-67/+60
| * | | Check maker is valid addressJacob Evans2018-02-231-3/+8
| * | | Lowercase public addressesJacob Evans2018-02-236-89/+172
| | * | Rename _unsubscribeAll to unsubscribeAllLeonid Logvinov2018-02-279-12/+13
| |/ / |/| |
* | | Fix english translationsFabio Berger2018-02-241-3/+3
* | | Fix footer on mobileFabio Berger2018-02-241-5/+3
* | | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2018-02-2410-31/+92
|\ \ \
| * \ \ Merge pull request #385 from 0xProject/feature/0x_config_validationLeonid Logvinov2018-02-2410-31/+92
| |\ \ \
| | * | | Update CHANGELOGLeonid Logvinov2018-02-212-1/+7
| | * | | Remove unused CHANGELOG entryLeonid Logvinov2018-02-211-4/+0
| | * | | Remove unused importLeonid Logvinov2018-02-211-1/+1
| | * | | Change assert.doesConformToShema interfaceLeonid Logvinov2018-02-212-8/+8
| | * | | Remove a type assertionLeonid Logvinov2018-02-211-1/+1
| | * | | Remove type-level validationLeonid Logvinov2018-02-155-29/+12
| | * | | Access property over thisLeonid Logvinov2018-02-151-1/+1
| | * | | Add type castLeonid Logvinov2018-02-151-1/+1
| | * | | Fix testsLeonid Logvinov2018-02-155-9/+13
| | * | | Add entries to the CHANGELOGLeonid Logvinov2018-02-155-4/+12
| | * | | Better validate ZeroExConfig on public networksLeonid Logvinov2018-02-156-35/+99
* | | | | re-add google analytics codeFabio Berger2018-02-241-0/+12
|/ / / /
* | | | Fix Russian translationFabio Berger2018-02-231-1/+1
* | | | Merge pull request #411 from 0xProject/fix/types/dev-dependenciesBrandon Millman2018-02-235-5/+5
|\ \ \ \
| * | | | Move all dependencies on @0xproject/types out of devDependenciesBrandon Millman2018-02-225-5/+5
|/ / / /
* | | | Slight improvement to footerFabio Berger2018-02-221-1/+1
* | | | Fix a few Korean translationsFabio Berger2018-02-221-3/+3
* | | | Merge pull request #410 from 0xProject/translateHomepageFabio Berger2018-02-2232-341/+1071
|\ \ \ \ | | |_|/ | |/| |
| * | | Move from storing translations in TS files to JSON filesFabio Berger2018-02-2212-453/+427
| * | | Remove Segment.ioFabio Berger2018-02-221-57/+0
| * | | Remove unused varFabio Berger2018-02-221-2/+0
| * | | Remove extenuous defaultPropsFabio Berger2018-02-222-4/+0
| * | | Make translate required by footerFabio Berger2018-02-221-1/+1
| * | | Make translate a required prop of TopBarFabio Berger2018-02-222-1/+2
| * | | Keep topBar and footer language to the one picked by the userFabio Berger2018-02-2218-16/+159
| * | | Re-set language to browserFabio Berger2018-02-221-1/+1
| * | | Fix rocket.chat keyFabio Berger2018-02-221-1/+1
| * | | Mobile optimize translated landing pageFabio Berger2018-02-222-10/+40
| * | | Improve russian translationsLeonid Logvinov2018-02-211-17/+17
| * | | Improve homepage and add translations in chinese, russian, korean and spanishFabio Berger2018-02-2110-16/+398
| * | | Move translate to reduxFabio Berger2018-02-215-91/+161
| * | | Add translation infra and replace english text with calls to translateFabio Berger2018-02-216-219/+412
| * | | Move tsconfig package to devDepsFabio Berger2018-02-211-1/+1
* | | | Merge pull request #408 from 0xProject/fix/deployer/checkDependenciesAmir Bandeali2018-02-2121-4384/+194
|\ \ \ \ | |_|_|/ |/| | |
| * | | Address feedbackAmir Bandeali2018-02-216-50/+55
| * | | Use source tree hash instead of compile flagAmir Bandeali2018-02-213-44/+43
| * | | Fix race conditionAmir Bandeali2018-02-213-11/+14
| * | | Update CHANGELOGAmir Bandeali2018-02-211-0/+4
| * | | Delete artifacts directoryAmir Bandeali2018-02-2111-4287/+0
| * | | Add generated contract artifacts to gitignoreAmir Bandeali2018-02-211-0/+3
| * | | Check dependencies when determining if should be recompiledAmir Bandeali2018-02-216-80/+163
|/ / /
* | | Merge pull request #401 from 0xProject/feature/web3-abi-v2-typesLeonid2018-02-213-8/+11
|\ \ \
| * \ \ Merge branch 'development' into feature/web3-abi-v2-typesLeonid2018-02-2188-1561/+832
| |\ \ \ | |/ / / |/| | |
* | | | Publish@0xproject/connect@0.6.1Brandon Millman2018-02-171-1/+1
* | | | Updated CHANGELOGsBrandon Millman2018-02-171-1/+1
* | | | Merge pull request #407 from 0xProject/fix/connect/empty-responseBrandon Millman2018-02-172-5/+8
|\ \ \ \
| * | | | Do not JSON parse empty reponseBrandon Millman2018-02-172-5/+8
|/ / / /
* | | | Fix incorrect comment on WebSocketOrderbookChannel constructorBrandon Millman2018-02-171-1/+1
* | | | Fix broken postpublish script in connectBrandon Millman2018-02-171-1/+1
* | | | Updated top level @0xproject/utils dependencyBrandon Millman2018-02-171-1/+1
* | | | 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-1715-71/+71
* | | | Updated CHANGELOGsBrandon Millman2018-02-175-10/+10
* | | | Merge pull request #406 from 0xProject/feature/connect/heartbeatBrandon Millman2018-02-177-2/+56
|\ \ \ \ | |_|/ / |/| | |
| * | | Add an enforced minimum for the heartbeat intervalBrandon Millman2018-02-162-2/+15
| * | | Add configurable heartbeat to WebSocketOrderbookChannelBrandon Millman2018-02-167-2/+43
* | | | Add Rinkeby network to smart contract docsFabio Berger2018-02-163-0/+8
* | | | Updated CHANGELOGFabio Berger2018-02-161-2/+2
* | | | Merge pull request #405 from 0xProject/refactor/docs-redesignFabio Berger2018-02-1618-167/+362
|\ \ \ \ | |/ / / |/| | |
| * | | remove hard-coded colorFabio Berger2018-02-162-4/+2
| * | | Remove section links until they go somewhereFabio Berger2018-02-161-10/+3
| * | | Add more padding on top of section titleFabio Berger2018-02-161-2/+2
| * | | Add hack comment explaining param count short-cutFabio Berger2018-02-161-0/+3
| * | | replace repeated conditionals with variableFabio Berger2018-02-161-18/+17
| * | | Remove unneeded propsFabio Berger2018-02-162-2/+0
| * | | use const over hard-codingFabio Berger2018-02-161-1/+1
| * | | uncomment dev logicFabio Berger2018-02-162-5/+3
| * | | Re-design docs pagesFabio Berger2018-02-167-39/+91
| * | | Add icons for all doc pagesFabio Berger2018-02-165-0/+0
| * | | Re-designed Wiki and half-redesigned docs pagesFabio Berger2018-02-1614-123/+277
|/ / /
* | | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2018-02-1659-1348/+403
|\ \ \
| * \ \ Merge pull request #400 from 0xProject/feature/deployer/selectContractsAmir Bandeali2018-02-1628-1263/+53
| |\ \ \
| | * | | Rename variablesAmir Bandeali2018-02-165-15/+15
| | * | | Update CHANGELOGAmir Bandeali2018-02-162-1/+5
| | * | | Add npm config for contracts listAmir Bandeali2018-02-161-1/+4
| | * | | Run prettierAmir Bandeali2018-02-1613-24/+558
| | * | | Fix checks, add contract list to compile script in package.jsonAmir Bandeali2018-02-1626-1815/+38
| | * | | Add contracts to compiler optionsAmir Bandeali2018-02-163-2/+28
| |/ / /
| * | | Add missing public types from connect docsBrandon Millman2018-02-152-2/+3
| * | | Merge pull request #392 from 0xProject/feature/subproviders_moveLeonid2018-02-1510-5/+94
| |\ \ \
| | * | | Change imports orderLeonid Logvinov2018-02-151-1/+2
| | * | | Fix a typoLeonid Logvinov2018-02-151-3/+3
| | * | | Add an assertionLeonid Logvinov2018-02-151-2/+4
| | * | | Add PR numbersLeonid Logvinov2018-02-152-2/+2
| | * | | Fix entry pointsLeonid Logvinov2018-02-151-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 01:53:18 +0800