Commit Graph

161606 Commits

Author SHA1 Message Date
Wes Kocher
69cc713277 Backed out changeset 4330724d9e05 (bug 940811) for breaking builds 2013-12-19 19:46:54 -08:00
Wes Kocher
9cc0508903 Backed out changeset 2e2c930a960c (bug 948269) for android 4.0 mochitest-2 permaorange 2013-12-19 19:24:42 -08:00
Wes Kocher
c70bd755f2 Backed out changeset 1035869d1819 (bug 950452) for jit-test failures 2013-12-19 19:19:23 -08:00
Wes Kocher
f8ab24ed0d Merge fx-team to m-c 2013-12-19 19:09:04 -08:00
Yuan Xulei
8cb085fc4e Bug 932145 - Mochitest support for Keyboard/IME API. r=fabrice 2013-12-20 11:05:52 +08:00
Wes Kocher
8572872387 Merge inbound to m-c 2013-12-19 18:58:45 -08:00
Gaia Pushbot
058af2d901 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/958f5e5dff3d
Author: dwi2 <dwi2@dwi2.com>
Desc: Merge pull request #14797 from dwi2/bug937561

Bug 937561 - get both available network list and known network list, and...

========

https://hg.mozilla.org/integration/gaia-central/rev/19311815168b
Author: tzhuang <tzhuang@mozilla.com>
Desc: Bug 937561 - get both available network list and known network list, and make union of them to present to settings app
2013-12-19 18:50:23 -08:00
Nicholas Nethercote
df4c101fc9 Bug 631842 (part 2b) - Fix a mis-handling of platform-specific suppression files in |mach valgrind-test|. r=me.
--HG--
extra : rebase_source : 7a8a33d9db10ed47cf273358d99b6da874b48137
2013-12-19 17:33:34 -08:00
Wes Kocher
d7209932b9 Merge b2g-inbound to m-c 2013-12-19 17:34:10 -08:00
Jonathan Griffin
d33ef3f75a Bug 951895 - Hook up SpecialPowers messagemanager correctly for B2G, r=ahal 2013-12-19 17:04:20 -08:00
Gaia Pushbot
557e3cb938 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1ec948d93704
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #14903 from cctuan/952497

Bug 952497 - getPid in the rewritten install-gaia.js writes to a constant file name

========

https://hg.mozilla.org/integration/gaia-central/rev/a63a9d5734bc
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 952497 - getPid in the rewritten install-gaia.js writes to a constant file name
2013-12-20 12:57:28 -08:00
Gaia Pushbot
d7217b7b18 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/cd3fccdb793b
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #14905 from gaye/bug-952553

Revert "Merge pull request #14659 from gasolin/issue-950080"

========

https://hg.mozilla.org/integration/gaia-central/rev/575982414753
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Merge pull request #14659 from gasolin/issue-950080"

This reverts commit 5028d298c3be4effa75147703b3148883982038e, reversing
changes made to 0ef52554acf8cc115e40a95b2eab0117df3dff45.
2013-12-20 12:57:05 -08:00
Gaia Pushbot
c048d8dd91 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0be4f9d5fa72
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #14854 from KevinGrandon/bug_952097_rocketbar_add_cancel_button

Bug 952097 - [Rocketbar] Add cancel button r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/043210e5adeb
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 952097 - [Rocketbar] Add cancel button r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/1625ccbbd682
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #14506 from gnarf/941976

Bug 941976 - [B2G][SMS] SMS messages with more than one phone number are treated as a single phone number

========

https://hg.mozilla.org/integration/gaia-central/rev/eec7207b4eab
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 941976 - [B2G][SMS] SMS messages with more than one phone number are treated as a single phone number - r=julienw
2013-12-19 15:50:24 -08:00
Gaia Pushbot
64788ab54e Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fa9644133018
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #14784 from nullaus/bug949286-net-error

bug 949286

========

https://hg.mozilla.org/integration/gaia-central/rev/56dea66daf4f
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 949286

-Handle dnsNotFound as well as netOffline errors in net_error.html/.js.
2013-12-19 15:40:25 -08:00
Jeff Walden
d3adf97e4c Update debugger tests for new JSON.parse syntax error message format. Followup to bug 507998, r=yetmoreorangesigh
--HG--
extra : rebase_source : 9e4009922085b67d2ca7f8e92c7ec269c7446924
2013-12-19 18:26:26 -05:00
Richard Newman
dd1735a6a3 Merge m-c to s-c. 2013-12-19 15:23:37 -08:00
Masayuki Nakano
7a9446edee Bug 950564 ComplexTextInputPanel should be positioned to bottom-left of the focused plugin feedback=emk, r=smichaud 2013-12-20 08:19:17 +09:00
Gaia Pushbot
f8a71ca7e7 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a8dd09a5d33e
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #14858 from vingtetun/bug951298

Bug 951298 - placing 5 icons in the dock and then going in and out of ed...

========

https://hg.mozilla.org/integration/gaia-central/rev/bf9c38e98f08
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 951298 - placing 5 icons in the dock and then going in and out of edit mode on the homescreen will chop the 5th icon. r=crdlc
2013-12-19 15:00:25 -08:00
Erik Vold
f17ebdaf24 Bug 947501 - Uplift Addon SDK to Firefox 2013-12-19 14:50:18 -08:00
Margaret Leibovic
f00554bdfa Bug 862805 - API to allow add-ons to register custom lists on about:home. r=wesj 2013-12-19 14:51:10 -08:00
Margaret Leibovic
5c02e88abb Bug 941318 - Tests for HomeListsProvider. r=wesj 2013-12-19 14:51:09 -08:00
Margaret Leibovic
a7d8706c72 Bug 941318 - Create content provider to store home lists data. r=wesj 2013-12-19 14:51:09 -08:00
Brad Lassey
7660bbfd17 Backed out changeset 93d8c8703f4d 2013-12-19 17:49:05 -05:00
Gaia Pushbot
c0e68705bb 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
56c5b66223 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
ae0ab278f4 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
51056b083c 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
90d4d0b764 Bug 947772 - Follow-up: fix sneaky test (disabled on some platforms). r=me 2013-12-19 11:48:23 -08:00
Gaia Pushbot
498bdda420 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
Tim Taubert
4be4a6b411 merge m-c to elm 2013-12-19 15:52:32 +01:00
Carsten "Tomcat" Book
86a8ff528e merge fx-team to mozilla-central 2013-12-19 10:33:37 +01:00
Carsten "Tomcat" Book
d1e948dce1 merge mozilla-inbound to mozilla-central 2013-12-19 10:28:37 +01:00
Richard Newman
f54050893e Merge m-c to s-c. 2013-12-18 21:47:50 -08:00
Richard Newman
6244e79e8b Bug 947772 - Sync adds tracker observers regardless of engine enabled state. r=gps 2013-12-18 21:42:17 -08:00
Mark Hammond
86a705e741 dump JSON.stringified error on HAWK.signCertificate error 2013-12-19 16:38:35 +11:00
Mark Hammond
96724917cd Have the sync setup dialog do the right thing if identity.fxaccounts.enabled=true 2013-12-19 16:38:35 +11:00
Mark Hammond
160f195539 put sync identity initialization behind a pref 2013-12-19 16:38:35 +11:00
Chris Peterson
d8217096a5 Bug 951547 - Assert that nsSMILTimedElement::SampleFillValue() is not called in STATE_STARTUP. r=dholbert 2013-12-18 21:08:03 -08:00
Nathan Froyd
1eb0505bb2 Backout ca927541e644:885c09371fe5 (bug 888685), because green builds are more Christmas-y than red builds 2013-12-22 12:56:39 -05:00
David Zbarsky
cd840d8e80 Bug 888685: SVGPointList doesn't need to inherit nsISupports r=bz 2013-12-22 11:37:28 -05:00
David Zbarsky
b2464ee079 Bug 888685: SVGPathSegList doesn't need to inherit nsISupports r=bz 2013-12-22 11:37:18 -05:00
David Zbarsky
dcbcea3408 Bug 888685: SVGTransformList doesn't need to inherit nsISupports r=bz 2013-12-22 11:37:07 -05:00
David Zbarsky
da89e2edb6 Bug 888685: SVGStringList doesn't need to inherit nsISupports r=bz 2013-12-22 11:36:55 -05:00
Andrew McCreight
36ba686d29 Bug 937960, part 5 - Add pref to activate ICC. r=smaug 2013-12-22 10:14:36 -05:00
Andrew McCreight
01752de733 Bug 937960, part 4 - Reduce time until CC when it is incremental. r=smaug 2013-12-22 09:58:20 -05:00
Andrew McCreight
f83384339e Bug 937960, part 3 - Pass in a small time budget with ICC. r=smaug 2013-12-22 09:58:19 -05:00
Brian Smith
e3fcf76058 Bug 898431: Update NSS to NSS 3.15.4 beta 10 (NSS_3_15_4_BETA10), r=me 2013-12-21 23:15:41 -08:00
Wes Kocher
d839f4b6fc Merge m-c to inbound 2013-12-21 21:25:25 -08:00
Cameron McCormack
b17eca87e8 Bug 952338 - Temporarily avoid passing in sheet to ParsePropertyWithVariableReferences to avoid a crash. rs=sfink 2013-12-22 15:00:08 +11:00
Wes Kocher
27882a0c96 Merge inbound to m-c 2013-12-18 20:49:25 -08:00