aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-041-3/+3
|\
| * Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0Thomas Huang2017-10-041-1/+1
| |\
| | * chore(package): update coveralls to version 3.0.0greenkeeper[bot]2017-09-291-1/+1
| * | chore(package): update mocha to version 4.0.0greenkeeper[bot]2017-10-031-1/+1
| * | deps - bump pe for block cache fixkumavis2017-10-031-1/+1
| |/
* | Query for gas estimatesChi Kei Chan2017-09-291-2/+3
* | Merge branch 'master' into mmnChi Kei Chan2017-09-281-10/+13
|\|
| * Merge pull request #2124 from MetaMask/breakout-mascarakumavis2017-09-281-1/+2
| |\
| | * bump metamascara versionfrankiebee2017-09-231-1/+1
| | * mascara: turn off backgroundfrankiebee2017-09-201-1/+1
| | * update metamascarafrankiebee2017-09-201-1/+1
| | * Merge branch 'master' into breakout-mascarafrankiebee2017-09-201-1/+1
| | |\
| | * | require metamascarafrankiebee2017-09-191-0/+1
| * | | Merge pull request #2196 from MetaMask/express-bumpDan Finlay2017-09-281-1/+1
| |\ \ \
| | * | | deps - bump express for security fixkumavis2017-09-281-1/+1
| * | | | fix(package): update eth-keyring-controller to version 2.0.0greenkeeper[bot]2017-09-281-1/+1
| |/ / /
| * | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-281-5/+4
| |\ \ \
| | * \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut...kumavis2017-09-271-2/+3
| | |\ \ \
| | | * \ \ Merge pull request #2174 from MetaMask/i2162-TokenPrecisionThomas Huang2017-09-271-1/+1
| | | |\ \ \
| | | | * | | Fix token precision bugDan Finlay2017-09-271-1/+1
| | | * | | | chore(package): update sinon to version 4.0.0greenkeeper[bot]2017-09-261-1/+1
| | | |/ / /
| | * / / / Remove keyring controller from projectDan Finlay2017-09-231-4/+1
| | |/ / /
| | * | | Patch security updateDan Finlay2017-09-231-1/+1
| * | | | deps - bump filter deps and add random missing depskumavis2017-09-231-2/+4
| * | | | deps - bump provider engine for block trackerkumavis2017-09-231-1/+1
| * | | | deps - bump eth-block-trackerkumavis2017-09-231-0/+1
| |/ / /
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-en...kumavis2017-09-201-21/+24
| |\ \ \ | | | |/ | | |/|
| * | | deps - bump json-rpc-middleware-streamkumavis2017-09-201-1/+1
| * | | deps - bump json-rpc-enginekumavis2017-09-201-2/+1
* | | | Add Add Token UI; Add Fuzzy search for tokensChi Kei Chan2017-09-201-2/+3
* | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-191-21/+24
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #2119 from MetaMask/mascara-tests2Frankie2017-09-191-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | tests - integration - re-add mascara to normal runkumavis2017-09-191-1/+1
| * | | Merge pull request #2098 from MetaMask/mascara-testsFrankie2017-09-191-21/+24
| |\| | | | |/ | |/|
| | * tests - integration - remove failing mascara integration tests from normal ru...kumavis2017-09-191-1/+1
| | * tests - integration - add mascara to integration test runkumavis2017-09-161-1/+1
| | * tests - refactor and rename npm scriptskumavis2017-09-141-23/+24
| | * tests - mascara - move temp build files into dist/mascarakumavis2017-09-141-4/+4
| | * tests - start migrating mascara tests to karmakumavis2017-09-141-5/+6
| | * tests - break out coveralls npm scriptkumavis2017-09-141-1/+2
* | | Merge branch 'master' into nmChi Kei Chan2017-09-191-7/+16
|\| |
| * | metamask controller - move middleware into seperate fileskumavis2017-09-141-1/+1
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-131-4/+8
| |\|
| | * Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0kumavis2017-09-131-1/+1
| | |\
| | | * chore(package): update babel-eslint to version 8.0.0greenkeeper[bot]2017-09-121-1/+1
| | * | test - integration - drop testem for karmakumavis2017-09-121-1/+6
| | * | test - integration - remove redundant testem scriptskumavis2017-09-121-1/+0
| | * | ci - dont attempt to submit coveralls if not configuredkumavis2017-09-121-1/+1
| | |/
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-081-1/+1
| |\|
| | * Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0Thomas Huang2017-09-021-1/+1
| | |\
| | | * chore(package): update sinon to version 3.2.0greenkeeper[bot]2017-08-101-1/+1
| * | | deps - bump jsonrpc filters for log filter formate fixkumavis2017-09-081-1/+1
| * | | streams - use pump and published obj-multiplexkumavis2017-09-081-1/+3
| * | | inpage - add idRemapMiddlewarekumavis2017-09-081-0/+1
| * | | inpage - use json-rpc-engine for inpage-providerkumavis2017-08-251-0/+1
| |/ /
| * | Merge pull request #1914 from MetaMask/history-diffDan Finlay2017-08-191-0/+1
| |\ \
| | * | introduce tx-state-history-helper and diff-based historykumavis2017-08-151-0/+1
| | |/
| * / Fix token balance precision renderingDan Finlay2017-08-181-1/+1
| |/
* | Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rateChi Kei Chan2017-09-141-0/+1
* | Reapply conversion utility changes and fix calls to utility in pending-tx.Dan2017-09-141-0/+2
* | Improve styling in Confirmation Screen; Show decoded send token dataChi Kei Chan2017-09-131-0/+2
* | Revert "Overhaul currency conversion utility and update calls to utility in p...Chi Kei Chan2017-09-131-2/+0
* | Overhaul currency conversion utility and update calls to utility in pending-tx.Dan2017-09-131-0/+2
* | Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-121-0/+1
* | Add buttons; handle back; add yarn.lockChi Kei Chan2017-09-121-0/+1
* | Fixes lint errors and adds stylelint-config-standard to package.jsonDan2017-08-311-0/+1
* | Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-141-1/+1
|\|
| * deps - bump ethjs-querykumavis2017-08-101-1/+1
* | [WIP] Add packages and tasks for linting scsssdtsui2017-08-141-3/+5
* | Merge branch 'master' into NewUI-flatkumavis2017-08-091-34/+37
|\|
| * deps - bump watchifykumavis2017-08-091-2/+2
| * Merge branch 'master' into greenkeeper/initialkumavis2017-08-091-0/+3
| |\
| | * add json-rpc-engine && eth-json-rpc-middleware to devDependenciesfrankiebee2017-08-091-0/+2
| | * Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-081-3/+2
| | |\
| | * \ Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-051-3/+3
| | |\ \
| | * | | bring your own BNfrankiebee2017-08-051-0/+1
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-081-3/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | deps - updatekumavis2017-08-041-4/+5
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-041-1/+1
| |\ \ \ \
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-041-6/+11
| * | | | | chore(package): update dependenciesgreenkeeper[bot]2017-07-191-32/+32
* | | | | | Add dependencies and JSX support (reactify), for global modal implementationsdtsui2017-08-091-0/+3
* | | | | | Merge branch 'NewUI' into feat/mm-ui-5-mergedsdtsui2017-08-071-2/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' into NewUIkumavis2017-08-051-1/+1
| |\ \ \ \ \
| * | | | | | Bring menu-droppo component into project, remove as a dependencysdtsui2017-08-051-1/+1
| * | | | | | Merge branch 'master' into NewUIkumavis2017-08-041-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIKevin Serrano2017-08-041-2/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-071-3/+4
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | blacklist - bump phishing detectorkumavis2017-08-051-1/+1
| * | | | | | | blacklist - update phishing on boot and speed up polling to 4 minkumavis2017-08-051-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | deps - bump eth-detect-phishingkumavis2017-08-041-1/+1
| | |_|_|/ / | |/| | | |
| * | | | | blacklist - use module eth-phishing-detectkumavis2017-08-041-2/+2
| |/ / / /
| * | | | Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-031-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-021-0/+1
| | |\ \ \
| | * | | | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-021-0/+1
| * | | | | phishing detection - move phishing detection into contentscript and metamask ...kumavis2017-08-031-1/+1
| | |/ / / | |/| | |
* | | | | Migrate from css to scss + autoprefixersdtsui2017-08-071-0/+2
* | | | | Hook up css animationsdtsui2017-08-031-0/+2
* | | | | Add dependejncy: react-burger-menusdtsui2017-08-031-0/+1
| |_|/ / |/| | |
* | | | Merge branch 'master' into NewUIDan Finlay2017-07-281-1/+6
|\| | |
| * | | Add levenshtein logic to blacklister.Kevin Serrano2017-07-271-0/+1
| |/ /
| * | Merge pull request #1816 from MetaMask/test-coveragekumavis2017-07-261-0/+4
| |\ \
| | * | One script runs for Ci buildThomas Huang2017-07-261-0/+1
| | * | Simplify the test-coverage scriptThomas Huang2017-07-251-1/+1
| | * | Add coveralls to scriptThomas Huang2017-07-251-1/+1
| | * | Add Test Coverage with nyc package and coveralls for github badgeThomas Huang2017-07-241-0/+3
| * | | prov-eng - bump to ignore json parse errorskumavis2017-07-261-1/+1
| |/ /
* | | Bump menu-droppo to 2.0.1Dan Finlay2017-07-281-1/+1
* | | Bump version of menu-droppo, no longer needs css transitionssdtsui2017-07-271-1/+1
* | | Lots of flex rearrangement on account detail viewDan Finlay2017-07-261-2/+0
* | | Merge branch 'master' into NewUIDan Finlay2017-07-211-6/+9
|\| |
| * | Version 3.9.1v3.9.1Dan Finlay2017-07-201-1/+1
| |/
| * nonce-tracker - fix lock mechanism to be a real mutexkumavis2017-07-191-0/+1
| * Update Sinontmashuang2017-07-151-1/+1
| * Merge pull request #1617 from MetaMask/nonce-trackerFrankie2017-07-141-1/+1
| |\
| | * remove denodeifyfrankiebee2017-07-141-1/+0
| | * Merge branch 'master' into nonce-trackerfrankiebee2017-07-131-1/+1
| | |\
| | * \ Merge branch 'master' into nonce-trackerkumavis2017-07-081-7/+5
| | |\ \
| | * \ \ Merge branch 'master' into nonce-trackerfrankiebee2017-06-281-2/+6
| | |\ \ \
| | * | | | add a test for #getNonceLockfrankiebee2017-06-221-0/+1
| * | | | | Merge branch 'master' into UpdateMetadataDan Finlay2017-07-131-1/+2
| |\ \ \ \ \
| | * | | | | Refresh blacklist before distDan Finlay2017-07-131-1/+1
| | * | | | | Correct github linkDan Finlay2017-07-131-1/+1
| | * | | | | Point blacklist at main repositoryDan Finlay2017-07-131-1/+1
| | * | | | | Add first version of phishing site warningDan Finlay2017-07-131-0/+1
| | | |_|_|/ | | |/| | |
| * / | | | Update eth-contract-metadata on buildDan Finlay2017-07-131-2/+3
| |/ / / /
| * | | | deps - bump prov-engkumavis2017-07-121-1/+1
| * | | | deps - bump prov-eng for fetch retrykumavis2017-07-121-1/+1
| * | | | deps - bump prov-eng for retry on gateway timeoutkumavis2017-07-121-1/+1
| | |_|/ | |/| |
* | | | Bump version of menu-droppo to include bugfixsdtsui2017-07-181-1/+1
* | | | Add tests for new dropdown componentsdtsui2017-07-131-0/+1
|/ / /
* | | metamask - append dapp origin domain to rpc requestkumavis2017-07-051-2/+2
* | | Bump token-tracker to 1.1.2Dan Finlay2017-07-011-1/+1
* | | Bump token-tracker to 1.1.1Dan Finlay2017-07-011-1/+1
* | | deps - remove duplicated dev-dependencieskumavis2017-06-301-3/+1
* | | Bump web3 version to 0.9.1Dan Finlay2017-06-301-1/+1
| |/ |/|
* | Simplify build variables. Remove maps from production.Kevin Serrano2017-06-271-1/+1
* | Fix token balance renderingDan Finlay2017-06-201-1/+1
* | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Dan Finlay2017-06-201-2/+2
|\ \
| * \ Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-201-1/+5
| |\ \ | | |/ | |/|
| * | Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-171-1/+1
| |\ \
| | * | bump provider enginefrankiebee2017-06-171-1/+1
| * | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-161-1/+1
| |\| |
| | * | check for the tx in the block that provider engine gives usfrankiebee2017-06-151-1/+1
| | * | Bump provider-enginefrankiebee2017-06-151-1/+1
| * | | bump eth-query for quiter logsfrankiebee2017-06-151-1/+1
| |/ /
* | / Add MetaMark supportDan Finlay2017-06-201-1/+1
| |/ |/|
* | Bump token-tracker versionDan Finlay2017-06-151-1/+1
* | Refresh token balance on network changeDan Finlay2017-06-151-1/+1
* | Persist selected account tabDan Finlay2017-06-151-2/+2
* | Fix build for eth-contract-metadataDan Finlay2017-06-141-1/+1
* | Merge branch 'master' into AddTokenListDan Finlay2017-06-131-9/+26
|\|
| * deps - prov-eng 12.2.4kumavis2017-06-131-1/+1
| * Merge pull request #1572 from MetaMask/mascaraUpkeepkumavis2017-06-131-1/+1
| |\
| | * bump cswready eventfrankiebee2017-06-091-1/+1
| * | deps - bump provider engine for warp featurekumavis2017-06-091-1/+1
| |/
| * Move to eth-contract-metadataDan Finlay2017-05-271-1/+1
| * Add address image map to icon factoryDan Finlay2017-05-261-0/+1
| * Throw if ENS Resolver isn't set upDan Finlay2017-05-231-1/+1
| * Merge branch 'master' into HelpDebugStalledTxskumavis2017-05-231-1/+1
| |\
| | * deps - use stream-subprovider from provider-enginekumavis2017-05-231-2/+2
| | * Use filter subprovider in-page to avoid filter leaksDan Finlay2017-05-231-1/+1
| * | Tolerate nonces of any formatDan Finlay2017-05-231-0/+1
| |/
| * Linted and removed unused depsDan Finlay2017-05-171-1/+0
| * Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxFormkumavis2017-05-161-0/+7
| |\
| | * Merge branch 'master' into i1407-FixNonEditingTxFormDan Finlay2017-05-161-3/+2
| | |\
| | * | Skip jazzicons in unit testsDan Finlay2017-05-161-0/+2
| | * | Add support for async/awaitDan Finlay2017-05-131-1/+5
| | * | Got a useful error message for next stepDan Finlay2017-05-121-0/+1
| | * | Use react test utils to start composing testDan Finlay2017-05-121-0/+4
| * | | Merge pull request #1431 from MetaMask/pe-bumpDan Finlay2017-05-161-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | deps - bump provider-engine 12.0.6kumavis2017-05-161-1/+1
| * | | Add stage 0 support to build systemDan Finlay2017-05-161-2/+2
| * | | background - drop async-q in favor of async/awaitkumavis2017-05-131-1/+0
| |/ /
| * / Add support for async/awaitDan Finlay2017-05-131-1/+5
| |/
| * Merge branch 'i1381-GasPriceInGwei' of github.com:MetaMask/metamask-plugin in...Kevin Serrano2017-05-091-1/+1
| |\
| | * Run install before distDan Finlay2017-05-091-1/+1
| * | deps - bump eth-query for smaller bundle sizekumavis2017-05-091-1/+1
| * | Add Mocha/Chai eslint pluginsThomas Huang2017-05-051-0/+2
| |/
| * Bump provider engineDan Finlay2017-05-011-1/+1
| * break out IndexDbController && Run the first time test on mascarafrankiebee2017-04-281-0/+1
| * Setup test enviroment for mascarafrankiebee2017-04-281-1/+5
| * Update README for mascarafrankiebee2017-04-271-1/+2
| * bump client-sw-ready-eventfrankiebee2017-04-271-1/+1
| * Allow signature V values over 1 byteDan Finlay2017-04-261-1/+1
| * Bump provider-engineDan Finlay2017-04-251-1/+1
| * Bump provider engineDan Finlay2017-04-251-1/+1
* | Add functional but ugly and hard-coded token listDan Finlay2017-04-211-0/+6
|/
* Fix wakeUps:frankiebee2017-04-071-1/+1
* Bump sw-client versionfrankiebee2017-04-071-1/+1
* Ping service worker to keep it from going idlefrankiebee2017-04-071-1/+1
* build - add envify to bundle processkumavis2017-04-061-0/+2
* Merge branch 'master' into mascarafrankiebee2017-04-031-7/+8
|\
| * Merge pull request #1297 from MetaMask/eip155Dan Finlay2017-04-011-1/+1
| |\
| | * tests - tx-manager - fix assert and clean formattingkumavis2017-03-311-1/+1
| * | meta - package.json - rename npm test scriptskumavis2017-03-311-5/+5
| * | tests - unit - fail on unhandled promise rejectionkumavis2017-03-311-0/+1
| |/
| * deps - bump provider-enginekumavis2017-03-301-1/+1
* | Rename and move around filesfrankiebee2017-04-031-0/+1
* | Bump sw-stream and setup "untrusted and trusted comunication"frankiebee2017-03-301-1/+1
* | WIP: Untrusted external connections eg: dappsfrankiebee2017-03-291-1/+1
* | Merge branch 'master' into mascarafrankiebee2017-03-241-2/+1
|\|
| * Require redux-logger of 2.10.2 and up (#1235)Kevin Serrano2017-03-231-1/+1
| * Remove eth-lightwalletDan Finlay2017-03-171-1/+0
* | WIP: streams->indexdbfrankiebee2017-03-241-2/+2
* | WIP:streamfrankiebee2017-03-221-0/+1
|/
* Add ENS click to copyDan Finlay2017-03-091-1/+1
* Get basic ENS workingDan Finlay2017-03-091-3/+3
|\
| * deps - bump web3-provider-engine to 10.0.1kumavis2017-03-081-1/+1
| * deps - bump web3-provider-enginekumavis2017-03-081-1/+1
| * deps - bump web3-provider-enginekumavis2017-03-081-1/+1
| * Fix personal sign for loose accountsDan Finlay2017-03-071-1/+1
* | Add ens recognition to send form inputDan Finlay2017-03-011-0/+1
|/
* Reduce provider-engine requirementDan Finlay2017-02-251-1/+1
* Bump provider engine to require compliant personal_recoverDan Finlay2017-02-251-1/+1
* Move sigUtil and keyrings to external modulesDan Finlay2017-02-221-0/+3
* Merge branch 'master' into AddBetterLoggerDan Finlay2017-02-211-1/+1
|\
| * Add personal_sign and personal_ecRecover supportDan Finlay2017-02-211-1/+1
* | Add debug logging to ui routing logic.Dan Finlay2017-02-211-0/+1
|/
* Complete migration tests.Kevin Serrano2017-02-161-0/+1
* id mgmt - update to latest eth_sign speckumavis2017-02-041-2/+3
* migrations - fix migration #9 and add safety checks to migratorkumavis2017-02-041-1/+1
* migration #9 - break out CurrencyController substatekumavis2017-02-031-0/+1
* eth-store - convert to obs-store subclasskumavis2017-02-031-3/+3
* modification of notices.Kevin Serrano2017-02-031-1/+2
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-291-1/+1
|\
| * migration 5 - move keyring controller state to substatekumavis2017-01-291-1/+1
* | Clean up message manger includes:Frankie2017-01-291-1/+1
|/
* test - lint firstkumavis2017-01-271-1/+1
* obs-store - use published modulekumavis2017-01-251-0/+2
* Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2kumavis2017-01-251-0/+1
|\
| * Merge branch 'dev' into i#1048kumavis2017-01-251-0/+1
| |\
| * | Fix issue where generating a new account would put it in loose keysFrankie2017-01-251-0/+1
* | | Merge branch 'dev' into obs-store2kumavis2017-01-221-1/+4
|\ \ \ | | |/ | |/|
| * | Implement naieve JSON file importingDan Finlay2017-01-191-0/+1
| |/
| * Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-181-0/+1
| |\
| | * Add import account placeholder templateDan Finlay2016-11-051-0/+1
| * | background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-131-1/+2
* | | migrations - introduce promise-based migratorkumavis2017-01-121-0/+1
|/ /
* | deps - bump provider enginekumavis2017-01-111-1/+1
* | Merge branch 'dev' into gulp1Dan Finlay2017-01-111-1/+1
|\ \
| * | tests - add fetch polyfillkumavis2017-01-111-0/+1
| * | deps - replace promise-request with fetchkumavis2017-01-111-1/+0
* | | gulp - fix brfs instrumentationkumavis2017-01-111-2/+2
* | | gulp - add disc bundle analysis taskkumavis2017-01-111-0/+3
* | | gulp - clean and simplifykumavis2017-01-111-2/+1
|/ /
* | Remove old eth-store dependencyDan Finlay2017-01-051-1/+0
* | Validate URIs before entering them in.Kevin Serrano2016-12-211-0/+1
* | Merge pull request #916 from MetaMask/i894-DetectBadAccountsDan Finlay2016-12-211-0/+1
|\ \
| * | Made changes according to feedback.Dan Finlay2016-12-201-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 11:59:32 +0800