aboutsummaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #958 from 0xProject/feature/sra-api/camel-case-everythingFrancesco Agosti2018-08-149-36/+55
|\
| * Ignore api.json in prettierfragosti2018-08-141-1044/+1
| * apply prettierfragosti2018-08-142-4/+1047
| * Enforce camelCase for all parameters and change the way the site is deployed ...fragosti2018-08-119-33/+52
* | fix(sol-compiler, sol-resolver): Bug where sol-resolver tried to read a direc...Alex Browne2018-08-144-1/+7
* | Merge pull request #938 from 0xProject/sol-cov-fixesFabio Berger2018-08-1410-22/+162
|\ \ | |/ |/|
| * Merge branch 'sol-cov-fixes' of github.com:0xProject/0x-monorepo into sol-cov...Fabio Berger2018-08-1484-136/+1668
| |\
| | * Merge branch 'development' into sol-cov-fixesLeonid Logvinov2018-08-0982-134/+1658
| | |\
| | * | Add @return commentsLeonid Logvinov2018-08-091-0/+9
| | * | Import marshaller directlyLeonid Logvinov2018-08-091-2/+1
| * | | Remove test for unknown prop now that we are allowing additional props fro tx...Fabio Berger2018-08-141-4/+0
| |/ /
| * | Add commentsLeonid Logvinov2018-08-031-0/+39
| * | Add PR numbersLeonid Logvinov2018-08-034-10/+17
| * | Add sol-cov CHANGELOGLeonid Logvinov2018-08-031-0/+20
| * | Read truffle compiler config from truffle.js and assert that the passed solid...Leonid Logvinov2018-08-031-7/+51
| * | Use CallDataRPC in subproviderLeonid Logvinov2018-08-031-7/+8
| * | Add a TODO for failed transactionsLeonid Logvinov2018-08-031-0/+1
| * | Export RPC data types from web3-wrapperLeonid Logvinov2018-08-032-1/+14
| * | Alow additional properties in txData json-schemaLeonid Logvinov2018-08-032-1/+8
| * | Export marshaller from web3-wrapperLeonid Logvinov2018-08-032-0/+9
* | | Merge pull request #948 from 0xProject/feature/contracts/forwarderFoKAmir Bandeali2018-08-1010-163/+84
|\ \ \
| * | | Change withdrawERC20 => withdrawAsset, reuse transfer logicAmir Bandeali2018-08-106-22/+40
| * | | Make marketBuy functions revert if entire amount not filledAmir Bandeali2018-08-106-141/+44
* | | | Fix order-watcher json-schemasfragosti2018-08-101-1/+1
* | | | Fix linting issuesfragosti2018-08-102-2/+1
* | | | fix contract-wrappers json-schemasfragosti2018-08-1015-271/+186
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-1057-92/+566
|\ \ \ \
| * \ \ \ Merge pull request #949 from 0xProject/fix/update-dependenciesAlex Browne2018-08-1028-43/+43
| |\ \ \ \
| | * | | | fix: Update dependenciesAlex Browne2018-08-1028-43/+43
| | |/ / /
| * | | | Update Clays linkedinfragosti2018-08-101-1/+1
| * | | | Merge https://github.com/0xProject/0x-monorepo into developmentfragosti2018-08-1026-45/+503
| |\| | |
| | * | | Merge pull request #941 from 0xProject/feature/contracts/returnValuesTestsAmir Bandeali2018-08-107-34/+120
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Revert incrementing memory ptr in dispatchTransferFromAmir Bandeali2018-08-093-9/+3
| | | * | Test abiEncodeFillOrder as part of combinatorial follOrder testsAmir Bandeali2018-08-094-16/+46
| | | * | Increment free memory pointer for internal Exchange functions that use asmAmir Bandeali2018-08-093-12/+34
| | | * | Add return values to combinatorial fillOrder testsAmir Bandeali2018-08-092-11/+51
| | * | | Merge pull request #915 from 0xProject/feature/encode-decode-checksAlex Browne2018-08-0919-11/+383
| | |\ \ \
| | | * | | Update comment about ethers checksummed address behaviorAlex Browne2018-08-091-3/+3
| | | * | | Add packages/coverage/.gitkeep fileAlex Browne2018-08-091-0/+0
| | | * | | Update CI config and package.json to run @0xproject/utils tests on CIAlex Browne2018-08-091-1/+5
| | | * | | Update remaining CHANGELOG.json filesAlex Browne2018-08-094-0/+22
| | | * | | Update CHANGELOG.json for contract-wrappersAlex Browne2018-08-091-0/+4
| | | * | | Update ethers typings for TypeScript 2.9.2Alex Browne2018-08-091-2/+2
| | | * | | Update CHANGELOG.json for base-contractAlex Browne2018-08-091-0/+9
| | | * | | Move some ethers-related types to typescript-typings/ethersAlex Browne2018-08-093-13/+25
| | | * | | Apply prettierAlex Browne2018-08-095-25/+36
| | | * | | Add strictArgumentEncodingCheck to BaseContract and use it in contract templatesAlex Browne2018-08-0911-9/+319
| * | | | | Add clay to websitefragosti2018-08-102-0/+11
| |/ / / /
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into d...fragosti2018-08-091-4/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorCommentsAmir Bandeali2018-08-091-4/+9
| | |\ \ \ | | | |/ / | | |/| |
| | | * | fix comments and styling for MixinSignatureValidatorAmir Bandeali2018-08-091-4/+9
| * | | | Change amir picturefragosti2018-08-093-1/+1
| |/ / /
* | | | Apply prettierfragosti2018-08-101-6/+14
* | | | Change scripts folder to build_scriptsfragosti2018-08-102-1/+7
* | | | Force case change in filefragosti2018-08-101-0/+0
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-0936-72/+120
|\| | |
| * | | Merge pull request #947 from 0xProject/feature/confirm-before-publishAlex Browne2018-08-092-9/+15
| |\ \ \
| | * | | fix(monorepo-scripts): Fix typo in git tag commandAlex Browne2018-08-091-1/+1
| | * | | feat(monorepo-scripts): Add confirmation prompt before publishingAlex Browne2018-08-091-8/+14
| * | | | Merge pull request #945 from 0xProject/fix/typescript-2.9.2Alex Browne2018-08-0931-34/+49
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Update TypeScript to version 2.9.2Alex Browne2018-08-0931-34/+49
| | |/ /
| * | | Use asm for hashEIP712Message, increment free memory pointer after asm hashin...Amir Bandeali2018-08-092-9/+28
| * | | Fix comments, styling, and optimize hashOrderAmir Bandeali2018-08-083-25/+33
| |/ /
* | | Remove md hints because the static site cannot handle themfragosti2018-08-091-4/+4
* | | Add section about json-schemas and sra reportfragosti2018-08-091-4/+30
* | | Fix links in markdownfragosti2018-08-091-8/+8
* | | Add to changelog and fix OrderBook typofragosti2018-08-095-9/+19
* | | Correct orderbook typofragosti2018-08-093-7/+7
* | | Enforce that error code are ints not numberfragosti2018-08-091-2/+2
* | | Remove tests directory, use swagger api, make json api compliantfragosti2018-08-096-24/+68
* | | Change remainingFillableAmount to metaDatafragosti2018-08-092-4/+6
* | | Change some static side configsfragosti2018-08-082-13/+15
* | | Add POST order endpointfragosti2018-08-085-12/+56
* | | Add GET fee_recipientsfragosti2018-08-085-0/+39
* | | Add GET order_configfragosti2018-08-085-0/+43
* | | token_pairs -> asset_pairsfragosti2018-08-081-4/+4
* | | Add GET OrderBook endpointfragosti2018-08-083-0/+92
* | | Add GET order endpoint specfragosti2018-08-083-1/+47
* | | Add orders endpointfragosti2018-08-084-1/+175
* | | Minor refactoringfragosti2018-08-084-26/+7
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-0871-1570/+2407
|\| |
| * | Remove assertion commentsBrandon Millman2018-08-071-4/+0
| * | Remove 0x test case from hexSchema testBrandon Millman2018-08-061-1/+1
| * | Update CHANGELOGsBrandon Millman2018-08-062-0/+13
| * | Add some test cases that stress slippageBufferAmount paramBrandon Millman2018-08-061-6/+15
| * | Add tests for findFeeOrdersThatCoverFeesForTargetOrdersBrandon Millman2018-08-064-20/+165
| * | Change orderStates param name to remaingFillableMakerAssetAmountsBrandon Millman2018-08-063-91/+69
| * | Implement first round of tests for findOrdersThatCoverMakerAssetFillAmountBrandon Millman2018-08-065-12/+222
| * | Update hex schema to match 0xBrandon Millman2018-08-061-1/+1
| * | Move helper functions into order-utilsBrandon Millman2018-08-063-100/+111
| * | Add findFeeOrdersThatCoverFeesForTargetOrders to ForwarderWrapperBrandon Millman2018-08-061-5/+60
| * | Add findOrdersThatCoverMakerAssetFillAmount static method on ForwarderWrapperBrandon Millman2018-08-061-1/+44
| * | Move CreateOrderOpts into shared typesBrandon Millman2018-08-063-12/+22
| * | Update createFactory to accept one createOrderOpts param to encompass all opt...Brandon Millman2018-08-064-41/+59
| * | PrettierBrandon Millman2018-08-041-1/+0
| * | Fix CHANGELOGsBrandon Millman2018-08-043-3/+12
| * | Update orderFactory interfaceBrandon Millman2018-08-044-33/+28
| * | Rename to calldata utilsBrandon Millman2018-08-033-16/+16
| * | Add missing PR numbersBrandon Millman2018-08-032-2/+3
| * | CHANGELOGBrandon Millman2018-08-021-0/+4
| * | Add testsBrandon Millman2018-08-022-18/+85
| * | Add createOrder with no signing to orderFactoryBrandon Millman2018-08-023-6/+45
| * | Create marketBuyOrdersOptimizationsBrandon Millman2018-08-023-8/+63
| * | Update contract-wrappers CHANGELOG.jsonBrandon Millman2018-08-021-0/+9
| * | Merge pull request #934 from 0xProject/feature/contract-wrappers/forwaderBrandon Millman2018-08-0211-10/+448
| |\ \ | | |/ | |/|
| | * Clarify ethAmount is in weiBrandon Millman2018-07-311-2/+2
| | * Update forwarder_wrapper_testBrandon Millman2018-07-311-0/+16
| | * Add more assertionsBrandon Millman2018-07-313-6/+102
| | * Write initial test for forwarder_wrapperBrandon Millman2018-07-312-16/+73
| | * Fix spelling error in exchange wrapper testsBrandon Millman2018-07-311-1/+1
| | * Add getOrdersInfo to exchange_wrapperBrandon Millman2018-07-313-3/+32
| | * Implement initial forwarder wrapperBrandon Millman2018-07-318-2/+242
| * | Add the CHANGELOG entry for #909Leonid Logvinov2018-07-311-0/+9
| * | Merge branch 'development' into ritave/resolver-check-dirsLeonid Logvinov2018-07-31201-6198/+59132
| |\|
| | * Add back tags in htmlBrandon Millman2018-07-311-1/+7
| | * Fix jobs page overflow issueBrandon Millman2018-07-303-4/+6
| | * Create MetaTags componentBrandon Millman2018-07-306-75/+117
| | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-07-28188-5949/+58670
| | |\
| | | * Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-2723-1269/+780
| | * | Remove unused variablefragosti2018-07-281-1/+0
| | * | Add loading state for initial load and other PR feedbackfragosti2018-07-282-10/+14
| | * | Make a non-jank Spinner component and use itfragosti2018-07-253-2/+83
| | * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-25128-2299/+2793
| | |\ \
| | * | | Center allowance toggles in account pagefragosti2018-07-251-7/+9
| | * | | Increase allowance toggle loading spinner size by 1fragosti2018-07-251-1/+1
| | * | | Add unlocking and locking token copyfragosti2018-07-251-2/+2
| | * | | Hide tooltip after allowance toggle clickfragosti2018-07-251-1/+3
| | * | | Make tooltip appear to the left of the toggle when onboarding in progressfragosti2018-07-256-3/+20
| | * | | Fix tooltip wrapping issue in onboardinfragosti2018-07-252-8/+16
| | * | | Fix wrap button alignment issuefragosti2018-07-257-224/+40
| | * | | WIP for allowance toggle redesign workingfragosti2018-07-214-16/+118
| | * | | Show token name dynamically in tooltipfragosti2018-07-214-13/+19
| | * | | Implement tooltipsfragosti2018-07-212-8/+56
| | * | | Add loading statefragosti2018-07-213-3/+4
| | * | | Have basic lock and check working in waleltfragosti2018-07-204-13/+93
| * | | | Added fix to CHANGELOGOlaf Tomalka2018-07-271-0/+4
| * | | | Fixed the relative resolver not checking if the file can be read in theOlaf Tomalka2018-07-251-1/+1
| | |/ / | |/| |
* | | | Add discharge config and deployfragosti2018-08-083-3/+36
* | | | Add static site buildfragosti2018-08-083-4/+3
* | | | Add markdown sectionfragosti2018-08-083-3/+188
* | | | Refactor using some utility methodsfragosti2018-08-036-109/+135
* | | | Add errors and headersfragosti2018-08-032-0/+50
* | | | Limit error codes with rangesfragosti2018-08-031-2/+2
* | | | Create asset_pairs SRA endpoint (and establish conventions)fragosti2018-08-034-172/+81
* | | | Enforce stronger naming convention for json schema idsfragosti2018-08-0325-107/+107
* | | | All schema tests paddingfragosti2018-08-021-6/+17
* | | | update orders channel subscribe schemafragosti2018-08-022-76/+14
* | | | Update order book schema testfragosti2018-08-021-18/+43
* | | | Add relayerApiOrdersResponseTestfragosti2018-08-021-0/+33
* | | | Add tests for asset pair endpointfragosti2018-08-022-85/+111
* | | | Group all standard relayer api tests togetherfragosti2018-08-011-405/+406
* | | | Add test for relayerApiOrderSchemafragosti2018-08-014-3/+20
* | | | Add paginated collection test casefragosti2018-08-013-5/+33
* | | | Get schema tests running (not crashiing)fragosti2018-08-015-160/+121
* | | | Update schemas exportfragosti2018-07-311-23/+17
* | | | Update json-schemas for SRA v1fragosti2018-07-3117-115/+157
* | | | Add scriptsfragosti2018-07-282-6/+4
* | | | Add to READMEfragosti2018-07-271-1/+23
* | | | Create API development environment and json distributionfragosti2018-07-272-7/+14
* | | | Rename to sra-apifragosti2018-07-279-7/+8
* | | | Add typescript typings for Open API specfragosti2018-07-272-1/+4
* | | | Reset CHANGELOGfragosti2018-07-272-187/+3
* | | | Add basic smoke testfragosti2018-07-277-7/+181
* | | | Initial commitfragosti2018-07-278-0/+315
| |_|/ |/| |
* | | Publishcontracts@2.1.39@0xproject/website@0.0.43@0xproject/testnet-faucets@1.0.40@0xproject/react-docs-example@0.0.19@0xproject/metacoin@0.0.14@0xproject/abi-gen@1.0.4Fabio Berger2018-07-2627-151/+151
* | | Updated CHANGELOGSFabio Berger2018-07-2636-10/+184
* | | Point to actual current versionFabio Berger2018-07-2611-22/+22
* | | Add changelog entries for other RCs that did publishFabio Berger2018-07-262-0/+16
* | | Fix changelogs and package versions for ones that weren't publishedFabio Berger2018-07-2616-21/+13
* | | Publishcontracts@2.1.38@0xproject/website@0.0.42@0xproject/testnet-faucets@1.0.39@0xproject/sol-compiler@1.0.3@0xproject/react-docs-example@0.0.18@0xproject/monorepo-scripts@1.0.4@0xproject/metacoin@0.0.13@0xproject/abi-gen@1.0.3Fabio Berger2018-07-2631-252/+252
* | | Updated CHANGELOGSFabio Berger2018-07-2652-7/+289
* | | Still test unrunnable packages for compilation issuesFabio Berger2018-07-261-8/+8
* | | Add changelog entries for next RC publishFabio Berger2018-07-267-0/+56
* | | Split running packages that cannot be run in a node.js scriptFabio Berger2018-07-261-1/+9
* | | Fix accidental import from test folderFabio Berger2018-07-261-1/+1
* | | Re-enable deleted the dir after test runsFabio Berger2018-07-261-1/+1
* | | Change test:installation so it also causes run-time errors to appearFabio Berger2018-07-261-3/+10
* | | Fix lint issueFabio Berger2018-07-261-2/+1
* | | Always append monorepo root path so script can be called from anywhereFabio Berger2018-07-261-3/+5
* | | Delete any remenants of test-env dir before creating a new oneFabio Berger2018-07-261-0/+1
* | | Print version that will be testedFabio Berger2018-07-261-1/+1
* | | Add ending slashFabio Berger2018-07-261-1/+1
* | | Add support for testing installations post-publish as wellFabio Berger2018-07-261-2/+4
* | | Fix asset pathFabio Berger2018-07-261-2/+2
* | | Publishcontracts@2.1.37@0xproject/website@0.0.41@0xproject/testnet-faucets@1.0.38@0xproject/react-docs-example@0.0.17@0xproject/monorepo-scripts@1.0.3@0xproject/metacoin@0.0.12@0xproject/abi-gen@1.0.2Fabio Berger2018-07-2631-261/+257
* | | Updated CHANGELOGSFabio Berger2018-07-2652-8/+299
* | | Fix linterFabio Berger2018-07-262-3/+0
* | | Revert to using execAsyncFabio Berger2018-07-261-10/+2
* | | Revert to publishing ethereum-typesFabio Berger2018-07-2618-18/+17
* | | Fix marshaller importFabio Berger2018-07-261-1/+1
* | | Temporarily have all packages depend on an older, published version of ethere...Fabio Berger2018-07-2617-17/+17
* | | Temporarily make ethereum-types private to exclude from publishingFabio Berger2018-07-261-0/+1
* | | Fix changelogsFabio Berger2018-07-266-3/+30
* | | Remove artifacts for gitFabio Berger2018-07-264-3256/+0
* | | Call 'lerna publish' with spawn so we see stderr and stdout in real-timeFabio Berger2018-07-261-2/+10
* | | Merge pull request #902 from 0xProject/feature/web3-wrapper/unexport-marshallerFrancesco Agosti2018-07-263-2/+6
|\ \ \
| * \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-26172-3250/+3947
| |\ \ \
| * | | | Add remove marshaller to changelog notesfragosti2018-07-201-0/+8
| * | | | Stop exporting marshaller from web3-wrapperfragosti2018-07-203-6/+2
* | | | | Remove careers page feature flagBrandon Millman2018-07-262-14/+2
* | | | | Merge pull request #893 from 0xProject/feature/website/jobs-page-part2Brandon Millman2018-07-2630-438/+420
|\ \ \ \ \
| * | | | | Header copy changeBrandon Millman2018-07-261-8/+7
| * | | | | Margin polishBrandon Millman2018-07-262-4/+4
| * | | | | Update open positions sectionBrandon Millman2018-07-253-10/+29
| * | | | | Update benefits sectionBrandon Millman2018-07-253-23/+48
| * | | | | Update mission sectionBrandon Millman2018-07-252-18/+47
| * | | | | Header copy updatesBrandon Millman2018-07-251-6/+16
| * | | | | Use isMobileWidth utilBrandon Millman2018-07-251-1/+1
| * | | | | Use our image component in missionBrandon Millman2018-07-252-2/+7
| * | | | | Always go to open positions when clicking CTABrandon Millman2018-07-241-0/+1
| * | | | | Fix hiding of dots on small screensBrandon Millman2018-07-241-2/+2
| * | | | | Merge branch 'v2-prototype' into feature/website/jobs-page-part2Brandon Millman2018-07-24115-2279/+2704
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v2-prototype' into feature/website/jobs-page-part2Brandon Millman2018-07-21112-679/+1030
| |\ \ \ \ \ \
| * | | | | | | Update hr colorBrandon Millman2018-07-192-4/+1
| * | | | | | | Fix lint errorsBrandon Millman2018-07-193-26/+0
| * | | | | | | Add /careers route and fix hr stylingBrandon Millman2018-07-197-9/+19
| * | | | | | | Fix typosBrandon Millman2018-07-192-5/+5
| * | | | | | | Fix key errors and typoBrandon Millman2018-07-192-5/+4
| * | | | | | | Fix padding on open positions sectionBrandon Millman2018-07-191-1/+1
| * | | | | | | Add dots on heroBrandon Millman2018-07-191-1/+11
| * | | | | | | Padding fixesBrandon Millman2018-07-192-7/+4
| * | | | | | | Update open positions sectionBrandon Millman2018-07-193-85/+78
| * | | | | | | Benefits and values sectionsBrandon Millman2018-07-1922-284/+209
| * | | | | | | Remove sectionsBrandon Millman2018-07-191-7/+0
| * | | | | | | Update mission sectionBrandon Millman2018-07-191-37/+29
| * | | | | | | Updates to the Join 0x sectionBrandon Millman2018-07-191-8/+12
| * | | | | | | Fix development environment checkBrandon Millman2018-07-191-1/+1
* | | | | | | | Also skip prompt when publishing for realFabio Berger2018-07-261-2/+2
* | | | | | | | Prettier fixesFabio Berger2018-07-266-3199/+3263
* | | | | | | | Missing artifactFabio Berger2018-07-261-0/+723
* | | | | | | | Replace hard-coded compact_artifacts with migrations artifactsFabio Berger2018-07-2611-381/+3211
* | | | | | | | Update order-utils to use 2.0.0-beta-testnet artifactsFabio Berger2018-07-261-3/+5
* | | | | | | | Remove artifacts which should no longer be commitedFabio Berger2018-07-269-14598/+0
* | | | | | | | New WETH9 artifactsFabio Berger2018-07-262-36/+36
* | | | | | | | Modify WETH9 event arg names to be identical to ERC20 standard suggested namesFabio Berger2018-07-261-4/+4
* | | | | | | | Update artifacts in contract-wrappers, generate artifacts and improve READMEFabio Berger2018-07-2618-3817/+25006
* | | | | | | | Update the kovan addresses in artifactsFabio Berger2018-07-254-6/+6
* | | | | | | | Improve the README instructions for migrationsFabio Berger2018-07-251-2/+22
* | | | | | | | Use infuraFabio Berger2018-07-252-2/+2
* | | | | | | | Fix typoFabio Berger2018-07-251-1/+1
* | | | | | | | Update v2-beta-testnet migrationFabio Berger2018-07-2511-259/+45542
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Remove unused importFabio Berger2018-07-251-1/+0
* | | | | | | Update artifactFabio Berger2018-07-251-8/+8
* | | | | | | Fix dep collisionFabio Berger2018-07-251-1/+0
* | | | | | | merge v2-prototypeFabio Berger2018-07-254-13/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Update orderEpoch commentsAmir Bandeali2018-07-252-2/+2
| * | | | | | Merge pull request #891 from 0xProject/bug/website/wiki-page-topbarFrancesco Agosti2018-07-251-1/+6
| |\ \ \ \ \ \
| | * | | | | | Add zIndex 1 to topbar and fix issue where no box-shadow present on /docsfragosti2018-07-192-2/+6
| | * | | | | | Make topbar zIndex 1fragosti2018-07-181-0/+1
| * | | | | | | Omit specific version of react typesFabio Berger2018-07-241-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:08:40 +0800