Commit Graph

338502 Commits

Author SHA1 Message Date
Wes Kocher
db15b39861 Merge b2g-inbound to m-c 2013-12-19 17:34:10 -08:00
Richard Newman
4f541a11b7 Merge m-c to s-c. 2013-12-19 15:23:37 -08:00
Gaia Pushbot
f2ac3eca2c Bumping gaia.json for 14 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c8f56fb9f988
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 950914 - [Messages][Drafts] Replace existing draft when hiding app while showing unsent, existing draft content

========

https://hg.mozilla.org/integration/gaia-central/rev/d7ad364d6bc7
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 943395 - [Messages][Drafts] Replace existing Draft layer needed when replacing draft

========

https://hg.mozilla.org/integration/gaia-central/rev/76fdef6bd081
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 947211 - [Messages][Drafts] Thread message/draft status (preview, styling and icon) is not accurate for various cases r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=947211
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/1779875de904
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 917639 r=julienw

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/4b8b74f147e3
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 949524 - [Messages][Drafts] TypeError: record/draft.content.find is not a function r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=949524

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/112567463dcc
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 949140 - [Messages][Drafts] Thread list doesn't discard new draft thread that is discarded via menu

========

https://hg.mozilla.org/integration/gaia-central/rev/69f300d0e26b
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 949137 - [Messages][Drafts] Composer doesn't clear after sending a new draft r=rwaldron

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/e3ab3fe0a372
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 947215 - [Messages][Drafts] Do not try to match an existing thread when saving a threadless draft r=rwaldron

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/41e19646ad57
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 946989 - [Messages][Drafts] Duplicate threadless drafts get saved r=rwaldron

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/c672f0347c25
Author: Adam Hyland <protonk@gmail.com>
Desc: Bug 946995 - [Messages][Drafts] MMS Drafts don't restore correctly after app closes/restarts r=rwaldron

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/fa0437fc000f
Author: Adam Hyland <protonk@gmail.com>
Desc: Bug 936648 - [Messages][Drafts] Draft display and interaction within a thread r=rwaldron

========

https://hg.mozilla.org/integration/gaia-central/rev/67b009977bc7
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 936647 - [Messages][Drafts] Preview drafts threads in thread list r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=936647

- index.html:
  - messages-thread-tmpl
    - Adds "icon-draft" class to "icon icon-read" classes
    - Adds data-l10n-id="no-receipient"
    - Adds data-list=draft|thread

- js/desktop-only/mobilemessage.js
  - Updates Draft bootstrapping data

- js/drafts.js
  - Adds read-once and cache to Drafts.request
  - Adds unique id mechanism
  - Updates Drafts.delete to allow deleting all drafts for a threadId
  - Renames Drafts.byId => Drafts.byThreadId
  - Adds Drafts.get(draftId)
  - Updates Drafts.request to abide a local isCached flag.
    - Only load from storage when isCached is false.
  - Updates Drafts.request to revive stored Draft objects as actual Draft objects
  - Adds Draft.List.prototype.latest that points at the latest draft in a Draft.List (ie. for a specified threadId or null key)
  - Adds function guid for creating quasi-unique ids

- js/message_manager.js
  - Adds `draft` property to hold draft object to coordinate with New Message view
  - Calls Drafts.request() from init
  - Calls ThreadListUI.renderDrafts() from onHashChange when hash = #thread-list

- js/thread_list_ui.js
  - Wraps contents in IIFE
  - Adds draftLinks property to map DOM nodes to draftId
  - Updates setContact to include lookup from draft
  - Updates handleEvent to capture draft object on click. Stops looking at 'threads-container'
  - Updates delete to create two lists of deletable items from the selectedInputs array. List is determined by data-list property value.
    - Drafts are deleted similarly to Threads, but will exit immediately if no Threads are to be deleted
    - Drafts.store() is called upon completing delete operation
  - Adds ThreadListUI.renderDrafts to create "Thread List Items" from Draft objects that do not have their own thread
  - Calls ThreadListUI.renderDrafts from ThreadListUI.renderThreads
  - Updates ThreadListUI.createThread to create a "Thread List Item" from a Draft object, or to mark a Thread that has a draft.
  - Updates rendered markup for "Thread List Item"
  - Updates timestamp handling in ThreadListUI.appendThread

- js/thread_ui.js
  - Updates ThreadUI.saveMessageDraft new or replacement drafts

- js/threads.js
  - Expose Thread constructor
  - Adds Thread.prototype.drafts accessor to Drafts.byThreadId(this.id);
  - Adds Thread.prototype.hasDrafts accessor as short hand

- Adds tests to:
  - test/unit/compose_test.js
  - test/unit/drafts_test.js
  - test/unit/media/pixel.jpg
  - test/unit/message_manager_test.js
  - test/unit/mock_async_storage.js
  - test/unit/mock_drafts.js
  - test/unit/mock_navigatormoz_sms.js
  - test/unit/thread_list_ui_test.js
  - test/unit/thread_ui_test.js
  - test/unit/threads_test.js

- Passing both lint and hint

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/a0f8e3d0efc0
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 936641 - [Messages][Drafts] Create message drafts upon user interaction

========

https://hg.mozilla.org/integration/gaia-central/rev/bb759ce17d5a
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 935177 - [Messages][Drafts] Update "discard message" confirmation prompt to options menu/dialog; add "save draft" no-op r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=935177

- New strings:
  - save-as-draft      = Save as Draft
  - discard-message = Discard
- Removes window.confirm mechanism
- Implements Multi-option prompt with OptionMenu
- Basic tests to assert the correct operations are performed by the option handlers

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-12-19 13:57:26 -08:00
Gaia Pushbot
e690bf6459 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3fb358a794fd
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #14725 from mcav/fix-pop3-header

Bug 950200 - [Email][V1.3][POP3] Please change the "SettingS" of POP3 configuration page to "Settings"

========

https://hg.mozilla.org/integration/gaia-central/rev/bb8c822e483f
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 950200 - [Email][V1.3][POP3] Please change the "SettingS" of POP3 configuration page to "Settings"
2013-12-19 13:05:24 -08:00
Gaia Pushbot
be6004cbfb Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6d1addb30556
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #14860 from gaye/bug-952168

Bug 952168 - Edges gestures tests are failing on TBPL

========

https://hg.mozilla.org/integration/gaia-central/rev/9ec730114e20
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 952168 - Edges gestures tests are failing on TBPL
2013-12-19 12:31:24 -08:00
Gaia Pushbot
9d8e5b6035 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6cbf012fc0dc
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #14862 from KevinGrandon/rocketbar_disable_failing_test

Bug 946452 - Disable rocketbar failing tests r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/7792734c96f2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 946452 - Disable rocketbar failing tests r=me
2013-12-19 11:50:35 -08:00
Richard Newman
d180512a8d Bug 947772 - Follow-up: fix sneaky test (disabled on some platforms). r=me 2013-12-19 11:48:23 -08:00
Gaia Pushbot
ea7579cc75 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/af35006eefb4
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #14756 from julienw/936369-fix-keyboard-manager

Bug 936369 - [system] Intermittent Travis Unit Test Failure: KeyboardMan...

========

https://hg.mozilla.org/integration/gaia-central/rev/1b2c85cee3bc
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 936369 - [system] Intermittent Travis Unit Test Failure: KeyboardManager Transitions Call showKeyboard against visible keyboard: Error: timeout of 2000ms exceeded r=janjongboom

LOOK MA NO INTERMITTENT!
2013-12-19 10:10:23 -08:00
Richard Newman
96916f8947 Merge m-c to s-c. 2013-12-18 21:47:50 -08:00
Richard Newman
ea1673f1c8 Bug 947772 - Sync adds tracker observers regardless of engine enabled state. r=gps 2013-12-18 21:42:17 -08:00
Wes Kocher
a824197342 Merge inbound to m-c 2013-12-18 20:49:25 -08:00
Ryan VanderMeulen
ac142bdc44 Merge b2g-inbound to m-c. 2013-12-18 21:27:05 -05:00
Ryan VanderMeulen
d0e2988561 Merge fx-team to m-c. 2013-12-18 21:19:33 -05:00
Nicholas Nethercote
cb93cef678 Bug 631842 (part 2) - Implement |mach valgrind-test|. r=gps. 2013-12-18 17:36:08 -08:00
Ryan VanderMeulen
001213198b Backed out changesets 58db1fb509be and 7301ccf7e0be (bug 947391) for Android xpcshell orange. 2013-12-18 19:41:29 -05:00
Ryan VanderMeulen
ebcd5b6587 Backed out changeset 11751c0efe27 (bug 951439) for mass bustage. 2013-12-18 19:39:33 -05:00
Vivien Nicolas
d04b655956 Bug 951321 - [B2G][Messages] Create New Message button gets selected but does not open New Message page. r=kats 2013-12-19 01:12:47 +01:00
Vivien Nicolas
6736a079bc Bug 951290 - [B2G] [Browser] The first swipe after zooming has no effect. r=kats 2013-12-19 01:12:47 +01:00
Vivien Nicolas
765b279eed Bug 950489 - While changing the range of an input type range the page is moving as well. r=kats 2013-12-19 01:12:47 +01:00
Nick Fitzgerald
d1c69daf69 Bug 929349 - Integrate a tracing debugger into our existing debugger; r=vporof,past 2013-12-18 14:17:27 -08:00
Mike Conley
80482f6b66 Bug 951747 - [Australis] Add simple measurement to BrowserUITelemetry for toolbar contents. r=jaws. 2013-12-18 16:54:59 -05:00
Gaia Pushbot
047d212f08 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c6aeaa41977d
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14750 from jmcanterafonseca/fix_export_alpha_scroll

Bug 951107 - alpha scroll in export contacts screen is broken

========

https://hg.mozilla.org/integration/gaia-central/rev/89986d9dfd30
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 951107 - alpha scroll in export contacts screen is broken
2013-12-18 13:50:32 -08:00
Nicholas Nethercote
af4eec9820 Bug 631842 (part 1) - Clone the PGO profile test script and data for use in the Valgrind test. r=ted.
--HG--
rename : build/pgo/profileserver.py => build/valgrind/valgrind_test.py
extra : rebase_source : bef17f3e49e9e94883897dfb75a986cb10dc6105
2013-12-18 13:42:14 -08:00
Bill McCloskey
41fe6e9a08 Bug 952183 - reuseGlobal doesn't account for scripts being recycled (r=mrbkap,khuey) 2013-12-19 12:49:52 -08:00
Carsten "Tomcat" Book
093597e577 merge fx-team to mozilla-central 2013-12-19 10:33:37 +01:00
Carsten "Tomcat" Book
bdd365c1f1 merge mozilla-inbound to mozilla-central 2013-12-19 10:28:37 +01:00
Gaia Pushbot
4ce9cbc19d Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3468c6bb02a7
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #14818 from pivanov/bug-951823

Bug 951823 - [BB]Headers - option to use nested and combine skins for Headers and other [BB]

========

https://hg.mozilla.org/integration/gaia-central/rev/1bc11e04a39a
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 951823 - [BB]Headers - option to use nested and combine skins for Headers and other [BB]

========

https://hg.mozilla.org/integration/gaia-central/rev/dd3d7f08781e
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #14666 from pivanov/bug-950103

Bug 950103 - [Settings] Update wifi sprite

========

https://hg.mozilla.org/integration/gaia-central/rev/ba2b63ca4197
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 950103 - [Settings] Update wifi sprite
2013-12-18 13:25:24 -08:00
Gaia Pushbot
a9575f8a9f Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a1b136d75c16
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #14103 from mikehenrty/bug-926347-dualsim2

Bug 926347 dualsim2

========

https://hg.mozilla.org/integration/gaia-central/rev/696edbb9a855
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 926347 - updating SIM unlocking in FTU to include dual-sim and SIM info screen
2013-12-18 13:15:25 -08:00
Gaia Pushbot
c4c6aa1864 Bumping gaia.json for 6 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c2d1f4f385a2
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14794 from jmcanterafonseca/fix_import_click

Bug 946796 - Import list only honors the :active state the first time a ...

========

https://hg.mozilla.org/integration/gaia-central/rev/e41956b732ab
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 946796 - Import list only honors the :active state the first time a contact is clicked.

========

https://hg.mozilla.org/integration/gaia-central/rev/9bfa627fed60
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14800 from jmcanterafonseca/fix_active_dup_list

Bug 951562 - Enable active state for the items in the duplicate contacts...

========

https://hg.mozilla.org/integration/gaia-central/rev/337da211fe17
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 951562 - Enable active state for the items in the duplicate contacts list

========

https://hg.mozilla.org/integration/gaia-central/rev/cf3d97d7264f
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14804 from jmcanterafonseca/fix_cookie_contacts

Bug 949688 - contacts app does not persist any cookie config settings to...

========

https://hg.mozilla.org/integration/gaia-central/rev/e2dc689dbd90
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 949688 - contacts app does not persist any cookie config settings to file system
2013-12-18 12:35:23 -08:00
Margaret Leibovic
6df95c0a76 Bug 951605 - Fix identified/verified image reversal. r=mfinkle 2013-12-18 11:39:18 -08:00
Margaret Leibovic
14305584be Bug 948894 - Fix typos. r=me 2013-12-18 13:52:21 -08:00
Richard Newman
22101601a0 Bug 949775 - UITelemetry should drop events on the floor if telemetry is disabled. r=mfinkle 2013-12-18 11:37:49 -08:00
Richard Newman
fd1ffbf305 Bug 938153 - Selectively display the globe favicon placeholder when favicon fetches take long enough to be noticeable. r=mfinkle 2013-12-18 11:37:41 -08:00
Sriram Ramasubramanian
5d5904e3c9 Bug 940997: Remove icons from main menu. [r=mfinkle] 2013-12-18 18:49:53 -08:00
Sriram Ramasubramanian
7b69586592 Bug 940997: Support showAsAction "ifRoom" in custom menu. [r=mfinkle] 2013-12-18 18:49:48 -08:00
Sriram Ramasubramanian
5ddba12a47 Bug 940997: Reorganize primary controls in main menu. [r=mfinkle] 2013-12-18 18:46:42 -08:00
Ryan VanderMeulen
e0b70558c2 Merge m-c to fx-team. 2013-12-18 21:29:09 -05:00
Ryan VanderMeulen
23af4a1d4d Backed out changeset be2eafebfb4d (bug 935815) for mochitest-bc orange.
CLOSED TREE
2013-12-18 20:37:30 -05:00
Ryan VanderMeulen
1c7789af0a Backed out changesets 72a80fc289f2, 30258cd308b5, and c572890f16a2 (bug 910189) for robocop orange. 2013-12-18 20:37:16 -05:00
Ryan VanderMeulen
4b42450d1d Backed out changeset aad5b9304896 (bug 951453) for Gaia UI test perma-fail. 2013-12-18 14:20:09 -05:00
Gregory Szorc
8b8a51e87e NO BUG - Change Sphinx path for build system docs to work around a silly URL firewall
--HG--
extra : rebase_source : cb010c0986603c83d47912876ee401027eea4771
2013-12-18 11:15:45 -08:00
Gaia Pushbot
def10eec83 Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8227bc1f33b0
Author: Ben Kelly <ben@wanderview.com>
Desc: Revert "Merge pull request #14589 from rnowm/settings-icons"

This reverts commit 16f95c8500a9f8eb793aa3501871edd292cd7968, reversing
changes made to 4adbbdc32ad62b7fba838d9beeaad3cff7f96651.

========

https://hg.mozilla.org/integration/gaia-central/rev/dfb4f3f2f8ac
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #14810 from etiennesegonzac/bug-946316-mochitest

Bug 946316 - Adding data store access to the mochitest app. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/f6b03eaa4eda
Author: Andrea Marchesini <amarchesini@mozilla.com>
Desc: Bug 946316 - Adding data store access to the mochitest app. r=etienne
2013-12-18 10:35:32 -08:00
Daniel Holbert
2e5284f31f Bug 946835 part 5: Add reftest for finding baseline of multi-line flex container, with baseline-aligned items on first line and flex-wrap:wrap-reverse. r=mats
--HG--
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-3-ref.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-4-ref.html
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-3.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-4.html
2013-12-18 10:34:48 -08:00
Daniel Holbert
8d8da19952 Bug 946835 part 4: Add reftest for finding baseline of multi-line flex container, with baseline-aligned items on first line and flex-wrap:wrap. r=mats 2013-12-18 10:34:47 -08:00
Daniel Holbert
c63a12abc0 Bug 934123: When measuring flex items, pass the same flags into ReflowChild and FinishReflowChild. r=mats 2013-12-18 10:34:46 -08:00
Dave Hunt
a5296ac30b Bug 867600 - Change hardcoded sleeps into waits. r=mdas 2013-12-18 17:30:25 +00:00
Malini Das
71181ecb72 Bug 867600 - Change hardcoded sleeps into webdriver waits, r=davehunt 2013-12-18 13:28:17 -05:00
Dave Hunt
85fb88774b Bug 947205 - fix missing test durations from the HTML report, r=mdas 2013-12-18 13:25:38 -05:00
L. David Baron
0028f18972 Bug 951765: Make CSS variables reftests point to TR draft rather than dev.w3.org draft so the CSS WG test system understands them. No review. 2013-12-18 13:24:04 -05:00
Christian Holler
b5eeb3ac87 Bug 950658 - Clear pending exception in HeapTypeSetKey::instantiate on OOM. r=bhackett
--HG--
extra : rebase_source : e9856f17b41b3763794fbc352d0aa140c0629b77
2013-12-18 14:38:04 +01:00