Gaia/UX Branch/Maintenance

Commits Merged into UX Branch

Reverse-chronological.

• 2012-12-04 (2012-12-04-mozilla-sf)
  • bug-802782 <https://github.com/gordonbrander/gaia/commit/b400577ed1005cba4f954fa8251336f2e90fadf3> Update camera icons
  • bug-814688 <https://github.com/gordonbrander/gaia/commit/4e4c25b36eed2138ec5e6076d356e0ba653fda3e> Update calendar icons
  • bug-806963 <https://github.com/gordonbrander/gaia/commit/6e0a20e56fb25a11abb8ea3e954f8fcf0f91bd97> Bug806963_Updates_Incorrect_Design

• 2012-12-03 (2012-12-03-mozilla-sf)
  • bug-817117 <https://github.com/gordonbrander/gaia/commit/2a3b402d15bcd6c39fbd6f6b41e1f22d8bd36162>
  • bug-813605 <https://github.com/gordonbrander/gaia/pull/35/files> Notification usability/font/sound
  • bug-813091 <https://github.com/gordonbrander/gaia/pull/38> dialer iconography
  • bug-811640 <https://github.com/gordonbrander/gaia/commit/d03692c11d5642b968655fb6614d9bb4d019990a> [KEYBOARD] Long press on 0 or p or }, the keyboard would shift left a little bit
  • bug-802747 <https://github.com/gordonbrander/gaia/pull/36> gallery icon updates. Verified file names.
  • bug-813275 <https://github.com/gordonbrander/gaia/pull/37> Browser Font Tweaks

• 2012-11-30 (2012-11-30-madrid-onsite)
  • bug-814753 <https://github.com/gordonbrander/gaia/commit/7eae08c77986d97c6a38c79bf71646ebd6c225aa> <https://github.com/gordonbrander/gaia/commit/6df8fa7b7cd66181d081a0211eea724f808d34fb> [status bar] Update Status bar Icons
  • bug-802935, bug-806972, bug-806974 - <https://github.com/gordonbrander/gaia/pull/30> <https://github.com/gordonbrander/gaia/commit/6854fc1720c09b33fecda6629975936b6cbc0688>
  • bug-813140 - <https://github.com/gordonbrander/gaia/pull/31> <https://github.com/gordonbrander/gaia/commit/e9f8085a01fd40c3bf6f68ba534052992910f584> Contacts iconography fix. I had to patch this one in because of commit history.

• 2012-11-29 (2012-11-29-madrid-onsite)
  • bug-802648 - <https://github.com/gordonbrander/gaia/pull/23> update browser icons
  • bug-814390 - <https://github.com/gordonbrander/gaia/pull/26> fix purple highlight for settings

• 2012-11-27 (2012-11-27-madrid-onsite)
  • bug-813703 - <https://github.com/gordonbrander/gaia/pull/17> FM Radio font changes
  • REVERTED bug-813275 - <https://github.com/gordonbrander/gaia/pull/18> Browser font changes

• 2012-11-22 (2012-11-22-mozilla-paris)
  • bug-813603 - <https://github.com/gordonbrander/gaia/commit/8465ef3e65870f4a2ea79bf162905cedb115c6d5> Shared header font size tweaks.
  • bug-813560 - <https://github.com/gordonbrander/gaia/commit/0dd64b35281d893ae22eb2a092decad7295957a4> Bug813560_Settings_Font_Tweaks
  • bug-808676 - <https://github.com/gordonbrander/gaia/commit/8bfb812be56e19f79062264b8659bdba9e1da103>

• 2012-11-16 (2012-11-16-mozilla)
  • bug-805129 - Browser toolbar fix https://github.com/gordonbrander/gaia/commit/6ff5ae8111812f4715dd7ebc53df04f123402c9b

• 2012-11-13 (2012-11-13-mozilla)
  • bug-809611 - Keyboard highlights: <https://github.com/gordonbrander/gaia/commit/5f41767e48c3222188546dfb5a6c2b925bd71848>

• 2012-11-09 (2012-11-09-mozilla)
  • bug-809294: <https://github.com/gordonbrander/gaia/commit/dc21da3db0c4751af1612b7301d25194f081ab2c> FM Radio Dial garbage commit (fixed in master)

• 2012-11-06 (2012-11-06-mozilla)
  • bug-809294: FM Radio Dial (fixed in master) <https://github.com/gordonbrander/gaia/commit/bc5ff642fa2af28a58a9cfa64e6f6b3886fb61d0>

• 2012-11-05 (2012-11-05-mozilla)
  • bug-808761: <https://github.com/gordonbrander/gaia/commit/19259084ee4d340ffac58d74f180e0d505e406dd>

Pull Requests

Merged with master:

• ux-2012-11-29-cherry-picked
• ux-2012-11-22-cherry-picked

Process

• Update UX Branch Daily
• Review pull requests 2-3 times a week

 * Open bug in Bugzilla
 * Tag bug with uxbranch (if it doesn't have the tag already)
 * Review patch, understand risk-level of patch
 * Apply patch locally and test on-device
 * If all is OK, merge pull request.
 * Only one commit per fix! Make sure commit has bug # and details. If necessary, apply as patch and fix commit message.

• Create a pull request for qa-verified bugs every week.

 * Cherry pick [commits verified by QA and merged into UX, but not yet in master][prcommits].
 * Issue pull request.

Good news: cherry pick should fail noisily if it can't merge properly.

Note: you can get the original commit for a merge by clicking on the right-hand parent commit.

Patching

To keep commit history clean, sometimes using git patch instead of pull requests.

When patching, use this format:

   Bug 123456 - Apply patch from f4fdd305b24ac62248f28ee7cebde966f4f3d804
   
   From f4fdd305b24ac62248f28ee7cebde966f4f3d804 Mon Sep 17 00:00:00 2001
   From: Joe Schmo <jschmo@hotmail.com>
   Date: Thu, 29 Nov 2012 12:45:52 -0500
   Subject: [PATCH] Bug 813140 - Contacts iconography fix for contact
   details screen
   
   Bug 813140 - Contacts iconography fix for contact details screen
   
   This change fixes Bug 813140: [Gaia::Contacts] Contact Details page not
   using the latest iconography from Visual Design.

• Status Whiteboard: uxbranch all bugs targeted for, or merged into UX Branch
• Status Whiteboard: uxbranch, qa-verified all UX branch bugs that have been verified by QA
• Status Whiteboard: landed in uxbranch all bugs landed in UX Branch
• Status Whiteboard: uxbranch AND NOT qa-verified everything yet to be verified by QA
• Status Whiteboard: landed in uxbranch, qa-verified AND open candidates for merge with master