aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Collapse)AuthorAgeFilesLines
* lint fixkumavis2016-07-081-1/+1
|
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-07-082-21/+48
|\ | | | | | | ConfirmationStyle
| * Change function name to generateBalanceObjectFrankie2016-07-082-4/+4
| |
| * Add method to deal with small decimals and create the object for eth-balance ↵Frankie2016-07-082-17/+34
| | | | | | | | component
* | Restore button naming consistencyDan Finlay2016-07-081-2/+2
| |
* | Add nickname rendering for recipient addressDan Finlay2016-07-082-5/+19
| |
* | LintedDan Finlay2016-07-082-2/+2
| |
* | Refined tx confirmation button stylesDan Finlay2016-07-081-7/+19
| |
* | Implement tx confirmation style refinementsDan Finlay2016-07-084-24/+38
| |
* | Add configurable params to eth-balanceDan Finlay2016-07-081-10/+17
| |
* | Make mini account panel labels fully configurableDan Finlay2016-07-082-28/+42
| |
* | Remove formatBalance.formatted referencesDan Finlay2016-07-081-4/+4
| |
* | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-082-40/+28
|\|
| * Revert back to original formatBalanceFrankie2016-07-082-40/+28
| |
* | Correct data length calculationDan Finlay2016-07-071-1/+1
| |
* | Update gas costDan Finlay2016-07-071-1/+1
| |
* | Fix sender balance rendering in pending tx detailsDan Finlay2016-07-071-1/+4
| |
* | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-072-4/+4
|\|
| * Fix dropdown z-index issue.Kevin Serrano2016-07-071-3/+3
| |
| * Handle to small of balances with "<0.00001"Frankie2016-07-071-1/+1
| |
* | LintedDan Finlay2016-07-072-29/+6
| |
* | Fixed up pending-tx-detailsDan Finlay2016-07-073-24/+27
| |
* | Fleshed out pending tx viewDan Finlay2016-07-074-31/+86
| |
* | Merged latest balance formatting codeDan Finlay2016-07-074-29/+42
|\|
| * Add a postion option for tool tipFrankie2016-07-072-1/+2
| |
| * Add decimal hendeling to ETH balanceFrankie2016-07-073-28/+40
| |
* | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-072-28/+39
|\|
| * Merge pull request #387 from MetaMask/ui-formattingDan Finlay2016-07-071-23/+25
| |\ | | | | | | Ui formatting for account details
| | * Move account balance down a row. Adjusted positioning of buttons.Kevin Serrano2016-07-061-23/+25
| | |
| * | Add light and ultraLight fontsFrankie2016-07-062-5/+14
| |/
* | Began reworking tx conf viewDan Finlay2016-07-077-18/+210
| |
* | Simplify empty account balance renderingDan Finlay2016-07-061-1/+1
|/
* Put network status checkmarks at end of rowDan Finlay2016-07-022-0/+5
|
* LintedDan Finlay2016-07-021-1/+0
|
* Move main drop-down state to component stateDan Finlay2016-07-023-35/+9
|
* Formatted dev mode betterDan Finlay2016-07-013-7/+6
|
* Added some basic stylesDan Finlay2016-07-011-1/+14
|
* disclaimer - render via react-markdownkumavis2016-07-011-2/+10
|
* Remove scroll fixing from ui previewDan Finlay2016-07-011-20/+2
|
* Remove old disclaimerDan Finlay2016-07-011-8/+0
|
* Merge branch 'master' into FrankieDisclaimerDan Finlay2016-07-018-90/+161
|\
| * Merge pull request #378 from MetaMask/UiDevkumavis2016-07-012-1/+11
| |\ | | | | | | Ui dev
| | * Make info page not chrome dependentDan Finlay2016-07-011-1/+7
| | |
| | * First simple version of ui mockerDan Finlay2016-07-012-1/+5
| | |
| * | Merge branch 'master' into compactLayoutFrankie2016-07-011-0/+5
| |\ \
| | * | Fix broken action referenceDan Finlay2016-07-011-0/+5
| | |/
| * | Implemt new account layoutFrankie2016-07-016-35/+59
| | |
| * | WIP: Working on new layoutFrankie2016-07-014-82/+114
| |/
* / Add new user agreementDan Finlay2016-07-011-1/+1
|/
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-06-307-41/+129
|\ | | | | | | networkIndication
| * Unify tooltip stylesDan Finlay2016-06-304-26/+59
| | | | | | | | | | | | Made a local tooltip component for replicating our tooltip styles wherever we use tooltips. Applied that tooltip to other items that had tooltips.
| * Merge branch 'master' into CopyTxHashDan Finlay2016-06-301-3/+3
| |\
| * | Add tooltip to copy buttonDan Finlay2016-06-302-10/+42
| | |
| * | Use clipboard icon for copy buttonDan Finlay2016-06-301-3/+8
| | |
| * | Add copy button to transaction listDan Finlay2016-06-301-0/+3
| | |
| * | Replace manual copy buttons with new CopyButton componentDan Finlay2016-06-302-17/+6
| | |
| * | Add CopyButton componentDan Finlay2016-06-301-0/+26
| | |
* | | Merge branch 'master' into networkIndicationFrankie2016-06-301-3/+3
|\ \ \ | | |/ | |/|
| * | Unify wording for transaction options (#369)Kevin Serrano2016-06-301-3/+3
| |/ | | | | | | | | | | | | | | * Unify wording for transaction options. * Modify changelog. * Fix wording and spacing.
* | Add to change logFrankie2016-06-303-21/+20
| |
* | Add network name to indicator and some css fixesFrankie2016-06-304-11/+51
| | | | | | | | | | -also fix custom net work bug in drop down where it thinks local:8545 is custom.
* | Add ✓ charchter to indicate active networkFrankie2016-06-302-0/+31
|/
* Remove missused actionFrankie2016-06-291-1/+0
|
* Make it so that when you click the custom rpc url it closes the dropdown menuFrankie2016-06-291-1/+1
|
* fix lintFrankie2016-06-291-4/+4
|
* Merge branch 'master' into networkDropdownFixFrankie2016-06-293-18/+16
|\
| * Modify network icons to reflect current design. (#355)Kevin Serrano2016-06-293-16/+13
| | | | | | | | | | | | * Modify network icons to reflect current design. * Switch icons around.
| * Fix out-of-place positioning of pending tx badges. (#354)Kevin Serrano2016-06-291-2/+3
| |
* | Add custom to drop down menuFrankie2016-06-291-0/+22
|/
* Merge branch 'master' into pr/351kumavis2016-06-292-2/+2
|\ | | | | | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
| * Merge branch 'master' into FixSomeFormattingkumavis2016-06-293-4/+9
| |\ | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
| * | Simplify `send ether` button to `send`.Dan Finlay2016-06-291-1/+1
| | |
| * | Fix formatting on terms & conditions pageDan Finlay2016-06-291-1/+1
| | |
* | | Second layer of 20 character check modified.Kevin Serrano2016-06-291-1/+1
| | |
* | | Changelog update and reduce allowed characters from 30 to 20.Kevin Serrano2016-06-291-1/+1
| | |
* | | Merge branch 'master' into title-truncateKevin Serrano2016-06-293-4/+9
|\ \ \ | | |/ | |/|
| * | Merge pull request #344 from Zanibas/character-limitkumavis2016-06-291-2/+4
| |\ \ | | | | | | | | Character limit implemented for wallet names
| | * | Code style fix.Kevin Serrano2016-06-291-2/+2
| | | |
| | * | Merge changelog.Kevin Serrano2016-06-293-2/+7
| | |\|
| | * | Additional length check just in case.Kevin Serrano2016-06-291-2/+3
| | | |
| | * | Enforce 30 character limit on wallet name.Kevin Serrano2016-06-291-0/+1
| | | |
| * | | Move clearNotifications to popup.jsFrankie2016-06-291-9/+0
| | | |
| * | | fix for lintingFrankie2016-06-291-5/+5
| | | |
| * | | Merge branch 'master' into i340+1Frankie2016-06-296-2/+11
| |\ \ \ | | | |/ | | |/|
| * | | fix #341 close notifications when oppening pop upFrankie2016-06-291-0/+8
| | | |
| * | | Fix it so you cant send a negitavie amount of ETHFrankie2016-06-281-1/+5
| | | |
* | | | Wallet name now is properly truncated.Kevin Serrano2016-06-292-2/+2
| | | |
* | | | Truncate account name further.Kevin Serrano2016-06-291-1/+1
| |/ / |/| |
* | | Change color of failure to yellow. Change pending to ellipsis. (#338)Kevin Serrano2016-06-293-2/+7
| |/ |/| | | | | | | | | * Change color of failure to yellow. Change pending to ellipsis. * Modify changelog.
* | Add alt titles to most critical iconsKevin Serrano2016-06-283-0/+4
|/ | | | We can change most of these later to a more "elegant" solution, but from the user perspective, having these tooltips is comforting imo.
* Merge branch 'master' into uiFixesFrankie2016-06-256-88/+142
|\
| * clean - appease the linting machinekumavis2016-06-252-27/+9
| |
| * svg notif now work for msg signatureskumavis2016-06-253-33/+62
| |
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-06-251-1/+1
| |\ | | | | | | | | | conf-tx-refactor
| * | breakout pending-tx-detailskumavis2016-06-254-31/+74
| | |
* | | Fix for the mailto linkFrankie2016-06-251-1/+1
| | |
* | | Fix editable button so that it dosent float above the drop down menueFrankie2016-06-251-4/+2
| |/ |/|
* | identicon - default to imageifykumavis2016-06-251-1/+1
|/
* send-tx remove account select buttonkumavis2016-06-252-5/+7
|
* Merge pull request #312 from MetaMask/svg-notifkumavis2016-06-247-105/+98
|\ | | | | initial svg notifications
| * some legit linting fixeskumavis2016-06-241-2/+1
| |
| * pending-tx pass the identicon pref onkumavis2016-06-242-0/+2
| |
| * account-panel combine panel into account-panelkumavis2016-06-242-66/+37
| |
| * accounts - rename account list item so it doesnt overlapkumavis2016-06-242-2/+3
| |
| * icon-factory - overhaul to provide svg or imagified elkumavis2016-06-243-32/+37
| |
| * tx-conf add non-interactive mode for notificationkumavis2016-06-242-11/+20
| |
| * svg notifications - remove unneeded deps and clean codekumavis2016-06-241-5/+5
| |
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notifkumavis2016-06-246-91/+20
| |\
| * | initial svg notificationskumavis2016-06-231-5/+11
| | |
* | | Add fox logo back to left of menuDan Finlay2016-06-241-8/+29
| | | | | | | | | | | | Re-centered metamask h1 manually.
* | | Moved account change button to menu barDan Finlay2016-06-242-32/+36
| |/ |/|
* | close #309Frankie2016-06-231-1/+0
| |
* | Remove redundant network option buttons from settings pageFrankie2016-06-231-37/+1
| |
* | Swap out Transat font for MontserratFrankie2016-06-235-54/+20
|/
* Fix for lint errFrankie2016-06-222-13/+7
|
* Fix conflictFrankie2016-06-2247-1064/+962
|\
| * Manually lintedDan Finlay2016-06-2235-123/+75
| |
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLintDan Finlay2016-06-221-10/+7
| |\
| * | Auto lintedDan Finlay2016-06-2247-970/+913
| | |
* | | Change the copy to cliboard iconFrankie2016-06-221-2/+6
| | |
* | | Change export icon to keyFrankie2016-06-222-3/+9
| |/ |/|
* | tweekZac Mitton2016-06-211-1/+0
| |
* | added a failing case and fixed it by refactoring everything to stringsZac Mitton2016-06-211-10/+8
|/
* Fix tx approval address formattingDan Finlay2016-06-171-1/+2
|
* Preserve disclaimer line breaksDan Finlay2016-06-171-2/+2
|
* Added some real text to top of disclaimerDan Finlay2016-06-171-1/+3
|
* Increase disclaimer scroll box heightDan Finlay2016-06-171-1/+1
|
* Remove dead codeDan Finlay2016-06-171-34/+0
|
* Conditionally display disclaimerDan Finlay2016-06-171-0/+6
|
* Add disclaimer componentDan Finlay2016-06-171-0/+56
|
* Improved template to not be invisibleDan Finlay2016-06-171-1/+2
|
* Create disclaimer approval reducerDan Finlay2016-06-171-0/+5
|
* Fix disclaimer approving actionDan Finlay2016-06-171-1/+2
|
* Add disclaimer consent actionDan Finlay2016-06-171-0/+13
|
* Add placeholder disclaimer fileDan Finlay2016-06-171-0/+9
|
* Improve templateDan Finlay2016-06-171-2/+1
|
* Resize images for chrome store acceptanceDan Finlay2016-06-179-0/+0
|
* icon fox eyes changed to navy blue everywhereZac Mitton2016-06-164-0/+2383
|
* screenshots and promos for chrome store round 1Zac Mitton2016-06-159-0/+0
|
* Merge pull request #286 from MetaMask/FixSpinnerDan Finlay2016-06-151-0/+1
|\ | | | | Made network spinner clickable
| * Made network spinner clickableDan Finlay2016-06-151-0/+1
| | | | | | | | | | | | Opens network menu, for when network is unreachable. Fixes #279
* | Let account address take more space in account listDan Finlay2016-06-153-10/+20
|/
* Show more address in detail viewDan Finlay2016-06-151-6/+7
|
* Center main account iconDan Finlay2016-06-151-0/+1
|
* Merge pull request #283 from MetaMask/RewordLockDan Finlay2016-06-151-1/+1
|\ | | | | Reword lock menu item
| * Rename Lock Account to simply LockDan Finlay2016-06-151-1/+1
| |
* | Remove unused classDan Finlay2016-06-151-1/+1
| |
* | Insert vlad icons into UIDan Finlay2016-06-151-3/+6
|/
* Size export confirmation inputFrankie2016-06-133-3/+7
|
* Change name-label css bugFrankie2016-06-131-2/+1
|
* Remove qr code icon and reorder to have clipboard firstFrankie2016-06-132-9/+15
|
* Fix edit textFrankie2016-06-133-8/+7
| | | | and edit label alighment
* Add spacing in line itemsFrankie2016-06-092-4/+6
|
* Mend CHANGE.logFrankie2016-06-092-11/+58
|\
| * Cache identiconsDan Finlay2016-06-072-11/+58
| | | | | | | | | | | | | | | | Fixes #197 Also as a side effect, by creating this `iconFactory.cache` object, we have a convenient place for specifying stock icons for known contracts! We can just hard-code image addresses in the `ui/lib/icon-factory.js` cache instantiation, and those values will be injected into the identicon image tag `src` attributes.
* | Style up the info screenFrankie2016-06-092-2/+20
| |
* | Add icons to left side of links, as well as the metmask version and stylingFrankie2016-06-091-34/+76
|/
* Merge branch 'master' into uiFixesFrankie2016-06-0610-27/+388
|\
| * Make morden sail blueDan Finlay2016-06-041-1/+1
| |
| * Add provider menu on clicking network status indicator.Dan Finlay2016-06-043-27/+61
| | | | | | | | Also simplifies network status icons.
| * Clicking network status indicator reveals provider menuDan Finlay2016-06-043-2/+67
| |
| * Merge branch 'master' into display_networkDan Finlay2016-06-048-12/+226
| |\
| | * Merge pull request #242 from MetaMask/HashFixkumavis2016-06-031-1/+1
| | |\ | | | | | | | | provider-engine hooked wallet - checkSum addresses not recognized
| | | * Fix hashed address validationDan Finlay2016-06-031-1/+1
| | | |
| | * | A couple seed recovery enhancementsDan Finlay2016-06-033-5/+6
| | | | | | | | | | | | | | | | | | | | - The seed words are no longer stored on `state.appState.currentView.context`, which caused view glitches since it was shared with other views' data. - The confirmation text warning color is now the same as other error messages'.
| | * | Added seed word recovery to config screenDan Finlay2016-06-036-8/+221
| | |/
| * | Blockchain status now updates on availability changeDan Finlay2016-06-041-6/+4
| | |
| * | Add network loading indicationDan Finlay2016-06-041-0/+8
| | |
| * | Differentiate icon name from hover textDan Finlay2016-06-041-12/+16
| | |
| * | Some minor lintingDan Finlay2016-06-041-4/+4
| | |
| * | Make hover text more human friendlyDan Finlay2016-06-041-4/+4
| | |
| * | Remove metamask logo from headerDan Finlay2016-06-041-6/+0
| | |
| * | undo styleZac Mitton2016-06-021-6/+5
| | |
| * | network status getting set upon start-up and showing in title bar but not ↵Zac Mitton2016-06-023-6/+51
| |/ | | | | | | auto-updating yet
* | Add css to resize and alighn input for editable lableFrankie2016-06-063-3/+12
| |
* | Fix label size for edit labelFrankie2016-06-061-7/+3
| |
* | Add edit labelFrankie2016-06-062-1/+23
| |
* | Change chevron-down to fa-plusFrankie2016-06-041-1/+1
|/
* Merge branch 'master' into i216Dan Finlay2016-05-278-61/+171
|\
| * Fix build errorDan Finlay2016-05-271-5/+2
| |
| * Remove etherscan links from non standard blockchainsDan Finlay2016-05-271-2/+9
| |
| * Fix network reference part 2Dan Finlay2016-05-271-1/+1
| |
| * Fix network referenceDan Finlay2016-05-272-2/+2
| |
| * Add clicking txs in list shows tx conf screenDan Finlay2016-05-275-5/+50
| |
| * Add pending messages to sign to tx listDan Finlay2016-05-274-54/+113
| |
| * Center wallet nickname under identicon in tx confirmation screenDan Finlay2016-05-271-0/+2
| |
* | ui - redesign - init + vault create/restore + seedkumavis2016-05-275-75/+129
|/
* Merge pull request #222 from MetaMask/balanceskumavis2016-05-262-26/+30
|\ | | | | Fixes #206
| * correctly displaying small balances with testsZac Mitton2016-05-262-26/+30
| |
* | Merge branch 'master' into FixTransactionBackButtonDan Finlay2016-05-261-0/+1
|\ \
| * | Fix persistent warning bugDan Finlay2016-05-261-0/+1
| |/
* | Move transaction list item into its own componentDan Finlay2016-05-262-107/+133
| |
* | Make transaction list into actual React ComponentDan Finlay2016-05-262-48/+63
| |
* | Add number indicating pending txs to account listDan Finlay2016-05-264-1/+37
| |
* | Fix back button on pending tx screenDan Finlay2016-05-262-16/+21
| | | | | | | | Fixes #208
* | Remove commented out codeDan Finlay2016-05-261-37/+0
|/
* actions - remove use of 'this'kumavis2016-05-261-70/+70
|
* Add copy address button to account listDan Finlay2016-05-243-6/+52
|
* Move account list panel to componentDan Finlay2016-05-242-45/+28
|
* Remove old accounts list fileDan Finlay2016-05-241-182/+0
|
* Move accounts indexDan Finlay2016-05-241-0/+182
|
* bugfix - exportAccount - fix copyToClipboardkumavis2016-05-231-0/+1
|
* Added ability to nickname wallets locallyDan Finlay2016-05-214-14/+104
| | | | The changes are persisted to localstorage, so they cannot be restored on a new computer, but for right now it's a nice organizational feature.
* Fix up accounts listDan Finlay2016-05-213-17/+18
| | | | | Fix hover styles to not grow. Fix back button on accounts list.
* Made account list hover styles more consistentDan Finlay2016-05-211-2/+2
|
* Add ability to add account to vaultDan Finlay2016-05-214-7/+73
| | | | | | | | Scrolling to the bottom of the accounts page now reveals a downward-facing chevron button. Pressing this button shows loading indication, adds a new account to the identity vault, displays it in the list, and scrolls the list to the bottom of the page. Any number of accounts can be generated in this way, and the UX feels intuitive without having to overly explain how HD paths work.
* Improve tx list styleDan Finlay2016-05-202-26/+6
| | | | Tx list no longer enlarges on hover, and failed transactions no longer have hover styles nor direct to an explorer page.
* Do not forward to null tx explorer pageDan Finlay2016-05-201-0/+1
|
* Render failed tx in tx listDan Finlay2016-05-202-9/+28
|
* Add special rendering for contracts in transaction listDan Finlay2016-05-201-14/+39
|
* Allow empty recipient fields on txDan Finlay2016-05-202-1/+3
|
* Add full precision to send tx value field.Dan Finlay2016-05-202-2/+17
|
* Increase send value precisionDan Finlay2016-05-202-3/+3
|
* Add address capitalization checksummingDan Finlay2016-05-203-4/+19
|
* Allow txs with no recipient when they have a data fieldDan Finlay2016-05-201-9/+9
|
* Make accounts page transition forward from account detailDan Finlay2016-05-191-2/+2
|
* Merge branch 'eyeballs' of github.com:MetaMask/metamask-plugin into eyeballskumavis2016-05-194-31/+155
|\
| * Merge pull request #190 from MetaMask/MenuDroppokumavis2016-05-194-31/+155
| |\ | | | | | | Drop-down menu
| | * Fix typosDan Finlay2016-05-191-2/+2
| | |
| | * Finish clean implementation of drop-down menuDan Finlay2016-05-192-51/+56
| | |
| | * Add dynamic list item stylesDan Finlay2016-05-194-29/+123
| | |
| | * Merge branch 'eyeballs' into MenuDroppoDan Finlay2016-05-195-83/+176
| | |\
| | * | Add animated sandwich buttonDan Finlay2016-05-193-3/+28
| | | |
* | | | ui - redesign - txList improvedkumavis2016-05-191-25/+83
|/ / /
* | | Merge pull request #189 from MetaMask/hotfixsendTxDan Finlay2016-05-191-10/+15
|\ \ \ | | | | | | | | ui - sendTx - re-add warning and fix form parsing
| * | | ui - sendTx - re-add warning and fix form parsingkumavis2016-05-191-10/+15
| | |/ | |/|
* / | ui - redesign - ether amount componentkumavis2016-05-196-12/+83
|/ /
* / ui - redesign - sendTransactionkumavis2016-05-195-83/+176
|/
* ui - add new designskumavis2016-05-173-0/+0
|
* ui - redesign - unlock menukumavis2016-05-145-233/+111
|
* ui - redesign - sendkumavis2016-05-141-1/+4
|
* ui - txList - add timekumavis2016-05-141-0/+11
|
* ui - txlist - better scroll bar positioningkumavis2016-05-141-1/+1
|
* ui - copy address fixkumavis2016-05-141-2/+2
|
* ui - fix account-export marginkumavis2016-05-141-13/+22
|
* ui - redesign - trans group + + account detail + tx list fixeskumavis2016-05-148-111/+149
|
* ui - accunt-detail - fix style attributekumavis2016-05-141-7/+7
|
* ui - redesign - remove footerkumavis2016-05-141-22/+32
|
* clean - remove logging from tx listkumavis2016-05-141-1/+0
|
* Streamlined some transition logicDan Finlay2016-05-133-14/+22
| | | | | | | | Fixes #122 Had used multiple actions for some transitions, which would lead to brief intermediary states. Now making a few actions much more explicit about what they route to, so there is less intermediary logic, and we can transition confidently to the correct view.
* Fix more transition bugsDan Finlay2016-05-125-52/+26
|
* Revert style name fixes that broke stylesDan Finlay2016-05-121-6/+6
|
* Fix css namesDan Finlay2016-05-121-6/+6
|
* Merge branch 'master' into eyeballsDan Finlay2016-05-121-1/+1
|\
| * Fix send view selected account bugDan Finlay2016-05-121-1/+1
| |
* | Vertically center title bar contentDan Finlay2016-05-111-0/+3
| |
* | Merge branch 'eyeballs' of github.com:MetaMask/metamask-plugin into eyeballsDan Finlay2016-05-114-42/+95
|\ \
| * | ui - redesign - account detailskumavis2016-05-114-42/+95
| | |
* | | Fixed transitionsDan Finlay2016-05-111-27/+21
|/ /
* | hotfix - identicon jazz bugkumavis2016-05-111-2/+6
| |