aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit
Commit message (Expand)AuthorAgeFilesLines
* Remove exclusive testThomas Huang2019-03-211-1/+1
* Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-212-0/+50
* GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-121-54/+0
* Delete old-ui folderWhymarrh Whitby2019-02-214-196/+0
* Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-051-5/+3
* Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-301-0/+1
* I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-301-0/+12
* Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-232-3/+59
* I#5956 fix 1 (#6026)Frankie2019-01-181-0/+37
* Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-141-2/+11
* Adds network loading retry / error screen.Dan Miller2018-12-131-2/+2
* Final gas customization fixesDan Miller2018-12-041-1/+1
* Adds createSpeedUpTransaction to txControllerDan Miller2018-12-041-0/+67
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-011-0/+137
* Autofill gasPrice for retry attempts with either the recommended gasprice or ...Frankie2018-11-271-1/+4
* Version 5.0.3 (#5785)Dan Finlay2018-11-211-1/+1
* Fix rounding issue when sending max tokens (#5695)Alexander Tseung2018-11-201-1/+1
* Auto fail transactions that have been approved for over 12 hours (#5765)Dan Finlay2018-11-171-0/+38
* ESLint fixes (#5775)Whymarrh Whitby2018-11-172-4/+4
* Tx controller now uses safe event emitter (#5769)Frankie2018-11-173-24/+27
* Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-152-4/+20
* Update Balanc3 API (#5744)Paul Bouchon2018-11-141-9/+0
* Merge pull request #5481 from MetaMask/reducersThomas Huang2018-11-072-0/+1574
|\
| * Remove .onlyThomas2018-10-311-1/+1
| * Readable tests, and set nextUnreadNotice to null when CLEAR_NOTICES is dispat...Thomas2018-10-311-23/+95
| * Merge branch 'develop' into reducersThomas2018-10-316-85/+1519
| |\
| * | Isolate variables to individual testsThomas2018-10-311-53/+64
| * | ReducersThomas2018-10-102-0/+1491
* | | EIP-1102: updated implementationbitpshr2018-11-061-2/+2
* | | Update watchAsset ERC20 validation (#5653)Esteban Miño2018-11-061-0/+26
| |/ |/|
* | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-263-10/+10
* | Fix blockies icons overriding contract map icons. Refactor Identicon componen...Alexander Tseung2018-10-251-36/+0
* | Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-211-0/+5
|\ \
| * | add support for wallet_watchAssetEsteban MIno2018-10-201-0/+5
* | | specific add and remove methods for frequentRpcList (#5554)Esteban Miño2018-10-201-0/+19
|/ /
* | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-171-44/+0
* | Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-111-4/+26
* | test - add actions unit tests (#5369)Thomas Huang2018-10-101-0/+1468
|/
* Refactor buffer constructor (#5468)Noel Yoo2018-10-091-1/+1
* Fix typos (#5471)Noel Yoo2018-10-091-2/+2
* Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-051-1/+1
* Add ability to whitelist a blacklisted domain at runtimeWhymarrh Whitby2018-10-021-0/+15
* Some Ui teststmashuang2018-09-258-4/+342
* Implement latest EIP-712 protocolbitpshr2018-09-141-1/+1
* Default NoticeController ctor opts to empty objWhymarrh Whitby2018-09-121-1/+1
* Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-124-137/+46
* fix conflictsEsteban MIno2018-08-291-0/+71
|\
| * Add test cases for MetaMaskController#_onKeyringControllerUpdateWhymarrh Whitby2018-08-231-0/+71
* | watchAsset small changesEsteban MIno2018-08-281-1/+1
* | typo watchAsset imageUrl to imageEsteban MIno2018-08-241-7/+7
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-221-1/+1
|\|
| * fix unit testsbrunobar792018-08-211-1/+1
* | unit tests for watchAssetEsteban MIno2018-08-221-0/+110
|/
* Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-181-0/+62
|\
| * Restores accounts until one with a zero balance is foundDan Matthews2018-08-171-0/+62
| * Remove commented out code for detect-token-testThomas2018-08-151-10/+0
| * Merge branch 'develop' into network-remove-provider-engineThomas2018-08-153-16/+223
| |\
| * | LintThomas Huang2018-07-311-2/+2
| * | Set metamask controller network provider to localhostThomas Huang2018-07-313-2/+24
| * | Detect Tokens are weirdThomas2018-07-301-26/+31
| * | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-268-134/+439
| |\ \
| * | | test - unit - remove tests for obsolete methodskumavis2018-07-041-52/+0
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0425-220/+245
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-033-63/+66
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-073-0/+97
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-071-1/+26
| |\ \ \ \ \ \
| * | | | | | | test - unit - tx-controller - fix blockTracker stubkumavis2018-05-291-0/+1
| * | | | | | | test - unit - pending-tx-tracker - update method namekumavis2018-05-291-2/+2
| * | | | | | | test - unit - nonce-tracker - fix blockTracker stubkumavis2018-05-291-0/+1
| * | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-292-56/+7
| * | | | | | | test - unit - metamask-controller - remove logkumavis2018-05-261-1/+0
| * | | | | | | test - unit - code style nitpickkumavis2018-05-251-1/+2
| * | | | | | | test - unit - metamask-controller - fix many bugs in testskumavis2018-05-251-33/+45
| * | | | | | | test - unit - tx-controller-test - add history object to txMeta when using in...kumavis2018-05-251-31/+29
| * | | | | | | test - unit - move fetch polyfill to helperkumavis2018-05-252-6/+0
| * | | | | | | test - unit - metamask-controller - polyfill global.fetchkumavis2018-05-251-2/+4
| * | | | | | | test - remove .only from unit testskumavis2018-05-251-1/+1
| * | | | | | | Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-2338-307/+939
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-2338-307/+939
| | |\ \ \ \ \ \ \
| * | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-1/+1
| * | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ...frankiebee2018-05-231-32/+21
| |/ / / / / / / /
| * | | | | | | | test - unit - network - get providerProxy via public methodkumavis2018-05-171-4/+5
| * | | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-171-4/+4
* | | | | | | | | fix merge conflictsbrunobar792018-08-189-167/+154
* | | | | | | | | fixed unit testsbrunobar792018-08-151-5/+9
* | | | | | | | | fix tx testsbrunobar792018-08-141-8/+18
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | tests for migration 28Esteban MIno2018-08-101-0/+46
* | | | | | | | create tokens storage when setadressesEsteban MIno2018-07-311-0/+25
* | | | | | | | unit tests for tokens per account and networkEsteban MIno2018-07-281-0/+128
* | | | | | | | modify tests according to tokens by networkEsteban MIno2018-07-272-18/+8
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban Miño2018-07-217-134/+298
|\ \ \ \ \ \ \
| * | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-211-0/+120
| * | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-202-0/+181
| |\ \ \ \ \ \ \
| | * | | | | | | added tests for removeAccountbrunobar792018-07-171-0/+33
| | * | | | | | | added more unit testsbrunobar792018-07-171-2/+55
| | * | | | | | | added unit tests for metamaskcontrollerbrunobar792018-07-171-0/+70
| | * | | | | | | added test for preferences controllerbrunobar792018-07-171-0/+25
| * | | | | | | | Fix testsAlexander Tseung2018-07-181-67/+0
| |/ / / / / / /
| * | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-121-61/+41
| |\ \ \ \ \ \ \
| | * | | | | | | Fix existing unit testsAlexander Tseung2018-07-081-61/+41
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | test - check that #setTxStatusRejected removes transaction from historyfrankiebee2018-07-111-0/+9
| * | | | | | | test - fix for lintfrankiebee2018-07-111-5/+5
| * | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-07-1125-227/+197
| |\| | | | | |
| * | | | | | | tests - fix cancle transaction test to better fit new behaviorfrankiebee2018-06-272-13/+10
| * | | | | | | woops - remove .onlyfrankiebee2018-06-261-1/+1
| * | | | | | | trandsactions - remove rejected transactions from historyfrankiebee2018-06-261-0/+14
| * | | | | | | migration 27 - remove rejected transactions from statefrankiebee2018-06-261-0/+50
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | fix detection on submit passwordEsteban MIno2018-07-211-6/+27
* | | | | | | keyring unlocked detect and unit testsEsteban MIno2018-07-201-6/+32
* | | | | | | detect tokens when submit password and new account selectedEsteban MIno2018-07-201-4/+4
* | | | | | | detect tokens through infuraEsteban MIno2018-07-131-9/+17
* | | | | | | improve testsEsteban MIno2018-07-121-56/+49
* | | | | | | fix lintEsteban MIno2018-07-041-54/+46
* | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban MIno2018-07-0425-229/+199
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | fix unit testsbrunobar792018-07-031-4/+3
| * | | | | | fix testsbrunobar792018-07-032-6/+12
| * | | | | | fix warning for unit testsbrunobar792018-07-0314-68/+35
| * | | | | | eslint --fix .brunobar792018-07-0321-168/+166
| |/ / / / /
* / / / / / tests for specEsteban MIno2018-06-281-0/+101
|/ / / / /
* | | | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-151-46/+4
|\ \ \ \ \
| * | | | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-141-46/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into Validat...kumavis2018-06-143-5/+97
|\| | | |
| * | | | Merge pull request #4512 from MetaMask/test-metamask-no-diagnosticsThomas Huang2018-06-071-0/+3
| |\ \ \ \
| | * | | | test - metamask-controller - disable diagnosticskumavis2018-06-061-0/+3
| | | |_|/ | | |/| |
| * | | | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-072-0/+94
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | remove generating blocked accounts and use a config file insteadCsaba Solya2018-05-311-11/+10
| | * | | adding tests for recipient blacklist checkerCsaba Solya2018-05-301-0/+78
| | * | | adding transaction controller testsCsaba Solya2018-05-301-0/+17
| | | |/ | | |/|
| * | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-061-5/+0
* | | | test - unit - add assertRejects to test asyncFnskumavis2018-06-142-5/+23
* | | | test - unit - import strategies - properly await async methodskumavis2018-06-141-8/+8
* | | | Make account import tests much more specificDan Finlay2018-06-121-10/+10
* | | | Improve private key import testsDan Finlay2018-06-081-1/+25
* | | | Improve test formattingDan Finlay2018-06-081-16/+19
|/ / /
* | | Mock notifier in testDan Finlay2018-06-051-0/+5
* | | Add failing test for unknown identity entryDan Finlay2018-06-051-3/+28
|/ /
* | Merge branch 'develop' into testingtmashuang2018-05-221-30/+0
|\ \
| * | Reveal get filtered tx list (#4332)Frankie2018-05-221-30/+0
* | | Merge branch 'develop' into testingtmashuang2018-05-226-57/+214
|\| |
| * | Fix migration 026 to produce the correct shape for state.identitiesWhymarrh Whitby2018-05-181-2/+2
| * | Update MetaMaskController vault restoration test for new KC apiWhymarrh Whitby2018-05-171-1/+1
| * | Add migration to move identities from KeyringControllerWhymarrh Whitby2018-05-171-0/+41
| * | Add test case for PreferencesController#setAccountLabelWhymarrh Whitby2018-05-171-0/+21
| * | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-171-0/+44
| * | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-171-13/+13
| * | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-173-36/+84
| |/
* | Moved loose some loose test files to sub folderstmashuang2018-05-2129-59/+108
* | signMessage and signPersonalMessageThomas2018-05-181-13/+33
* | Merge branch 'develop' into testingThomas2018-05-174-90/+134
|\|
| * Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-...kumavis2018-05-171-25/+5
| |\
| | * Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-171-0/+30
| | |\
| | * | test - network controller - remove tests for deprecated APIs + update testskumavis2018-05-031-25/+5
| * | | add time stamps to transaction history log entriesCsaba Solya2018-05-103-65/+129
| | |/ | |/|
* | | console.log -> assert.equalThomas2018-05-091-1/+1
* | | ImportAccountWithStrategies Json and KeystoreThomas2018-05-091-0/+30
* | | Remove approvePersonalMessage testThomas2018-05-081-45/+0
* | | Merge branch 'develop' into testingThomas2018-05-0810-194/+271
|\| |
| * | transactions - add a nonce check utility for ui usefrankiebee2018-05-021-0/+30
| |/
| * Merge pull request #4116 from MetaMask/test-unit-ganacheThomas Huang2018-05-012-12/+12
| |\
| | * test - unit - send from test accounts to avoid not-enough-balance error from ...kumavis2018-04-282-12/+12
| * | Verify identities state after restoring new accounts (#4091)Paul Bouchon2018-04-301-8/+25
| |/
| * Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3kumavis2018-04-268-173/+164
| |\
| | * Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-203-0/+91
| | |\
| | * | meta - transactions - code clean up and jsDocfrankiebee2018-04-141-2/+2
| | * | meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-118-171/+162
| * | | Clean up network configAlexander Tseung2018-04-241-1/+41
| | |/ | |/|
* | | setupUntrustedCommunication and setupTrustedCommunicationThomas2018-04-251-0/+45
* | | Merge branch 'master' into testingThomas2018-04-243-0/+91
|\| |
| * | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-182-0/+64
| |\ \
| | * | Disable token price polling when no client is activebitpshr2018-04-171-0/+1
| | * | Maintain token prices using a background servicebitpshr2018-04-161-0/+28
| | * | Add tests for ComposableObservableStorebitpshr2018-04-141-0/+35
| | |/
| * | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-106-56/+224
| |\|
| * | Fix and improve testDan Finlay2018-04-041-2/+12
| * | Internationalize currencyDan Finlay2018-04-041-0/+17
* | | ConfigManager markAccountsFound, markPasswordForgotten, unMarkPasswordForgottenThomas2018-04-241-7/+70
* | | resetAccount and addNewAccountThomas2018-04-201-0/+45
* | | newUnsignedMessage and newUnsignedPersonalMessageThomas2018-04-191-0/+102
* | | Merge branch 'master' into testingThomas2018-04-116-34/+228
|\ \ \ | | |/ | |/|
| * | migrations - back fixesfrankiebee2018-04-061-1/+9
| * | create migration 25frankiebee2018-04-062-3/+50
| * | test - run live migrations over first time statefrankiebee2018-04-061-4/+25
| * | meta - create a migration templatefrankiebee2018-04-061-0/+17
| * | Merge pull request #3887 from MetaMask/i#3886kumavis2018-04-061-8/+9
| |\ \
| | * | transactions - _normalizeTxParams will now return a new object for txParamsfrankiebee2018-04-061-9/+9
| | * | transactions - remove unnecessary keys on txParamsfrankiebee2018-04-051-1/+2
| * | | make migration-24 compat with first-time-statefrankiebee2018-04-061-0/+12
| |/ /
| * | transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-051-11/+8
| * | hot-fix - migrate unaproved txParams so that the from is lowercasefrankiebee2018-04-051-0/+37
| * | transactions - normalize txParamsfrankiebee2018-04-052-44/+72
| |/
| * tests - fix txController tests so that txMetas have a from feildfrankiebee2018-04-031-2/+4
| * transactions validationt - valdate from field on txParamsfrankiebee2018-04-031-0/+24
* | MM-controlller testsThomas2018-04-111-2/+55
* | Update Sinon methods. sinon.sandbox.create() -> sandbox.createSandbox()Thomas2018-04-057-8/+8
* | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int...Thomas2018-04-032-2/+146
|\ \ | |/ |/|
| * Metamask controller methodsThomas2018-03-281-1/+146
| * Remove console.logThomas2018-03-281-1/+0
* | Rename variable to be more understandableDan Finlay2018-03-291-2/+19
* | Add test to reproduce issue behaviorDan Finlay2018-03-291-0/+19
* | migration for removing unnecessary transactions from statefrankiebee2018-03-282-3/+102
|/
* migration for adding submittedTime to the txMeta (#3727)Frankie2018-03-271-0/+32
* Merge branch 'master' into retry-tx-refractorDan2018-03-203-3/+3
|\
| * Remove unused files from ui folder. (#3577)anticlimactic2018-03-193-3/+3
* | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-151-3/+1
|\|
| * deps - use pify instead of util.promisifykumavis2018-03-151-3/+1
* | Merge branch 'master' into retry-tx-refractorDan2018-03-141-4/+6
|\|
| * Merge pull request #3497 from MetaMask/testingkumavis2018-03-101-4/+6
| |\
| | * Persist rinkeby.infura.io and clean nock afterThomas2018-03-101-4/+6
* | | tests - add tests for transactions#retryTransaction and transactions#_markNon...frankiebee2018-03-141-1/+44
|/ /
* | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-081-0/+133
|\ \ | |/ |/|
| * move more test code to beforeEachCsaba Solya2018-03-041-23/+8
| * verify seedwords on log inCsaba Solya2018-03-041-40/+8
| * verify addresses regardless caseCsaba Solya2018-03-031-0/+44
| * seed phrase verifierCsaba Solya2018-03-031-0/+136
* | fix typo in tests and tx-state-managerJeffrey Tong2018-03-082-4/+4
* | Merge pull request #3259 from MetaMask/controllerStubskumavis2018-03-073-126/+96
|\ \
| * | Using noop to not lose itThomas2018-02-281-1/+1
| * | Revert initializing first-time-stateThomas2018-02-281-3/+3
| * | Network controller nockThomas Huang2018-02-161-24/+16
| * | Offline testingThomas Huang2018-02-163-103/+81
* | | Merge pull request #3309 from scsaba/edge-supportDan Finlay2018-03-071-0/+101
|\ \ \
| * | | fix testCsaba Solya2018-02-231-1/+2
| * | | add negative decrypt testCsaba Solya2018-02-231-0/+20
| * | | fix testsCsaba Solya2018-02-231-6/+20
| * | | adding testsCsaba Solya2018-02-231-0/+66
| | |/ | |/|
* | | Remove logsDan Finlay2018-03-031-1/+0
* | | Add version bumping scriptDan Finlay2018-03-033-0/+1031
|/ /
* | Point add-token unit test to old-ui component.Dan2018-02-081-1/+1
* | Merge branch 'master' into uatDan2018-02-083-0/+102
|\|
| * Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputsFrankie2018-02-011-0/+43
| |\
| | * Clean up test, remove react & mountWithStoreThomas2018-01-311-3/+2
| | * Set address to default with empty string, add test validation.Thomas2018-01-311-0/+44
| * | Merge branch 'master' into localStorage-clean-upFrankie2018-02-011-0/+43
| |\ \
| | * | clean upBruno Barbieri2018-02-011-19/+13
| | * | add test for wipeTransactionsBruno Barbieri2018-02-011-0/+49
| | |/
| * | remove RecentBlocks from diskfrankiebee2018-02-011-0/+1
| * | test for migration 021frankiebee2018-01-311-0/+15
| |/
* | Merge branch 'uat' into newmasterChi Kei Chan2018-01-205-131/+126
|\ \ | |/ |/|
| * Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-175-131/+126
| |\
| | * Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-045-131/+126
| | |\
| | | * [NewUI] Fixes tests and sends user to NewUI after registering. (#2788)Dan J Miller2017-12-221-2/+1
| | | * Merge branch 'master' into NewUI-flatDan2017-12-211-0/+48
| | | |\
| | | * \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-071-20/+67
| | | |\ \
| | | * | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-0/+33
| | | * | | Update to Enzyme 3.2.0Thomas Huang2017-11-263-5/+5
| | | * | | Merge branch 'master' into merge-masterChi Kei Chan2017-11-161-4/+4
| | | |\ \ \
| | | * | | | Get current NewUI-flat tests working.Dan2017-11-034-137/+101
| | | * | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-252-2/+3
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-191-0/+32
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-043-56/+36
| | | | |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 12:28:19 +0800