aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
Commit message (Collapse)AuthorAgeFilesLines
* Fix loading animation not showing on network changeAlexander Tseung2017-10-201-2/+1
|
* Fix selectorsChi Kei Chan2017-10-201-1/+0
|
* Get currency from state in account details, send and confirm screens.Dan2017-10-201-1/+4
|
* Turn off feature toggle.Dan2017-10-191-8/+10
|
* wipChi Kei Chan2017-10-181-4/+7
|
* [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from ↵Dan J Miller2017-10-141-2/+7
| | | | | | | | | | | | | | | | | | state (#2364) * Adds memo field to send-v2. * Vertical align transaction with flexbox. * Customize Gas UI * Remove internal state from InputNumber and fix use in gastooltip. * Move customize-gas-modal to its own folder and minor cleanup * Create send container, get account info from state, and make currency display more reusable * Adjusts send-v2 and container for send-token. Dynamically getting suggested gas prices.
* Adding Account Dropdown V2Chi Kei Chan2017-10-131-1/+4
|
* Various styling fixesChi Kei Chan2017-10-131-18/+27
|
* Adds checkFeatureToggle util.Dan2017-10-091-4/+2
|
* UI for send screen container without form rows.Dan2017-10-091-1/+10
|
* Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-041-0/+1
|\
| * Removed MetaMasktitle. Fixed #1730.Branden Soropia2017-10-021-8/+0
| |
| * network - convert localhost from custom rpc to network typekumavis2017-09-301-1/+1
| |
* | Shapeshift deposit tx modal.Dan2017-10-021-33/+0
| |
* | Enables the old shapeshift UI within new ui.Dan2017-10-021-1/+5
| |
* | Always set currency to USD on app mountChi Kei Chan2017-09-291-0/+5
| |
* | Merge branch 'master' into nmChi Kei Chan2017-09-191-0/+2
|\|
| * Resolve merge conflict from masterKevin Serrano2017-09-061-1/+1
| |\
| | * Cleanup stray logs and lintsdtsui2017-08-111-1/+0
| | |
| | * Fix logic for dropdown components attaching checkmark to correct accountsdtsui2017-08-111-1/+2
| | |
| * | Readd loose label onto accounts.Kevin Serrano2017-08-101-0/+3
| |/
* | Make send token responsive; fix desktop send modal heightChi Kei Chan2017-09-151-1/+1
| |
* | Add responsive UI to send ether modalChi Kei Chan2017-09-151-1/+1
| |
* | Send Token screen partial UIChi Kei Chan2017-09-071-0/+5
| |
* | Fix header style; Address commentsChi Kei Chan2017-09-051-2/+3
| |
* | Fix menu styleJacky Chan2017-09-051-3/+4
| |
* | Fix margin, padding, height for header.Dan2017-09-011-40/+41
| |
* | Lint fixesDan2017-08-311-16/+9
| |
* | Extend modal implementation and state management to accomodate multiple ↵sdtsui2017-08-211-2/+2
| | | | | | | | modal types
* | Remove unnecessary imports, and account-detail.jssdtsui2017-08-141-3/+0
| |
* | Remove unused code - network dropdown components in appsdtsui2017-08-141-204/+0
| |
* | Remove deprecated feature: main app settings dropdownsdtsui2017-08-141-48/+0
| |
* | [WIP] Extract network dropdown into own componentsdtsui2017-08-141-3/+20
| |
* | [WIP] Extract network dropdown out of main app render functionsdtsui2017-08-141-0/+2
| |
* | Move global modals into own pod, inside components/modalssdtsui2017-08-141-3/+4
| |
* | Add minor comments and cleanup for new componentssdtsui2017-08-091-11/+1
| |
* | Move buy view into its own component - BuyOptionssdtsui2017-08-091-36/+2
| |
* | Add an additional font-size breakpoint for buy modal on the largest screenssdtsui2017-08-091-1/+1
| |
* | Move inline styles out into explicitly named BEM classessdtsui2017-08-091-28/+17
| |
* | Implement modal content for buy flow - mobile viewsdtsui2017-08-091-1/+49
| |
* | Implement global modalsdtsui2017-08-091-0/+10
| |
* | Merge branch 'NewUI' into feat/mm-ui-5-mergedsdtsui2017-08-071-6/+40
|\|
| * Fix integration test failures: unnecessary sandwich-expando event ↵sdtsui2017-08-051-1/+0
| | | | | | | | stopPropagation
| * Re-enable css transitions for dropdowns in header, needs menu-droppo library ↵sdtsui2017-08-051-0/+2
| | | | | | | | update
| * Lint ui/appsdtsui2017-08-041-10/+7
| |
| * Increase size of network dropdownsdtsui2017-08-041-0/+18
| |
| * De-dupe click handler for sandwich-expandosdtsui2017-08-041-6/+12
| |
| * Move accountselector menu-droppo up to app-headersdtsui2017-08-041-0/+22
| |
| * Fix wonky widths for notices.Kevin Serrano2017-08-041-1/+1
| |
| * lint fixkumavis2017-08-021-1/+1
| |
* | Add sidebar click handler to overlaysdtsui2017-08-071-2/+11
| |
* | Refactor app-header css, including box shadow and z-indexsdtsui2017-08-071-24/+5
| |
* | Add notes for @Zanibar, with props.isUnlocked and currentView.name logssdtsui2017-08-031-0/+4
| |
* | Isolate routing logic for isUnlocked, remove stray logssdtsui2017-08-031-14/+4
| |
* | Finalize sidebar dimensionssdtsui2017-08-031-27/+3
| |
* | Adjust header spacing for 500px and 900px heightssdtsui2017-08-031-13/+4
| |
* | Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-031-10/+6
| |
* | Ensure app-header is rendered in responsive layoutsdtsui2017-08-031-1/+2
| |
* | Cleanup send, move send token into separate func to make room for send ETHsdtsui2017-08-031-0/+1
| |
* | Move overlay out of transition areasdtsui2017-08-031-17/+18
| |
* | Hook up css animationsdtsui2017-08-031-41/+68
| |
* | Add notes for overlay click actionsdtsui2017-08-031-0/+1
| |
* | Implement custom sidebar, with close buttonsdtsui2017-08-031-1/+67
| |
* | Integrate slideout menu with tx viewsdtsui2017-08-031-0/+1
| |
* | Implement mobile-friendly responsive layout with flex wrapsdtsui2017-08-011-1/+3
| |
* | Add layout for main container elementssdtsui2017-07-311-12/+8
| |
* | Remove old header spacesdtsui2017-07-311-11/+0
| |
* | Adjust dimensions of popup.html and app bar to matchsdtsui2017-07-311-1/+1
| |
* | Center send token content; hook up 'Next' and 'Cancel' buttonssdtsui2017-07-301-9/+11
| |
* | Add token logo to send screensdtsui2017-07-301-0/+10
| |
* | Rearrange header components: closer to redesigned UIsdtsui2017-07-301-31/+18
|/
* Fix dropdown behavior - networksdtsui2017-07-291-1/+11
|
* Fix dropdown toggle behavior - settingssdtsui2017-07-291-1/+5
|
* Fix react warningDan Finlay2017-07-281-0/+6
|
* Remove unused parameterDan Finlay2017-07-281-1/+1
|
* Fix custom provider indicationDan Finlay2017-07-271-5/+5
|
* Re-center network dropdownsdtsui2017-07-271-1/+3
|
* Lots of flex rearrangement on account detail viewDan Finlay2017-07-261-23/+8
| | | | Includes removal of ReactCssTransitionGroup for a simpler UI refactor.
* Restore sort order fixDan Finlay2017-07-251-1/+1
|
* Replace ui with responsive-uiDan Finlay2017-07-251-136/+136
|
* Move responsive ui into its own folder for easier mergesDan Finlay2017-07-211-0/+591
|
* Make folder for responsive UIDan Finlay2017-07-041-591/+0
|
* Merge branch 'master' into i1720-NoSpinnerOnConfigKevin Serrano2017-07-041-16/+31
|\
| * Indicate which network is being searched forDan Finlay2017-07-041-1/+22
| |
| * Add menu carrat next to network searching indicatorDan Finlay2017-07-041-15/+9
| |
* | No longer show network spinner on config screenDan Finlay2017-07-041-1/+1
|/ | | | The config screen is used to select networks, so we must not block it with network loading indication.
* Create add token button and template viewDan Finlay2017-06-151-0/+5
|
* Hide message on normal loadingDan Finlay2017-06-151-1/+3
|
* Multiple loading style improvementsDan Finlay2017-06-151-7/+12
| | | | | | | - When seeking network, show a full screen loading indication + message. - Network menu is still accessible "over" this indication. - Top Menu-Droppo components now slide *under* the menu bar like they should. - Loading indication opacity increased to increase message legibility.
* Modify FAQ to be more visible.Kevin Serrano2017-06-091-1/+1
|
* Remove all traces of testnetThomas Huang2017-05-161-1/+1
|
* Change default network to rinkebyThomas Huang2017-05-161-2/+2
|
* Merge branch 'master' into rinkebyDan Finlay2017-04-281-1/+0
|\
| * Fix linting warningsThomas Huang2017-04-271-1/+0
| |
* | Linting.Kevin Serrano2017-04-261-1/+1
| |
* | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-261-1/+1
| |
* | add rinkeby networkNickyg2017-04-261-0/+9
|/
* Add Kovan test network to our application.Kevin Serrano2017-03-231-0/+9
|
* Render config screen from unlock.Kevin Serrano2017-03-141-0/+4
|
* Display Custom RPC on lock screen.Kevin Serrano2017-03-141-1/+1
|
* Break out rpc update and rpclist into two reducers.Kevin Serrano2017-03-081-3/+1
|
* Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-281-0/+2
|\
| * Got personal_sign workingDan Finlay2017-02-241-0/+2
| | | | | | | | Also fixed bug where signing would not close popup.
* | Concatenate custom RPC labels that are too longDan Finlay2017-02-281-1/+9
| |
* | Tested against code to play nice with unit tests.Kevin Serrano2017-02-241-1/+3
| |
* | Make the UI play nice with empty RPC lists.Kevin Serrano2017-02-231-1/+1
| |
* | LintoKevin Serrano2017-02-231-1/+1
| |
* | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-231-0/+23
|/
* Merge branch 'master' into i1128-noticesdevDan Finlay2017-02-211-0/+20
|\
| * Add debug logging to ui routing logic.Dan Finlay2017-02-211-0/+20
| |
* | Re-enable notices on dev.Kevin Serrano2017-02-211-1/+1
|/
* Remove custom RPC option when on lock screen.Kevin Serrano2017-02-161-1/+1
|
* Change networks from lock screen.Kevin Serrano2017-02-161-6/+6
|
* fix debugKevin Serrano2017-02-101-1/+1
|
* Prevent notices from opening in test and debug mode.Kevin Serrano2017-02-101-1/+1
|
* Delete all code related to disclaimers.Kevin Serrano2017-02-101-19/+13
|
* Clean up message manger includes:Frankie2017-01-291-2/+2
| | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
* Add ability to import v3 JSON walletsDan Finlay2017-01-191-2/+3
| | | | | | | | There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
* Remove outdated referenceDan Finlay2017-01-181-4/+0
|
* Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-181-1/+5
|\
| * Add account adding subview placeholdersDan Finlay2016-11-051-2/+2
| |
| * Scaffold new account viewDan Finlay2016-11-051-0/+4
| |
* | Add "import account" menu item + template viewDan Finlay2017-01-181-0/+11
| |
* | Linting.Kevin Serrano2017-01-051-1/+1
| |
* | Make network somewhat more modular, add new network indicator.Kevin Serrano2017-01-051-9/+15
| |
* | Rename function to be an actionDan Finlay2016-12-231-2/+2
| |
* | LintedDan Finlay2016-12-211-2/+2
| |
* | Make notices confirmation configurableDan Finlay2016-12-211-1/+15
| | | | | | | | - Confirm button will now dismiss the lost accounts array.
* | Merged master into devDan Finlay2016-12-201-9/+7
|\ \
| * | clean - code stylekumavis2016-12-171-4/+0
| | |
| * | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
| * | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
| * | Remove morden testnet providerDan Finlay2016-12-161-9/+0
| | | | | | | | | | | | Instances configured to point at Morden will now point at Ropsten.
* | | Revert "Interface enhancements"Dan Finlay2016-12-171-3/+11
| | |
* | | Fixed header h1 alignment and network nameLuis Iván Cuende2016-12-151-2/+3
| | |
* | | Better account details viewLuis Iván Cuende2016-12-151-8/+0
| | |
* | | Beautified disclaimerLuis Iván Cuende2016-12-141-1/+0
| | |
* | | Modify forgot password flow to go back to init screen.Kevin Serrano2016-11-241-34/+0
| | |
* | | Fix undefined provider menu itemDan Finlay2016-11-231-2/+5
| | |
* | | Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-221-7/+8
|\ \ \ | | | | | | | | Fix custom provider menu item
| * | | Fix custom provider menu itemDan Finlay2016-11-221-7/+8
| | | | | | | | | | | | | | | | The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
* | | | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-221-67/+26
|\| | | | |/ / |/| |
| * | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-151-3/+3
| | |
| * | Linting to the max.Kevin Serrano2016-11-121-2/+0
| |/
| * Add reveal of seed words.Kevin Serrano2016-11-021-0/+4
| |
| * Make forgot password button.Dan Finlay2016-11-021-29/+12
| |
| * Made progress on parity for MultiVaultKevin Serrano2016-11-021-16/+4
| | | | | | | | | | | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.
| * LintedKevin Serrano2016-11-011-1/+0
| |
| * Implement seed word confirmation page.Kevin Serrano2016-11-011-0/+7
| | | | | | | | | | Remove logs. Move HD render files to ui/app.
| * Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-291-8/+7
| |\
| * | Phase out extra warning screen.Kevin Serrano2016-10-261-5/+0
| | |
| * | Fix duplicate provider menu item bugDan Finlay2016-10-221-6/+1
| | |
| * | Began adding first basic keyringDan Finlay2016-10-211-1/+0
| | |
| * | Linted & added salting to vaultDan Finlay2016-10-211-1/+1
| | |
| * | Fix state updating after vault creation and unlockingDan Finlay2016-10-211-0/+1
| | |
| * | Initial work on UI sideKevin Serrano2016-10-161-0/+4
| | |
| * | Remove opinionated seed word codeDan Finlay2016-10-131-16/+2
| | | | | | | | | | | | | | | | | | Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work.
* | | Begin adding Ropsten supportDan Finlay2016-11-221-1/+10
| |/ |/| | | | | | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
* | Fix provider menu selection indicationDan Finlay2016-10-261-8/+7
|/
* Prevent back/login buttons from appearing on the terms of service.Kevin Serrano2016-10-071-0/+1
|
* Rename drop menu item to be consistent with naming.Kevin Serrano2016-10-051-1/+1
|
* Show loading indication when selecting ShapeShiftDan Finlay2016-09-161-3/+4
|
* Add qrcode-npm to package.json and swap out Qr Code generator api for ↵Frankie2016-09-131-1/+0
| | | | node-module
* Nearly finished factoring fiat value into eth-balanceDan Finlay2016-09-071-8/+7
|
* Show custom rpc menu item alwaysDan Finlay2016-08-301-6/+9
|
* make the back button its own functionFrankie2016-08-271-21/+22
|
* Merge branch 'master' into i#563forgotPasswordFrankie2016-08-261-0/+5
|\
| * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-231-0/+28
| |\
| * | MVP Popup Notifications WorkingDan Finlay2016-08-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both. In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways: - Hide the menu bar - Hide the back button from the notifications view. - When confirming the last tx, close the window.
* | | Change style on back button to be more like the rest of the appFrankie2016-08-261-25/+55
| | |
* | | Add a back button on lock screen to go back to init menuFrankie2016-08-261-1/+58
| |/ |/|
* | WIP: ShapeShift txFrankie2016-08-191-0/+28
|/
* Remove ethereum classic providerDan Finlay2016-08-151-9/+0
| | | | Fixes #542
* Change buy forms so that they are their own view and add Qr-codeFrankie2016-08-131-1/+3
|
* Fix issue with dropdown menuFrankie2016-08-041-0/+1
|
* LintedDan Finlay2016-07-291-1/+1
|
* Add missing reference for providerDan Finlay2016-07-291-1/+1
|
* Add eth classic to provider menuDan Finlay2016-07-291-0/+12
|
* Fix menu droppo issues caused by Chrome 52.Kevin Serrano2016-07-271-0/+1
|
* Buy button (#474)Frankie2016-07-221-0/+4
| | | | | | | | | | | | | | | | | | | * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension
* Fix main dropdown animationDan Finlay2016-07-121-2/+2
|
* Fix dropdown z-index issue.Kevin Serrano2016-07-071-3/+3
|
* LintedDan Finlay2016-07-021-1/+0
|
* Move main drop-down state to component stateDan Finlay2016-07-021-6/+9
|
* Formatted dev mode betterDan Finlay2016-07-011-2/+3
|
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-06-301-12/+14
|\ | | | | | | networkIndication
| * Unify tooltip stylesDan Finlay2016-06-301-12/+14
| | | | | | | | | | | | Made a local tooltip component for replicating our tooltip styles wherever we use tooltips. Applied that tooltip to other items that had tooltips.
* | Add to change logFrankie2016-06-301-1/+1
| |
* | Add network name to indicator and some css fixesFrankie2016-06-301-1/+1
| | | | | | | | | | -also fix custom net work bug in drop down where it thinks local:8545 is custom.
* | Add ✓ charchter to indicate active networkFrankie2016-06-301-0/+11
|/
* 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-291-2/+2
|\
| * Modify network icons to reflect current design. (#355)Kevin Serrano2016-06-291-2/+2
| | | | | | | | | | | | * Modify network icons to reflect current design. * Switch icons around.
* | Add custom to drop down menuFrankie2016-06-291-0/+22
|/
* Move clearNotifications to popup.jsFrankie2016-06-291-9/+0
|
* fix for lintingFrankie2016-06-291-5/+5
|
* Merge branch 'master' into i340+1Frankie2016-06-291-0/+1
|\
| * Add alt titles to most critical iconsKevin Serrano2016-06-281-0/+1
| | | | | | | | We can change most of these later to a more "elegant" solution, but from the user perspective, having these tooltips is comforting imo.
* | fix #341 close notifications when oppening pop upFrankie2016-06-291-0/+8
|/
* 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-241-12/+35
|
* Manually lintedDan Finlay2016-06-221-7/+0
|
* Auto lintedDan Finlay2016-06-221-28/+26
|
* Remove dead codeDan Finlay2016-06-171-34/+0
|
* Conditionally display disclaimerDan Finlay2016-06-171-0/+6
|
* Rename Lock Account to simply LockDan Finlay2016-06-151-1/+1
|
* Add provider menu on clicking network status indicator.Dan Finlay2016-06-041-19/+18
| | | | Also simplifies network status icons.
* Clicking network status indicator reveals provider menuDan Finlay2016-06-041-1/+61
|
* Merge branch 'master' into display_networkDan Finlay2016-06-041-0/+4
|\
| * Added seed word recovery to config screenDan Finlay2016-06-031-0/+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-021-6/+9
|/ | | | auto-updating yet
* Fix back button on pending tx screenDan Finlay2016-05-261-13/+1
| | | | Fixes #208
* Remove commented out codeDan Finlay2016-05-261-37/+0
|
* Fix typosDan Finlay2016-05-191-2/+2
|
* Finish clean implementation of drop-down menuDan Finlay2016-05-191-50/+55
|
* Add dynamic list item stylesDan Finlay2016-05-191-29/+78
|
* Add animated sandwich buttonDan Finlay2016-05-191-3/+11
|
* ui - redesign - unlock menukumavis2016-05-141-43/+46
|
* ui - redesign - trans group + + account detail + tx list fixeskumavis2016-05-141-1/+2
|
* ui - redesign - remove footerkumavis2016-05-141-22/+32
|
* Fix more transition bugsDan Finlay2016-05-121-6/+3
|
* Vertically center title bar contentDan Finlay2016-05-111-0/+3
|
* ui - redesign - app header + accounts selectionkumavis2016-05-111-14/+20
|
* Fix button width transition bugDan Finlay2016-05-051-1/+2
| | | | Fixes #160
* Show any pending txs when unlockingDan Finlay2016-05-041-2/+17
| | | | Before the unlock action hard-routed to the home route, now it has a condition where it will show pending transactions instead.
* Add UI for Signing MessagesDan Finlay2016-05-041-1/+1
| | | | | | | | | | Calls to `eth.sign` are now transiently persisted in memory, and displayed in a chronological stack with pending transactions (which are still persisted to disk). This allows the user a method to sign/cancel transactions even if they miss the Chrome notification. Improved a lot of the view routing, to avoid cases where routes would show an empty account view, or transition to the accounts list when it shouldn't. Broke the transaction approval view into a couple components so messages and transactions could have their own templates.
* Moved UI into repo with its own dependency stackDan Finlay2016-04-141-0/+242