aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix: Remove unnecessary onClick prop from NestedSidebar, since one can listen...Fabio Berger2018-10-132-16/+3
* Pass down sidebar instead of sectionNameToLinksFabio Berger2018-10-134-19/+17
* Make all doc reference pages responsiveFabio Berger2018-10-1211-11/+33
* Improve loadingFabio Berger2018-10-121-26/+17
* If sidebar menu item links to internal page, no longer open in new tabFabio Berger2018-10-121-15/+0
* Add Getting starter sidebar headerFabio Berger2018-10-1211-35/+24
* Refactor Home so that Dev section chrome is reusable across pagesFabio Berger2018-10-1214-854/+780
* chore: update yarn.lockFabio Berger2018-10-111-7/+0
* style: Make width of developer section same as rest of website (1064px)Fabio Berger2018-10-111-1/+1
* merge dev-section-redesignFabio Berger2018-10-11122-1386/+3478
|\
| * Merge branch 'development' into dev-section-redesignFabio Berger2018-10-11122-1393/+3478
| |\
| | * Merge pull request #1125 from 0xProject/feature/starter-dev-tools-pagesLeonid Logvinov2018-10-1124-39/+1305
| | |\
| | | * Fix linter errorLeonid Logvinov2018-10-111-2/+0
| | | * Explains tools we want them to useFabio Berger2018-10-111-0/+14
| | | * Add note about buttonFabio Berger2018-10-111-0/+4
| | | * Add dev-tools-pages bundles to gitignoreFabio Berger2018-10-111-0/+1
| | | * Improve READMEFabio Berger2018-10-111-12/+27
| | | * Fix button and centerFabio Berger2018-10-112-10/+12
| | | * Add stuffFabio Berger2018-10-1014-43/+936
| | | * Initial project scaffoldingLeonid Logvinov2018-10-1016-91/+342
| | * | Merge pull request #1114 from 0xProject/feature/instant/redux-styles-containerFrancesco Agosti2018-10-1124-126/+691
| | |\ \
| | | * | Upgrade ethereum-typesfragosti2018-10-111-1/+1
| | | * | Lint and update depsfragosti2018-10-112-3/+3
| | | * | Be more explicit with falsinessfragosti2018-10-111-1/+1
| | | * | Add type to cssRuleIfExistsfragosti2018-10-111-1/+2
| | | * | Fix issue where we throw if non-numeric characters are used in inputfragosti2018-10-111-2/+7
| | | * | Upgrade to more recent types, fix yarn.lockfragosti2018-10-112-10/+5
| | | * | Increase max bundle size for instantfragosti2018-10-111-1/+1
| | | * | Change tslint config to remove conflicts with prettierfragosti2018-10-101-1/+2
| | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-1078-1354/+1518
| | | |\|
| | | * | Fix empty input bugfragosti2018-10-102-5/+9
| | | * | Center 0x instantfragosti2018-10-101-3/+4
| | | * | Apply linterfragosti2018-10-056-12/+10
| | | * | Create SelectedAssetInputAmountfragosti2018-10-056-15/+72
| | | * | Add Input and AmountInput componentfragosti2018-10-055-3/+75
| | | * | Add border radiosfragosti2018-10-052-2/+2
| | | * | Add box shadow and default box-sizing: border-box to containerfragosti2018-10-055-9/+11
| | | * | Add BuyButton and other small improvementfragosti2018-10-057-19/+147
| | | * | Add faux order details sectionfragosti2018-10-053-40/+15
| | | * | Create zrx instant container headingfragosti2018-10-053-21/+37
| | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-0590-398/+508
| | | |\ \
| | | * | | apply prettierfragosti2018-10-051-7/+1
| | | * | | Fix currupted yarn lock filefragosti2018-10-051-6/+6
| | | * | | Remove deps we probably dont needfragosti2018-10-052-49/+35
| | | * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-0522-556/+758
| | | |\ \ \
| | | * | | | Fix linting problemsfragosti2018-10-053-4/+4
| | | * | | | Improve utilities and try to use them in simple form componentfragosti2018-10-058-23/+89
| | | * | | | Add Flex and Container componentfragosti2018-10-053-0/+91
| | | * | | | Add some ui componentsfragosti2018-10-047-14/+172
| | | * | | | Add Inter UI fontfragosti2018-10-042-2/+7
| | | * | | | Add redux to 0x instantfragosti2018-10-046-26/+60
| | | * | | | Add styled-components with themefragosti2018-10-044-2/+70
| | * | | | | [fix]: [testnet-faucet] Exit 1 on build failJacob Evans2018-10-111-18/+17
| | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #1116 from 0xProject/feature/asset-buyer/api-tweaksBrandon Millman2018-10-107-18/+40
| | |\ \ \ \
| | | * \ \ \ Merge branch 'development' into feature/asset-buyer/api-tweaksBrandon Millman2018-10-1069-1242/+1477
| | | |\ \ \ \
| | | * | | | | Update the CHANGELOGBrandon Millman2018-10-101-0/+8
| | | * | | | | Add comments for expiryBufferBrandon Millman2018-10-102-2/+2
| | | * | | | | Fix incorrect affiliate fee calculations and associated testsBrandon Millman2018-10-062-14/+20
| | | * | | | | Increase default expiryBufferSeconds from 15 to 300 (5 minutes)Brandon Millman2018-10-061-1/+1
| | | * | | | | Add comments for gasPrice and gasLimitBrandon Millman2018-10-061-0/+2
| | | * | | | | Fix order expiration calc bug and expose gas options to executeBuyQuotefragosti2018-10-063-2/+8
| | * | | | | | fix: [testnet-faucet] Signing of ordersJacob Evans2018-10-101-3/+1
| | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #1122 from 0xProject/feature/new-ethersLeonid Logvinov2018-10-0916-24/+29
| | |\ \ \ \ \
| | | * | | | | Define bundlewatch.ci.repoBranchBaseLeonid Logvinov2018-10-091-1/+2
| | | * | | | | Stop accesing ethers private methodsLeonid Logvinov2018-10-093-9/+7
| | | * | | | | Fix merge conflictsLeonid Logvinov2018-10-091-0/+39
| | | * | | | | Fix ethers build issueLeonid Logvinov2018-10-094-52/+19
| | | * | | | | Upgrade ethers.js versionLeonid Logvinov2018-10-0911-11/+11
| | |/ / / / /
| | * | | | | Merge pull request #1123 from 0xProject/feature/artifactsLeonid Logvinov2018-10-093-14/+87
| | |\ \ \ \ \
| | | * | | | | Fix branch nameLeonid Logvinov2018-10-091-1/+1
| | | * | | | | Add max sizesLeonid Logvinov2018-10-091-2/+4
| | | * | | | | Use bundlewatch instead of bundlesizeLeonid Logvinov2018-10-093-14/+85
| | |/ / / / /
| | * | | | | Merge pull request #1102 from 0xProject/feature/0x.js/eip712-sign-typed-dataJacob Evans2018-10-0953-1204/+1361
| | |\ \ \ \ \
| | | * | | | | Move Metamask Error to OrderErrorsJacob Evans2018-10-093-10/+9
| | | * | | | | Update the exported types for the packages which touch RPC providersJacob Evans2018-10-095-3/+24
| | | * | | | | Throw and handle errors from Providers.Jacob Evans2018-10-0923-150/+208
| | | * | | | | Detect MM on signature validation failure.Jacob Evans2018-10-081-24/+28
| | | * | | | | Return SignedOrder from signing utils.Jacob Evans2018-10-0525-192/+380
| | | * | | | | Update 0x.js ChangelogJacob Evans2018-10-051-0/+18
| | | * | | | | Add eth_signTypedData support to our wallet subprovidersJacob Evans2018-10-0520-86/+326
| | | * | | | | Move SignTypedData to utils packageJacob Evans2018-10-059-152/+234
| | | * | | | | Introduce Metamask Subprovider.Jacob Evans2018-10-0515-444/+277
| | | * | | | | Expose eth_signTypedData functionality for order signingJacob Evans2018-10-0510-531/+245
| | | |/ / / /
* | | | | | | fix(website): remove deadzone between "Developers" menu item and dropdown so ...Fabio Berger2018-10-112-2/+2
* | | | | | | fix(website): Avoid hover activated dropdown from closing when activeNode is ...Fabio Berger2018-10-111-1/+6
* | | | | | | Replace Rollbar UMD with regular importFabio Berger2018-10-103-3/+44
|/ / / / / /
* | | | | | Merge branch 'development' into dev-section-redesignFabio Berger2018-10-0998-460/+879
|\| | | | |
| * | | | | Merge pull request #1121 from nebkor/developmentFabio Berger2018-10-091-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Clarifies use of schemas outside of Javascript/TypeScript.Joe Ardent2018-10-081-1/+1
| |/ / / /
| * | | | Fix typoBrandon Millman2018-10-051-1/+1
| * | | | Add asset-buyer to published packages section in READMEBrandon Millman2018-10-051-0/+1
| | |_|/ | |/| |
| * | | PublishBrandon Millman2018-10-0534-260/+260
| * | | Updated CHANGELOGSBrandon Millman2018-10-0556-141/+251
| | |/ | |/|
| * | Merge pull request #1113 from 0xProject/feature/asset-buyer/testsBrandon Millman2018-10-057-58/+366
| |\ \
| | * | Update BuyQuote interfaceBrandon Millman2018-10-055-40/+73
| | * | Add missing default optionsBrandon Millman2018-10-041-3/+6
| | * | Remove unused constantsBrandon Millman2018-10-041-3/+0
| | * | Add fee order with a takerFeeBrandon Millman2018-10-041-2/+6
| | * | Add additional order factory methods and refactor test to use themBrandon Millman2018-10-042-61/+61
| | * | Add comments about buy quote calculationBrandon Millman2018-10-041-0/+2
| | * | Update CHANGELOGBrandon Millman2018-10-041-0/+4
| | * | Fix linterBrandon Millman2018-10-041-2/+0
| | * | Add additional test for slippageBrandon Millman2018-10-042-18/+70
| | * | Add buy_quote_calculator_testBrandon Millman2018-10-042-31/+246
* | | | Merge pull request #1103 from 0xProject/doc-overview-pageFabio Berger2018-10-0956-426/+1565
|\ \ \ \
| * | | | remove unused importFabio Berger2018-10-061-1/+0
| * | | | Move valid-url import to react-sharedFabio Berger2018-10-062-3/+3
| * | | | Fix commentFabio Berger2018-10-061-1/+1
| * | | | Fix liinterFabio Berger2018-10-062-2/+1
| * | | | Convert TutorialButton to styled componentFabio Berger2018-10-061-64/+45
| * | | | Convert more divs to containers and text componentsFabio Berger2018-10-054-57/+57
| * | | | remove inline styleFabio Berger2018-10-051-4/+1
| * | | | Remove type prop and instead infer it from the value of toFabio Berger2018-10-0516-95/+69
| * | | | Remove style prop from LinkFabio Berger2018-10-0513-64/+56
| * | | | Rename scroll containerFabio Berger2018-10-055-17/+6
| * | | | Remove containerId option and throw if passing in shouldOpenInNewTab with typ...Fabio Berger2018-10-051-4/+6
| * | | | Apply props to all link variants when possibleFabio Berger2018-10-051-1/+7
| * | | | Render paragraphs with spans so we don't get margin addedFabio Berger2018-10-051-0/+1
| * | | | Fix bug where wiki links in dev dropdown weren't working when on the wikiFabio Berger2018-10-053-78/+93
| * | | | Fix react warningFabio Berger2018-10-051-1/+1
| * | | | remove stray logsFabio Berger2018-10-052-2/+0
| * | | | merge base branchFabio Berger2018-10-05154-1229/+3646
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | merge developmemntFabio Berger2018-10-05154-1228/+3672
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1115 from 0xProject/upgradeWebpackFabio Berger2018-10-0514-493/+307
| |\ \ \ \
| | * | | | force re-buildFabio Berger2018-10-041-1/+1
| | * | | | Add website build to instructionsFabio Berger2018-10-041-0/+3
| | * | | | Revert format and re-add changesFabio Berger2018-10-041-256/+256
| | * | | | Build website in parallel with other tests since no other test relies on it b...Fabio Berger2018-10-043-254/+256
| | * | | | Add back sourceMap support for both dev/prodFabio Berger2018-10-041-1/+1
| | * | | | Upgrade webpackFabio Berger2018-10-0411-485/+294
| |/ / / /
| * | | | Merge pull request #1112 from 0xProject/feature/instant/umd-upload-and-bundle...Francesco Agosti2018-10-041-0/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add 0x Instant to bundle analysisfragosti2018-10-041-0/+3
| | | |/ | | |/|
| * | | Merge pull request #1108 from 0xProject/bug/every-artifact-has-every-sourceF. Eugene Aumson2018-10-041-5/+82
| |\ \ \ | | |/ / | |/| |
| | * | fix: comment need for sourceCodes pruningF. Eugene Aumson2018-10-031-1/+5
| | * | fix: use original source ID's from compiler outputF. Eugene Aumson2018-10-031-13/+24
| | * | Fix some small bugs in compiler.tsAlex Browne2018-10-031-3/+18
| | * | fix: persist artifacts with only relevant sourcesF. Eugene Aumson2018-10-031-5/+52
| * | | Merge pull request #1109 from 0xProject/feature/instant/initFrancesco Agosti2018-10-0317-64/+1959
| |\ \ \
| | * | | Fix typo in build:cifragosti2018-10-031-1/+1
| | * | | Make package privatefragosti2018-10-031-0/+1
| | * | | Ignore bundles in public dirfragosti2018-10-033-32/+2
| | * | | Add to READMEfragosti2018-10-031-0/+20
| | * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-03126-683/+1825
| | |\| |
| | * | | Add public dirfragosti2018-10-034-0/+62
| | * | | Add build:ci commandfragosti2018-10-031-0/+1
| | * | | Add dev environmentfragosti2018-10-035-26/+150
| | * | | Clean up package jsonfragosti2018-10-032-47/+1183
| | * | | Tests are working with coveragefragosti2018-10-032-0/+23
| | * | | Have React setup with basic build workingfragosti2018-09-2812-40/+580
| * | | | Merge pull request #1086 from 0xProject/feature/asset-buyer/improve-asset-buy...Brandon Millman2018-10-0310-359/+207
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Update READMEBrandon Millman2018-10-031-14/+0
| | * | | Fix linter errorsBrandon Millman2018-10-031-1/+1
| | * | | Merge branch 'development' into feature/asset-buyer/improve-asset-buyer-managerBrandon Millman2018-10-03197-1205/+3860
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1104 from 0xProject/feature/bundlesizeLeonid Logvinov2018-10-0252-99/+216
| |\ \ \ \
| | * | | | Change cache key back to repo from repo-builtLeonid Logvinov2018-10-021-8/+8
| | * | | | Change the lint command backLeonid Logvinov2018-10-021-1/+1
| | * | | | Merge build & installLeonid Logvinov2018-10-021-34/+4
| | * | | | Remove deps cache all togetherLeonid Logvinov2018-10-021-50/+1
| | * | | | Cache all nested node_modules directoriesLeonid Logvinov2018-10-021-5/+42
| | * | | | Explicitly specify yarn cache folderLeonid Logvinov2018-10-021-1/+1
| | * | | | Ignore linter issuesLeonid Logvinov2018-10-021-3/+3
| | * | | | Fix linter issueLeonid Logvinov2018-10-0214-45/+31
| | * | | | Separate deps and built cachesLeonid Logvinov2018-10-021-16/+16
| | * | | | Build tslint rules before running linterLeonid Logvinov2018-10-021-0/+1
| | * | | | Cache yarn cache directory without node modulesLeonid Logvinov2018-10-021-1/+0
| | * | | | Run linter before prettier as it fails more oftenLeonid Logvinov2018-10-021-1/+1
| | * | | | Add yarn cache pathLeonid Logvinov2018-10-021-0/+1
| | * | | | Split CI install and build stepsLeonid Logvinov2018-10-022-6/+29
| | * | | | Move bundle-size out of static tests and don't wait for a build with static t...Leonid Logvinov2018-10-021-3/+11
| | * | | | Introduce a build:ci command that doesn't build webpack bundlesLeonid Logvinov2018-10-0234-0/+34
| | * | | | Measure only one bundle size as they're the sameLeonid Logvinov2018-10-021-3/+0
| | * | | | Fix linter errorsLeonid Logvinov2018-10-021-1/+1
| | * | | | Fix no_website CI buildsLeonid Logvinov2018-10-021-1/+1
| | * | | | Check bundle size on CILeonid Logvinov2018-10-021-0/+1
| | * | | | Add a command to run bundle size reporterLeonid Logvinov2018-10-022-35/+144
| |/ / / /
| * | | | Merge pull request #1106 from 0xProject/feature/postpublish-cleanupLeonid Logvinov2018-10-027-7/+7
| |\ \ \ \
| | * | | | Update package.json versions to match the npm onesLeonid Logvinov2018-10-027-7/+7
| |/ / / /
| * | | | Updated CHANGELOGSLeonid Logvinov2018-10-0254-0/+351
| * | | | Remove 0x.js bundles from .npmignoreLeonid Logvinov2018-10-021-1/+0
| * | | | Add Jason to websiteBrandon Millman2018-10-022-0/+7
| * | | | Add missing yarn.lock changesFabio Berger2018-10-021-0/+27
| * | | | Fix bug in sol-docFabio Berger2018-10-022-5/+5
| * | | | Merge pull request #1099 from 0xProject/solidityDocRefImprovementsFabio Berger2018-10-0119-368/+674
| |\ \ \ \
| | * | | | Disable max file line count tslint rule for types fileFabio Berger2018-10-011-1/+1
| | * | | | merge developmentFabio Berger2018-09-30102-337/+807
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add test that structs are documented in separate sectionFabio Berger2018-09-291-0/+7
| | * | | | Add test for methodSignature gen for methods with param/return structsFabio Berger2018-09-292-0/+44
| | * | | | Fix testsFabio Berger2018-09-291-4/+1
| | * | | | Fix typoFabio Berger2018-09-291-2/+2
| | * | | | Export class instead of functionFabio Berger2018-09-295-526/+529
| | * | | | Fix badge alignmentFabio Berger2018-09-281-1/+1
| | * | | | Fix network badges for V1 and add them for V2Fabio Berger2018-09-281-16/+44
| | * | | | Add more basic typesFabio Berger2018-09-281-1/+1
| | * | | | Fix section headersFabio Berger2018-09-281-1/+1
| | * | | | Only add Stucts section if there are anyFabio Berger2018-09-281-9/+11
| | * | | | Fix missing devdoc comments in output by fixing improper encoding of methodSi...Fabio Berger2018-09-281-1/+10
| | * | | | Switch over remaining usage of `sections.types` for `typeSectionName`Fabio Berger2018-09-281-2/+2
| | * | | | Fix linterFabio Berger2018-09-283-3/+4
| | * | | | Explain cast to anyFabio Berger2018-09-281-0/+2
| | * | | | Improve switch caseFabio Berger2018-09-281-4/+4
| | * | | | Improve commentFabio Berger2018-09-281-4/+4
| | * | | | AlphabetizeFabio Berger2018-09-281-2/+2
| | * | | | Remove excessive typeFabio Berger2018-09-281-2/+1
| | * | | | Include structs section so that we can render struct params/return values pro...Fabio Berger2018-09-283-27/+213
| | * | | | Fix linterFabio Berger2018-09-281-2/+2
| | * | | | Only show arguments if the params are named (i.e not generated getters)Fabio Berger2018-09-281-3/+4
| | * | | | Improve keysFabio Berger2018-09-283-8/+10
| | * | | | Re-use interface component for rendering structs but label it differentlyFabio Berger2018-09-281-2/+2
| | * | | | Make sure basic solidity types are colored orangeFabio Berger2018-09-281-1/+2
| | * | | | Don't render colon for auto-generated gettersFabio Berger2018-09-281-2/+7
| | * | | | Render fallback functions betterFabio Berger2018-09-282-4/+9
| | * | | | Improve keyFabio Berger2018-09-281-2/+2
| | * | | | Fix dropdown menu item so it says "0x smart contracts" not "smart contract"Fabio Berger2018-09-281-1/+1
| | * | | | Rename for clarityFabio Berger2018-09-281-3/+3
| | * | | | Add typeSectionName to docsInfo so we don't use hard-coded "Types"Fabio Berger2018-09-282-4/+6
| | * | | | Add more robust keyFabio Berger2018-09-281-2/+3
| | * | | | Pull in only contracts we want rendered on the doc pageFabio Berger2018-09-281-1/+1
| | * | | | Split _genMethodDoc into it and _genFallbackDoc for clarity. Add isFallback b...Fabio Berger2018-09-272-22/+33
| | | * | | Clean up interfaces and exportsBrandon Millman2018-10-032-40/+38
| | | * | | Remove static methods to retrieve assetDatas from SRABrandon Millman2018-10-031-19/+0
| | | * | | Add AssetUnavailable errorBrandon Millman2018-10-032-7/+4
| | | * | | Merge AssetBuyer and AssetBuyerManagerBrandon Millman2018-10-035-326/+148
| | | * | | Add to CHANGELOGfragosti2018-09-251-0/+9
| | | * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-09-2595-338/+752
| | | |\ \ \
| | | * | | | Make package public again, but add warningfragosti2018-09-252-1/+3
| | | * | | | Add AssetBuyerManager to READMEfragosti2018-09-251-0/+14
| | | * | | | Use options object convention everywhere, and make package privatefragosti2018-09-257-142/+106
| | | * | | | Provide convenience methods on AssetBuyerManagerfragosti2018-09-252-1/+43
| | | * | | | Rename StandardRelayerAPIAssetBuyerManager to just AssetBuyerManager and gene...fragosti2018-09-254-28/+61
| | | | | | * Convert more divs to ContainersFabio Berger2018-10-042-49/+44
| | | | | | * Use Container and Text where possibleFabio Berger2018-10-041-12/+11
| | | | | | * rename for clarityFabio Berger2018-10-041-2/+2
| | | | | | * Fix linterFabio Berger2018-10-046-25/+12
| | | | | | * Remove todoFabio Berger2018-10-041-1/+0
| | | | | | * Improve commentFabio Berger2018-10-041-3/+4
| | | | | | * Use nestedSidebarMenu component for Dev homeFabio Berger2018-10-042-43/+20
| | | | | | * Fix nitFabio Berger2018-10-031-1/+1
| | | | | | * Remove stray console.logFabio Berger2018-10-031-2/+0
| | | | | | * Use same Link UI component for react-scroll linksFabio Berger2018-10-0328-136/+212
| | | | | | * remove stray consoleFabio Berger2018-10-031-3/+0
| | | | | | * Make whole bottom bar clickable not just the textFabio Berger2018-10-031-13/+13
| | | | | | * Don't make opening links in new tab a defaultFabio Berger2018-10-031-3/+6
| | | | | | * Decrease size of section descriptionsFabio Berger2018-10-031-1/+1
| | | | | | * Add border underneath logo while user is scrollingFabio Berger2018-10-032-6/+30
| | | | | | * Align logo and menuFabio Berger2018-10-031-11/+11
| | | | | | * Add padding to bottom of scroll areaFabio Berger2018-10-031-3/+7
| | | | | | * Fix linkFabio Berger2018-10-031-1/+6
| | | | | | * Make tutorial buttons also open in a new tabFabio Berger2018-10-031-3/+18
| | | | | | * Convert remaining Links to new UI componentFabio Berger2018-10-033-4/+31
| | | | | | * Use new Link UI component everywhere, and add complementary ALink typeFabio Berger2018-10-0320-347/+424
generated by cgit (git 2.34.1) at 2024-11-20 06:53:11 +0800