# This is a combination of 2 commits.

# This is the 1st commit message:

# This is a combination of 4 commits.
# This is the 1st commit message:

# This is a combination of 2 commits.
# This is the 1st commit message:

# This is a combination of 3 commits.
# This is the 1st commit message:

# This is a combination of 3 commits.
# This is the 1st commit message:

# This is a combination of 5 commits.
# This is the 1st commit message:

# This is a combination of 3 commits.
# This is the 1st commit message:

# This is a combination of 2 commits.
# This is the 1st commit message:

# This is a combination of 3 commits.
# This is the 1st commit message:

resolving merge conflicts

# This is the commit message mozilla-lockwise#2:

update to latest package-lock.json after production branch merge

to get the two branches up to date and matching each other

they diverged and production became 95 commits behind and 5 ahead due to rename/delete conflicts and I "took" the conflicting changes from production to the package-lock file, now I want the actual latest result of `npm i`

# This is the commit message mozilla-lockwise#3:

Updating styling of 0 entries (home) page to reflect intended typography and spacing (mozilla-lockwise#607)

- Into image shadow to Shadow 10
- Updated image border
- Defined line height for intro paragraphs
# This is the commit message mozilla-lockwise#2:

Require python 3.6 in deploy stage so pip can install tornado

# This is the commit message mozilla-lockwise#2:

added accessibility test plan to docs

# This is the commit message mozilla-lockwise#3:

Attempt to speed up branch and PR builds with Travis CI caching (mozilla-lockwise#604)

* Speed up branch and PR builds with Travis CI caching
* add pip cache

# This is the commit message mozilla-lockwise#2:

Fix <ItemFilter/> to actually update its state from Redux

# This is the commit message mozilla-lockwise#3:

Fix importing of chai-enzyme in <ButtonStack/> test

# This is the commit message mozilla-lockwise#4:

Automatically select the filter input's text on load (if there is any)

# This is the commit message mozilla-lockwise#5:

Pre-fill the URL of the current tab into the doorhanger's filter

# This is the commit message mozilla-lockwise#2:

Move python runtime for deploy stage out of 'on' requirement

So the pages actually build using python 3.6 instead of just checking to make sure its in the 3.6 runtime

# This is the commit message mozilla-lockwise#3:

Downgrade Travis deploy script to fix pages deploy
See travis-ci/travis-ci#9312

# This is the commit message mozilla-lockwise#2:

Address mozilla-lockwise#570 Post-Merge Code Review Comments (mozilla-lockwise#647)


# This is the commit message mozilla-lockwise#3:

Update pytest from 3.4.1 to 3.4.2
# This is the commit message mozilla-lockwise#2:

changes to metrics

# This is the commit message mozilla-lockwise#2:

Updating entry list items, account dropdown, and quick copy button hover/press/active/focus states due to conflicting grays (mozilla-lockwise#657)

* Styling updates for doorhanger entry list

-Moved styles for list items to .item class in order to propagate to both DH and full view list.
-Increased width of dh to 320 to match designs and sign-in width
-Added new item-list-panel css file to fixed panel header styling specific to that panel
-Added default background for panel header

* Changes based on discussion with Jim and Ryan

-Updating panel width to be 280px for both entry list/details and unlock
-Removing search header specific styling and updating panel default header to match for both entry list and detail
-Removing wrapping toolbar from search in doorhanger
-Updating some sizing for unlock content based on width change of panel

* Updates based on PR review

-Moving focus state for entry items into item-list.css and then removing unnecessary all-items.css file.
-Moving styledItems from all-items.js to item-list.js to effect both instances of entry list
-Bringing back in inline-end border for aside that was mistakenly removed
-Bringing back in 'styled-item' styles that are currently not in use but may be needed in future.

* Updating doorhanger caret color, modifying panel header padding/height, fixing entry focus state, and removing some unnecessary styles.

* Updating hover/active/press/focus states of list items to occur on the item-summary element in order to account for areas where we have quick copy links available.

* Updating some of our hover/press/active/focus states to new blue colors due to conflict with surrounding grays on page

-Updated entry list item colors
-Updated account dropdown colors
-Updated entry item quick copy buttons/all ghost buttons

# This is the commit message mozilla-lockwise#3:

Update flake8-isort from 2.4 to 2.5 (mozilla-lockwise#671)


# This is the commit message mozilla-lockwise#4:

Improve DH integration tests and reorganize test suite (mozilla-lockwise#666)

* update create new entry method and move dh test to logical suite

* move guest mode & fxa tests to new suites

* remedy flake8 linting errors

# This is the commit message mozilla-lockwise#2:

Docs are wrong becuase sync is not currently supported

fixes mozilla-lockwise#670

.travis.yml

@@ -5,6 +5,11 @@ _aliases:
     language: node_js
     node_js: stable
 
+cache:
+  directories:
+    - node_modules
+cache: pip
+
 sudo: required
 jobs:
   include:
@@ -47,8 +52,11 @@ jobs:
     - stage: deploy
       if: branch = master
       <<: *node
+      python: '3.6'
       script: skip
       deploy:
+        edge:
+          branch: v1.8.47
         provider: pages
         on:
           branch: master

docs/accessibility-test-plan.md

@@ -0,0 +1,48 @@
+# Manual Test Plan
+
+## Keyboard Navigation
+_< 3 hours_
+
+Navigate the web content using only the keyboard
+- Tab Order:`TAB`, as well as `SHIFT + TAB`, follows a logical and intuitive order.
+- All controls, links, buttons, etc., get focused.
+- Focus should be visibly apparent.
+- When a modal or pop up window opens, focus shifts to the pop up.
+  - Focus and tab order is constrained within the modal.
+  - Modal can be exited via keyboard.
+  - When a pop up window is closed, focus returns to a logical point.
+- Ensure that all content that is visually hidden is also hidden from the keyboard and/or a screen reader. _Except content specifically for screen reader users._
+- Firefox toolbar icon can be accessed by keyboard and screen reader users.
+
+## Page Structure
+_3 hours_
+- Links and buttons have text that give context.
+- All images contain alt text to describe the purpose or content of the image to a non-sighted user.
+- A logical hierarchy of header tags has been used.
+- [ARIA landmark roles](https://accessibility.oit.ncsu.edu/it-accessibility-at-nc-state/developers/accessibility-handbook/aria-landmarks/) have been utilized where applicable.
+- ARIA attributes have been put into use.
+  - Any custom controls have been given the proper role attribute.
+    - State changes are provided via [ARIA states](http://www.w3.org/TR/wai-aria/states_and_properties#attrs_widgets_header).
+- Form input fields and buttons have been labeled for screen reader users.
+
+## Color
+_< 1 hour_
+- Text has sufficient color contrast against its background.
+  - Contrast ratio of 4.5:1 for normal text (less than 18 point or 14 point bold.)
+  - Contrast ratio of 3:1 for large text (at least 18 point or 14 point bold).
+- Information conveyed via color is also available by other means.
+- Buttons and links are visually apparent when they have focus.
+- Focus remains apparent, and contrast remains sufficient, when simulating varying types of colorblindness.  [Color blind simulators](https://www.toptal.com/designers/colorfilter)
+
+## UX Design Considerations
+- Interactions available with a mouse are also available using a keyboard.
+- Information conveyed visually is also available by other means.
+  - Pop-ups and other state changes are announced to screen readers using appropriate ARIA attributes.
+  - Temporary on-screen events give users ample time to receive conveyed information.
+- Animations are not excessively flashy, as this can cause seizures in some users.
+
+## Tools and Resources
+Use a variety of testing tools to analyze pages:
+- aXe developer tools by Deque
+- Browser developer tools to inspect HTML for logical heading structure and ARIA roles
+- [Color blind simulators](https://www.toptal.com/designers/colorfilter)

docs/faqs.md

@@ -42,7 +42,7 @@ The alpha version of Lockbox hasn’t been tested widely with other password man
 
 ## Do Lockbox entries sync to other computers with Lockbox installed?
 
-Yes, if you secure Lockbox with a Firefox Account.
+No, not currently.
 
 ## Can I try Lockbox if I don’t have a Mozilla.com email address?
 

docs/index.md

@@ -6,10 +6,10 @@
 
 !!! right "Contribute"
     You can also contribute by:
-    
+
     - Developing code
     - Reporting bugs
-    
+
     [Learn how to get started][contribute-link]
 
 The Lockbox extension is a simple, stand-alone password manager that works
@@ -40,6 +40,6 @@ website][website-link] for more documentation and context._
 
 [install-link]: https://testpilot.firefox.com/files/[email protected]/latest
 [faq-link]: /faqs/
-[contribute-link]: /contributing/ 
+[contribute-link]: /contributing/
 [website-link]: https://mozilla-lockbox.github.io/
 [feedback-link]: https://qsurvey.mozilla.com/s3/Lockbox-Input

docs/metrics.md

@@ -94,7 +94,6 @@ Services.telemetry.registerEvents("event_category", {
 
 For our purposes, we will use the `extra` field for a few purposes:
 
-- To log the FxA user id of the client logging the event (e.g. `"fxauid": uid`)
 - To log the UUID of the item that has been added or changed (e.g. `"item_id": UUID`)
 - To log the fields that are modified when an item is updated in the datastore (e.g. `"fields": "password,notes"`  (because the value has to be a string we will have to concat the fields that were updated somehow)
 
@@ -138,7 +137,7 @@ These are the metrics we currently collect regarding the state of user datastore
 
 ## List of Events Currently Recorded
 
-All events are currently implemented under the **category: lockboxV0**. The `extra` field always contains `fxauid` where possible (i.e. after FxA auth). For events pertaining to a particular Lockbox item, `itemid` is also included. They are listed and grouped together based on the contents of the event's `method` field.
+All events are currently implemented under the **category: lockboxV2**. The `extra` field contains `itemid` for events pertaining to a particular Lockbox item. They are listed and grouped together below based on the contents of the event's `method` field.
 
 1. `startup` fires when the webextension is loaded. **objects**: webextension. Note that this event fires whenever the browser is started, so is not indicative of direct user interaction with Lockbox.
 

docs/release-notes.md

@@ -1,15 +1,45 @@
 # Lockbox Release Notes
 
+## 0.1.8-alpha
+
+_Date: 2018-03-08_
+
+### What's New
+
+- Added support For Telemetry Scalars so we can easily tell how many items are stored in your Lockbox datastore ([#552](https://github.com/mozilla-lockbox/lockbox-extension/pull/552))
+- Made it so the search box is automatically focused so you can start typing to search your entries immediately ([#573](https://github.com/mozilla-lockbox/lockbox-extension/issues/573))
+- The doorhanger also automatically fills the search with the domain of the current page you're viewing to help you quickly see matching entries ([#616](https://github.com/mozilla-lockbox/lockbox-extension/pull/616))
+- Improved contrast and colors of the entry list for accessibility ([#560](https://github.com/mozilla-lockbox/lockbox-extension/pull/560))
+- Improved interface colors and styles for entry list items ([#553](https://github.com/mozilla-lockbox/lockbox-extension/pull/553))
+- Improved search bar interface style with a simpler "Clear" button ([#562](https://github.com/mozilla-lockbox/lockbox-extension/pull/562))
+- Re-ordered the create/edit entry interface with improved spacing and styles ([#567](https://github.com/mozilla-lockbox/lockbox-extension/pull/567))
+
+### What's Fixed
+
+- Item notes with line breaks properly show those separate lines when editing ([#596](https://github.com/mozilla-lockbox/lockbox-extension/pull/596))
+- The "reset Lockbox" settings interface fits better in about:addons ([#603](https://github.com/mozilla-lockbox/lockbox-extension/pull/603))
+- Fixed alignment on the entry detail view so the buttons don't jump when switching between edit and view modes ([#608](https://github.com/mozilla-lockbox/lockbox-extension/pull/608))
+
+### Known Issues
+
+* Profile information about you is only fetched and updated when you sign in; any changes made to your Firefox Accounts display name or avatar will not be displayed in Lockbox until you sign in again.
+* Once you link a Firefox Account to Lockbox, you cannot unlink it from that account.
+* Once you link a Firefox Account to Lockbox, signing in with a different account can render Lockbox unusable until you quit and restart Firefox.
+* Once you link a Firefox Account to Lockbox, resetting your Firefox Account password through "forgot your password" will render all your logins inaccessible; the only recourse is to reset Lockbox and start over.
+* Firefox's default prompt to save logins is only disabled on new installs of this extension; updating Lockbox will not change your current Firefox preferences.
+
 ## 0.1.7-alpha1
 
-_Dtae: 2018-02-23_
+_Date: 2018-02-23_
 
 This release is to address a critical defect from the previous release.
 
 ### What's Fixed
 
 * If you linked your Firefox Account, Lockbox would stop working when you restart Firefox ([#568](https://github.com/mozilla-lockbox/lockbox-extension/issues/568))
 
+### Known Issues
+
 * Profile information about you is only fetched and updated when you sign in; any changes made to your Firefox Accounts display name or avatar will not be displayed in Lockbox until you sign in again.
 * Once you link a Firefox Account to Lockbox, you cannot unlink it from that account.
 * Once you link a Firefox Account to Lockbox, signing in with a different account can render Lockbox unusable until you quit and restart Firefox.
@@ -27,7 +57,7 @@ _Date: 2018-02-22_
 
 ### What's Fixed
 
-* If you use Lockbox in "Guest" mode (not linked to a Firefox Account), it can be unusable when Firefox is next restarted ([#542](https://github.com/mozilla-lockbox/lockbox-extension/issues/542)) 
+* If you use Lockbox in "Guest" mode (not linked to a Firefox Account), it can be unusable when Firefox is next restarted ([#542](https://github.com/mozilla-lockbox/lockbox-extension/issues/542))
 * Via Greenkeeper:
     * Updated `events` dependency ([#509](https://github.com/mozilla-lockbox/lockbox-extension/pull/509))
     * Updated `babel-minify-webpack-plugin` dependency ([#525](https://github.com/mozilla-lockbox/lockbox-extension/pull/525))