Nick Alexander
747b08c100
Bug 946083 - Part 2: Add dependencies for Proguard input jars. r=glandium
...
This restores no-op builds.
--HG--
extra : rebase_source : 0a3554f9d7070c3448eaf9536e18adab6b5781d6
2014-02-11 09:55:47 -08:00
Brian O'Keefe
ce139cc580
Bug 772828 - Part b: use RESOURCE_FILES in moz.build instead of manual rules in Makefile.in; r=mshal
2013-11-05 13:37:54 -05:00
Ryan VanderMeulen
f46afed6ea
Backed out changesets 6948901b128f and d9a099b06911 (bug 946083) and changeset 1e038f308b8d (bug 961339) for intermittent Android build failures.
2014-02-11 09:35:12 -05:00
Ryan VanderMeulen
935455f22d
Merge m-c to inbound.
2014-02-11 08:41:45 -05:00
Richard Newman
68626411cd
Bug 959833 - Use pngquant for PNG size reduction. r=mfinkle
2014-02-10 20:11:40 -08:00
Brian Nicholson
7596d973db
Bug 968738 - Don't short-circuit most tab updates if the URL is the same. r=rnewman
2014-02-10 18:08:03 -08:00
Nick Alexander
e37ecae927
Bug 946083 - Part 2: Add dependencies for Proguard input jars. r=glandium
...
This restores no-op builds.
2014-02-10 21:43:00 -08:00
Nick Alexander
01e16e28ef
Bug 961339 - Fix generated/ source dependencies. r=glandium
...
Generated sources are listed like 'generated/FILE.java'. Generated
sources are produced by PP_TARGETS, which generates the file
'$(CURDIR)/generated/FILE.java'. Because Make interprets $(CURDIR)/foo
and foo differently, this means we need to depend on $(CURDIR)/* for all
generated sources. Since R.java is both listed as a generated source,
but produced by aapt, we need any dependencies to be on
$(CURDIR)/.../R.java.
The change to java-build.mk includes $(CURDIR) in the dependencies for
generated sources. The changes to Makefile.in includes $(CURDIR) in the
produced R.java files for Make.
2014-02-10 21:43:00 -08:00
Marco Castelluccio
922ae0dfb0
Bug 969654 - Fix payments webapprt regression. r=ferjm
...
DONTBUILD
2014-02-10 08:48:55 -05:00
Ryan VanderMeulen
bf8e7cef1c
Backed out changeset 00d49079bcbc for landing with the wrong bug #.
2014-02-10 09:00:41 -05:00
Marco Castelluccio
4fd82b5c79
Bug 969564 - Fix payments webapprt regression. r=ferjm
2014-02-10 08:48:55 -05:00
Alfredo Yang
3a4bbe0a0b
Bug 853356 - gUM video permisson prompt. r=fabrice, felipc, wjohnston, mrbkap, jimm, jesup, khuey, jsmith
2014-02-09 15:34:40 -05:00
Ms2ger
5111aca8f0
Merge m-i to m-c.
2014-02-09 10:31:55 +01:00
Phil Ringnalda
486b585514
Merge m-c to f-t
2014-02-08 19:34:09 -08:00
Phil Ringnalda
2fc68964a3
Merge m-i to m-c
2014-02-08 19:24:37 -08:00
Peiyong Lin
d636ef5eaa
Bug 965023 - Use Object.freeze on exports of Home.jsm. r=mcomella
2014-02-08 21:02:27 -05:00
Chris Peterson
fb34f68695
Bug 950237 - Upgrade Fennec's geolocation data collection to current format. r=blassey
2014-02-06 20:25:35 -08:00
Wes Kocher
319518f4bf
Merge m-c to fx-team
2014-02-07 17:32:00 -08:00
Wes Kocher
fff5adc094
Merge fx-team to m-c
2014-02-07 17:00:34 -08:00
Margaret Leibovic
d492880938
Bug 969511 - Don't update snippets cache unless the update timer fired. r=wesj
2014-02-07 14:44:38 -08:00
Lucas Rocha
0e72064393
Bug 969445 - Don't show progress bar in about:privatebrowsing (r=mfinkle)
2014-02-07 20:03:42 +00:00
Mark Finkle
faa1067c50
Bug 958517 - Create a 'Page' menu and move some of the URL context menu actions there (test changes) r=lucasr
2014-02-07 14:49:35 -05:00
Mark Finkle
be761abd74
Bug 958517 - Create a 'Page' menu and move some of the URL context menu actions there r=lucasr
2014-02-07 14:49:32 -05:00
Ryan VanderMeulen
b02119174f
Merge m-c to fx-team.
2014-02-07 14:43:45 -05:00
Ryan VanderMeulen
e77e2b92b7
Merge inbound to m-c.
2014-02-07 14:22:17 -05:00
Lucas Rocha
a5c67c9ed9
Bug 966866 - Correctly update SiteIdentityPopup for MIXED_CONTENT_BLOCKED (r=margaret)
2014-02-07 19:21:28 +00:00
Chenxia Liu
9401338644
Bug 968180 - Favicons in URL bar are not fetched after changing an option in settings menu (backout bug 934658). r=mfinkle
2014-02-07 10:42:04 -08:00
Lucas Rocha
538049a77b
Bug 969316 - Use description column instead of url in PanelListRow (r=margaret)
2014-02-07 17:06:47 +00:00
Margaret Leibovic
2918ef0230
Bug 965455 - Set parent id when adding a new tab from snippet. r=wesj
2014-02-07 08:41:28 -08:00
Lucas Rocha
5dca1a5a55
Bug 968878 - Misc tweaks in PanelGridView's layout (r=margaret)
2014-02-07 15:22:45 +00:00
Lucas Rocha
893a329b5c
Bug 968735 - Don't use 'm' prefix for non-member variables (r=liuche)
2014-02-07 13:34:09 +00:00
Lucas Rocha
de716fd79f
Bug 968735 - Rename displayPanelConfig() to displayHomeConfig() (r=liuche)
2014-02-07 13:34:08 +00:00
Lucas Rocha
a6db9c2223
Bug 964508 - Rename TwoLineRow members and move icon code to TwoLinePageRow (r=margaret)
2014-02-07 13:29:40 +00:00
Carsten "Tomcat" Book
87668576b7
merge fx-team to mozilla-central
2014-02-07 09:52:32 +01:00
Margaret Leibovic
59951b05a1
Bug 965460 - Create helper method for database creation and migration. r=mcomella
2014-02-06 18:08:09 -08:00
Margaret Leibovic
7d9127772c
Bug 964447 - Add sync APIs to HomeProvider. r=mcomella
2014-02-06 18:08:07 -08:00
Wes Kocher
433cad2889
Backed out changeset 71118c075821 (bug 947550) r=margaret on a CLOSED TREE
2014-02-06 16:50:43 -08:00
Wes Johnston
61fe7a896d
Backed out changeset 60651784715f (bug 967254) r=margaret
2014-02-06 15:13:27 -08:00
Wes Johnston
f21519d8db
Backed out changeset b8c9dc39af31 (bug 964510) r=margaret
2014-02-06 15:13:14 -08:00
Wes Johnston
78c5b9d7f4
Backed out changeset 2c2c426e4afe (bug 784759) r=margaret
2014-02-06 15:12:59 -08:00
Wes Johnston
85e7552089
Backed out changeset ed28aeea074a (bug 964511) r=margaret
2014-02-06 15:12:47 -08:00
Lucas Rocha
48ce67f2fe
Bug 963046 - Remove unused imports from PanelListRow (r=margaret)
2014-02-06 21:06:39 +00:00
Lucas Rocha
ca2370cc76
Bug 963046 - Use Picasso to load images in PanelListRow and PanelGridItemView (r=margaret)
2014-02-06 21:06:39 +00:00
Lucas Rocha
add8fae09e
Bug 963046 - Add image_url column to HomeProvider's fake items (r=margaret)
2014-02-06 21:06:39 +00:00
Lucas Rocha
9adfa852c9
Bug 963046 - Use HomeItems DB constract in PanelListRow (r=margaret)
2014-02-06 21:06:39 +00:00
Lucas Rocha
a53b198de4
Bug 963046 - Add Picasso image loading library to the tree (r=nalexander)
2014-02-06 21:06:38 +00:00
Geoff Brown
bdae0d2fc6
Bug 948387 - Avoid intermittent NPE in testAddSearchEngine; r=wesj
2014-02-04 23:47:00 -07:00
Carsten "Tomcat" Book
d8fe6643a1
Merge mozilla-central to fx-team
2014-02-06 13:27:21 +01:00
Carsten "Tomcat" Book
58429da813
merge fx-team to mozilla-central
2014-02-06 12:51:21 +01:00
Lucas Rocha
739454b415
Bug 909550 - Lazy-inflate TabsPanel once the first pageload is finished (r=mfinkle)
2014-02-06 08:59:50 +00:00
