Commit Graph

325915 Commits

Author SHA1 Message Date
Michael Comella
1c347f4d25 Bug 920225 - Correct FHR manifest comments. r=rnewman 2013-09-25 15:31:47 -07:00
Matt Brubeck
5ba8170923 Bug 900072 - Work around line wrapping bugs in flyoutpanels [r=sfoster] 2013-09-25 13:42:46 -07:00
Matt Brubeck
b876771668 Bug 920333 - Use a white background by default for thumbnail tile icon and label [r=sfoster] 2013-09-25 13:42:09 -07:00
Matt Brubeck
5c2f923778 Bug 875924 - Initialize the NewTabUtils thumbnail expiration filter [r=sfoster] 2013-09-25 13:41:29 -07:00
Ryan VanderMeulen
5a3c6a793e Backed out changeset 272dabb40b3d (bug 843019) for mochitest-bc failures. 2013-09-25 15:29:06 -04:00
Ryan VanderMeulen
25131b61a4 Merge m-c to fx-team. 2013-09-25 14:57:55 -04:00
Michael Comella
64acb4c746 Bug 920642: Remove dead files from bug 870171. r=rnewman 2013-09-25 11:52:48 -07:00
Ryan VanderMeulen
d7387842c3 Merge the last PGO-green inbound changeset to m-c. 2013-09-25 14:51:55 -04:00
Ryan VanderMeulen
2938d8ed09 Merge fx-team to m-c. 2013-09-25 14:38:02 -04:00
Ryan VanderMeulen
179ed0143a Merge b2g-inbound to m-c. 2013-09-25 14:27:43 -04:00
Gaia Pushbot
3e410bd11c Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/df1654f408ae
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 918576 - [B2G][SMS] The text MMS does not appear above the send button when attaching the first attachment r=gnarf

* compose.js: trigger the input event after changing the type
* thread_ui.js: don't do anything in the asynchronous getSegmentInfoForText
  callback if the type is not SMS at this point

========

https://hg.mozilla.org/integration/gaia-central/rev/68e5065474a4
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #12435 from zacc/bug917523"

This reverts commit 3ca1ab7595d79f5a3b8351ed1c2a4fdaa664404b, reversing
changes made to bdb0cbb93224aa1f09afeb9c7a7fc3a66c61d28d.
2013-09-25 10:31:05 -07:00
Gaia Pushbot
b8221ebad7 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9d76b9a19325
Author: Fabrice Desré <fabrice@desre.org>
Desc: Bug 919579 - Silent the SINGLE_VARIANT_CONF_FILE loading error r=vingtetun
2013-09-25 10:30:44 -07:00
Gaia Pushbot
ece742f1d6 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/609201aba1a4
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12379 from lightsofapollo/backout-incremental-commits

Revert "Merge pull request #10981 from ganesh7/bug_819628"

========

https://hg.mozilla.org/integration/gaia-central/rev/c5123c3ba5cd
Author: James Lal <james@lightsofapollo.com>
Desc: Revert "Merge pull request #10981 from ganesh7/bug_819628"

This reverts commit 8a91b987b57e01d03eded32c33a68595bd0949cb, reversing
changes made to dfff18a59944e64f527030ff71223f30d8f45840.
2013-09-25 10:30:23 -07:00
Margaret Leibovic
110c9bd8fa Bug 912994 - Update top sites query to exclude reading list items. r=wesj 2013-09-25 08:56:56 -07:00
Gaia Pushbot
c86ae82141 Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/15e0ed73da28
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 920561 - Ensure LazyLoader.load does not slow down app rendering. r=mbudzynski

========

https://hg.mozilla.org/integration/gaia-central/rev/c02e61476598
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 920522 - Remove icc_helper.js from the Settings apps startup path. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/a77b52ece92f
Author: Corey Frang <gnarf37@gmail.com>
Desc: Revert "Bug 917463 - [Clock] Implement scrolling inertia in inline time picker for Timers - r=jugglinmike"

This reverts commit 41f2c409c8baf9e5375ab0d41d0bbc3fe4ecf492.
2013-09-25 08:55:23 -07:00
Gaia Pushbot
a1bdcc4db0 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d2f42e82d86f
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12391 from crdlc/bug-919951

Bug 919951 - DateTimeFormat is no longer needed after deleting the clock in the landing page

========

https://hg.mozilla.org/integration/gaia-central/rev/fabc1e9f8884
Author: crdlc <crdlc@tid.es>
Desc: Bug 919951 - DateTimeFormat is no longer needed after deleting the clock in the landing page
2013-09-25 08:30:32 -07:00
Gaia Pushbot
4b34b755db Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/493172de7bb2
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 920473 - Bump gaiatest version to 0.15. r=bebe
2013-09-25 07:55:23 -07:00
Gaia Pushbot
b5959588c3 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/aa7afb132e75
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #12440 from jmcanterafonseca/bug_export_checks

Bug 920476 [Contacts] Not possible to select a contact to be exported

========

https://hg.mozilla.org/integration/gaia-central/rev/555cbb489dd0
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 920476 [Contacts] Not possible to select a contact to be exported
2013-09-25 07:40:23 -07:00
Gaia Pushbot
37417f11f2 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fcf42e45f4f2
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Include resources when packaging gaiatest. r=bebe
2013-09-25 07:30:23 -07:00
Gaia Pushbot
53774ba542 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e94bbd1e3b76
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #12357 from gasolin/issue-911696-2

Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no tel..., r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/85c8e562826c
Author: gasolin <gasolin@gmail.com>
Desc: Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support

========

https://hg.mozilla.org/integration/gaia-central/rev/19982c0bb77a
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12368 from crdlc/bug-919439

Bug 919439 - Avoid repainting in landing page after clicking home button and delete dead code in grid.js

========

https://hg.mozilla.org/integration/gaia-central/rev/8a92b23669f1
Author: crdlc <crdlc@tid.es>
Desc: Bug 919439 - Avoid repainting in landing page after clicking home button and delete dead code in grid.js
2013-09-25 06:40:22 -07:00
Gaia Pushbot
f2148a5c12 Bumping gaia.json for 5 gaia-central revision(s) a=gaia-bump
========

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

Bug 917287 - [Contacts] Name is not correctly shown when passively mergi...

========

https://hg.mozilla.org/integration/gaia-central/rev/0cbf3e80180d
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 917287 - [Contacts] Name is not correctly shown when passively merging a contact with a contact imported from SIM card

========

https://hg.mozilla.org/integration/gaia-central/rev/d62dc7acab1f
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #12275 from alivedise/bugzilla/917435/mozbrowsericonchange

Bug 917435 - Use event.detail.href instead of event.detail in

========

https://hg.mozilla.org/integration/gaia-central/rev/892b9f164bb1
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 917435 - Use event.detail.href instead of event.detail in
mozbrowsericonchange event handler

========

https://hg.mozilla.org/integration/gaia-central/rev/c61a9006eca8
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Revert "Bug 919515 - Disable test_browser_search - Searching for words is not giving results"

This reverts commit 3452f8343128f21b6bce569575afa489c3414369.
2013-09-25 06:30:22 -07:00
Fernando Rodriguez Sela
207930d533 Bug 908098 - Randomize UDP listening port. r=nsm 2013-09-25 09:20:06 -04:00
Alive Kuo
ac4c62583f Bug 917435 - Support sizes in mozbrowsericonchange event. r=fabrice 2013-09-25 09:19:39 -04:00
Gaia Pushbot
bb6b696b1c Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c0fe4b194d81
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #12435 from zacc/bug917523

Bug 917523 - repair and reenable test_keyboard_change_language

========

https://hg.mozilla.org/integration/gaia-central/rev/4468ba29e924
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: bug 917523 - repair and reenable test_keyboard_change_language r=alint/bebe

========

https://hg.mozilla.org/integration/gaia-central/rev/fe03c7d89523
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #12399 from etiennesegonzac/bug-919446-call-group-details-glitch

Bug 919446 - Fixing a glitch on the call group details screen. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/252d57f0411d
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 919446 - Fixing a glitch on the call group details screen.
r=Rik
2013-09-25 06:16:31 -07:00
Gaia Pushbot
24b35de5ab Bumping gaia.json for 6 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0dd72df9c46b
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #12429 from EverythingMe/bugfix-919409

Bug 919409 - [e.me][perf] Certain Collections show constant repaints [r=crdlc]

========

https://hg.mozilla.org/integration/gaia-central/rev/7d27614c36a1
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 919409 - [e.me][perf] Certain Collections show constant repaints [r=crdlc]

========

https://hg.mozilla.org/integration/gaia-central/rev/a0ec6c37bf5e
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #12428 from EverythingMe/bugfix-919406

Bug 919406 - [e.me][perf] Panning fps reduced due Collection DOM [r=crdlc]

========

https://hg.mozilla.org/integration/gaia-central/rev/7cc66d26413f
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 919406 - [e.me][perf] Panning fps reduced due Collection DOM [r=crdlc]

========

https://hg.mozilla.org/integration/gaia-central/rev/4bc78e0d6391
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #12430 from EverythingMe/bugfix-uuid

Bug 919547 - [e.me][perf] uuid.js replacement [r=crdlc]

========

https://hg.mozilla.org/integration/gaia-central/rev/5aafb052e81b
Author: Evyatar Amitay <evyatron@gmail.com>
Desc: Bug 919547 - [e.me][perf] uuid.js replacement [r=crdlc]
2013-09-25 06:05:22 -07:00
Ed Morley
71f3c9d1a9 Backed out changeset 5b1a56afe153 (bug 919635) for test_sandbox_symbols.py failures 2013-09-25 13:48:35 +01:00
Ed Morley
243fa365bb Backed out changeset 0fae05649fe8 (bug 919635) 2013-09-25 13:48:21 +01:00
Gaia Pushbot
669bf988a4 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/27ea1f4463f7
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Renable Python ui-tests active_sync email tests a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/1d2e4da27a6e
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Re-enable Python ui-test test_gallery_edit_photo.py a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/8f043790745c
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Re-enable Python ui-test test_mmi.py a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/ee75f135a98a
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Re-enable Python ui-test test_add_photo_to_contact.py a=test-only
2013-09-25 05:15:24 -07:00
Gaia Pushbot
66a39cb803 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/691bbca326a4
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 920023 - Add gaia command line interface to gaiatest. r=wlach
2013-09-25 05:05:23 -07:00
Nicolas Silva
b60c9a5438 Bug 919936 - MemoryTextureClient/Host serialization unittests. r=BenWa 2013-09-25 13:47:14 +02:00
Mats Palmgren
eb2304a29c Bug 919318 - A few cosmetic changes after dropping the Get prefix on some methods. r=dholbert 2013-09-25 11:42:35 +00:00
Mats Palmgren
4974add798 Bug 919318 - Drop the Get prefix on the frame methods GetFirstContinuation, GetLastContinuation, GetFirstInFlow, GetLastInFlow and also on nsLayoutUtils::GetLastContinuationWithChild, because they never return null. r=dholbert 2013-09-25 11:42:34 +00:00
Gaia Pushbot
3dbcae38f2 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

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

Bug 919967 - Enable import contact when illegal SIM insert.

========

https://hg.mozilla.org/integration/gaia-central/rev/3f070c83213a
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 919967 - Enable import contact when illegal SIM insert.
2013-09-25 04:30:23 -07:00
Jan de Mooij
7b62a9fe1a Bug 920046 - Specialize Math.round and Math.floor with double return type. r=bhackett 2013-09-25 13:26:59 +02:00
Gaia Pushbot
17b4195168 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/477e7a5c5977
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12367 from crdlc/bug-919458

Bug 919458 - Banner display none in order not to consume memory

========

https://hg.mozilla.org/integration/gaia-central/rev/d67e4dd49247
Author: crdlc <crdlc@tid.es>
Desc: Bug 919458 - Banner display none in order not to consume memory

========

https://hg.mozilla.org/integration/gaia-central/rev/0a66c69f06c5
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12389 from crdlc/bug-919933

Bug 919933 - [Homescreen] Lazy load shared/js/omadrm/fl.js

========

https://hg.mozilla.org/integration/gaia-central/rev/ad2a3ac5e3e1
Author: crdlc <crdlc@tid.es>
Desc: Bug 919933 - [Homescreen] Lazy load shared/js/omadrm/fl.js
2013-09-25 04:00:23 -07:00
Ted Mielczarek
5f1252aa45 bug 919635 - package Steeplechase tests and extra bits in test package. r=gps 2013-09-25 06:57:34 -04:00
John Hopkins
1785ae83c7 Bug 919528 - export LD path that works with both GNU make and Pymake. r=catlee 2013-09-25 06:52:30 -04:00
Gaia Pushbot
d5cb428bf6 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/504dcc988234
Author: Fernando Rodríguez Sela <frsela@tid.es>
Desc: Merge pull request #12362 from frsela/STK/Bug910151

Bug 910151 - [Buri][REG][STK]should display the default text when execute get input command with default text parameter, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/d95fcedf6d31
Author: Fernando Rodríguez Sela <frsela@tid.es>
Desc: Bug 910151 - [Buri][REG][STK]should display the default text when execute get input command with default text parameter
2013-09-25 03:40:26 -07:00
Gaia Pushbot
41cdd0dbb8 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f161d4a6b878
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Merge pull request #12420 from mpizza/Bug_920394_buidTime_keyboard

Bug 920394 - [Keyboard] Build time default keyboard should use |utils.ga... r=yurenju.

========

https://hg.mozilla.org/integration/gaia-central/rev/95426f71e0a1
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Bug 920394 - [Keyboard] Build time default keyboard should use |utils.gaiaOriginURL| to generate app origin

========

https://hg.mozilla.org/integration/gaia-central/rev/6cee530c0084
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12363 from EverythingMe/ccc-sq

Bug 911958 - [e.me][feature] Configurable collections order by operators in build time

========

https://hg.mozilla.org/integration/gaia-central/rev/2c4c81ba56fd
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 911958 - [e.me][feature] Configurable collections order by operators in build time
2013-09-25 02:25:22 -07:00
Gaia Pushbot
50ba830f92 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/632281497b31
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #11675 from KevinGrandon/bug_907907_contacts_lazy_dom

Bug 907907 contacts lazy dom

========

https://hg.mozilla.org/integration/gaia-central/rev/c3a150b1aaf9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 907907 - Lazy load Contacts DOM nodes via HTML Import polyfill

========

https://hg.mozilla.org/integration/gaia-central/rev/7083d9d8263a
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #12394 from davehunt/bug916749

Bug 916749 - Bump gaiatest version to 0.14 r=zcampbell r=bebe

========

https://hg.mozilla.org/integration/gaia-central/rev/f28bb4a9e058
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 916749 - Bump gaiatest version to 0.14. r=zcampbell
2013-09-25 02:15:24 -07:00
Gaia Pushbot
7b38f812fc Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

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

Bug 920393 - Headers [BB] wrong margin in left button

========

https://hg.mozilla.org/integration/gaia-central/rev/7034960a8d53
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 920393 - Headers [BB] wrong margin in left button

========

https://hg.mozilla.org/integration/gaia-central/rev/9ff0fbf48c1a
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #12035 from rnowm/disabled-list

Bug 912437 - [BB] Change the disabled state for list elements row

========

https://hg.mozilla.org/integration/gaia-central/rev/a4d64801cbbc
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 912437 - [BB] Change the disabled state for list elements row
2013-09-25 00:40:22 -07:00
Gaia Pushbot
943ae1879c Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5130a8241013
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #12264 from crh0716/917238

Bug 917238 - Load network.json for supported network types r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/d061dca88415
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 917238 - Load network.json for supported network types

========

https://hg.mozilla.org/integration/gaia-central/rev/76789f5668dd
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #12396 from comoyo/fix_keyboard_nightly

Bug 920039 - Check if app has manifest in keyboard_helper. r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/a3d4909b5271
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 920039 - Check if app has manifest in keyboard_helper
2013-09-25 00:30:23 -07:00
Gaia Pushbot
e17a667b80 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/33a3a3796882
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #12414 from alivedise/bugzilla/905116_master_v7

Bug 905116 - Implement Homescreen Window + Homescreen Launcher, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/e1e47585c181
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 905116 - Implement Homescreen Window + Homescreen Launcher
2013-09-25 00:20:22 -07:00
Gaia Pushbot
1296c1d01e Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e158e50fd7ab
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #12417 from evelynhung/issue-900399

Issue 900399 v1 train (cherry picked from commit 2cae0622ee942906daaca90293441afdbd2cb7de)

========

https://hg.mozilla.org/integration/gaia-central/rev/cdb4a6c35d9f
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Issue 900399 v1 train (cherry picked from commit 2cae0622ee942906daaca90293441afdbd2cb7de)

Bug 900399 - let maximum image pixel resolution customizable, r=djf

Conflicts:

	build/applications-data.js
2013-09-25 00:05:22 -07:00
Gaia Pushbot
cf8477bc76 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7a3d5b91ffa1
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #12415 from EverythingMe/enhanced-squashed

Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/5db9898c80bc
Author: Evyatar Amitay <evyatron@gmail.com>
Desc: Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc
2013-09-24 23:45:28 -07:00
Wes Kocher
1e02f948e4 Merge fx-team to m-c 2013-09-24 20:06:37 -07:00
Wes Kocher
4c8aedc06e Merge b2g-i to m-c 2013-09-24 19:58:09 -07:00
Wes Kocher
ea284218ed Merge inbound to m-c 2013-09-24 19:41:44 -07:00
Nick Fitzgerald
4d020c41be Bug 918802 - Pretty printer shouldn't block Firefox on large files; r=dcamp 2013-09-24 16:01:01 -07:00
Mark Capella
8945efda67 Bug 918222: Misc null error in browser.js, r=mfinkle 2013-09-24 18:34:12 -04:00