Nick Alexander
867646c40b
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
56341318f9
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
285a3a25dd
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
60a23c679f
Merge m-c to inbound.
2014-02-11 08:41:45 -05:00
Richard Newman
0a8c3cecbe
Bug 959833 - Use pngquant for PNG size reduction. r=mfinkle
2014-02-10 20:11:40 -08:00
Brian Nicholson
5cfdc0229f
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
4afb174761
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
4bdd98ac0e
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
eaa2dd6729
Bug 969654 - Fix payments webapprt regression. r=ferjm
...
DONTBUILD
2014-02-10 08:48:55 -05:00
Ryan VanderMeulen
e648954754
Backed out changeset 00d49079bcbc for landing with the wrong bug #.
2014-02-10 09:00:41 -05:00
Marco Castelluccio
106bbee041
Bug 969564 - Fix payments webapprt regression. r=ferjm
2014-02-10 08:48:55 -05:00
Alfredo Yang
3853c6783a
Bug 853356 - gUM video permisson prompt. r=fabrice, felipc, wjohnston, mrbkap, jimm, jesup, khuey, jsmith
2014-02-09 15:34:40 -05:00
Ms2ger
2e89bf81de
Merge m-i to m-c.
2014-02-09 10:31:55 +01:00
Phil Ringnalda
9bc704b88c
Merge m-c to f-t
2014-02-08 19:34:09 -08:00
Phil Ringnalda
96e26c08a7
Merge m-i to m-c
2014-02-08 19:24:37 -08:00
Peiyong Lin
eb10da67e2
Bug 965023 - Use Object.freeze on exports of Home.jsm. r=mcomella
2014-02-08 21:02:27 -05:00
Chris Peterson
0a41736938
Bug 950237 - Upgrade Fennec's geolocation data collection to current format. r=blassey
2014-02-06 20:25:35 -08:00
Wes Kocher
0a02be2b61
Merge m-c to fx-team
2014-02-07 17:32:00 -08:00
Wes Kocher
dd205da77d
Merge fx-team to m-c
2014-02-07 17:00:34 -08:00
Margaret Leibovic
2ef8f46924
Bug 969511 - Don't update snippets cache unless the update timer fired. r=wesj
2014-02-07 14:44:38 -08:00
Lucas Rocha
e7e92cd6d7
Bug 969445 - Don't show progress bar in about:privatebrowsing (r=mfinkle)
2014-02-07 20:03:42 +00:00
Mark Finkle
c3c74023b3
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
121b48910d
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
b80adb9b88
Merge m-c to fx-team.
2014-02-07 14:43:45 -05:00
Ryan VanderMeulen
9b6b0a5e15
Merge inbound to m-c.
2014-02-07 14:22:17 -05:00
Lucas Rocha
9c1d970cc9
Bug 966866 - Correctly update SiteIdentityPopup for MIXED_CONTENT_BLOCKED (r=margaret)
2014-02-07 19:21:28 +00:00
Chenxia Liu
605c1f0faa
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
3292769416
Bug 969316 - Use description column instead of url in PanelListRow (r=margaret)
2014-02-07 17:06:47 +00:00
Margaret Leibovic
6a787f3d5e
Bug 965455 - Set parent id when adding a new tab from snippet. r=wesj
2014-02-07 08:41:28 -08:00
Lucas Rocha
dd5fbf3ed1
Bug 968878 - Misc tweaks in PanelGridView's layout (r=margaret)
2014-02-07 15:22:45 +00:00
Lucas Rocha
03117e0b06
Bug 968735 - Don't use 'm' prefix for non-member variables (r=liuche)
2014-02-07 13:34:09 +00:00
Lucas Rocha
fe2490ec9c
Bug 968735 - Rename displayPanelConfig() to displayHomeConfig() (r=liuche)
2014-02-07 13:34:08 +00:00
Lucas Rocha
29205bf450
Bug 964508 - Rename TwoLineRow members and move icon code to TwoLinePageRow (r=margaret)
2014-02-07 13:29:40 +00:00
Carsten "Tomcat" Book
57ac46f7cc
merge fx-team to mozilla-central
2014-02-07 09:52:32 +01:00
Margaret Leibovic
33e94a6056
Bug 965460 - Create helper method for database creation and migration. r=mcomella
2014-02-06 18:08:09 -08:00
Margaret Leibovic
ff80549e7d
Bug 964447 - Add sync APIs to HomeProvider. r=mcomella
2014-02-06 18:08:07 -08:00
Wes Kocher
ae0bba98fc
Backed out changeset 71118c075821 (bug 947550) r=margaret on a CLOSED TREE
2014-02-06 16:50:43 -08:00
Wes Johnston
86277ea8af
Backed out changeset 60651784715f (bug 967254) r=margaret
2014-02-06 15:13:27 -08:00
Wes Johnston
e2c746d3b3
Backed out changeset b8c9dc39af31 (bug 964510) r=margaret
2014-02-06 15:13:14 -08:00
Wes Johnston
99e4cebbe1
Backed out changeset 2c2c426e4afe (bug 784759) r=margaret
2014-02-06 15:12:59 -08:00
Wes Johnston
2040460ecc
Backed out changeset ed28aeea074a (bug 964511) r=margaret
2014-02-06 15:12:47 -08:00
Lucas Rocha
6317949694
Bug 963046 - Remove unused imports from PanelListRow (r=margaret)
2014-02-06 21:06:39 +00:00
Lucas Rocha
625b318e88
Bug 963046 - Use Picasso to load images in PanelListRow and PanelGridItemView (r=margaret)
2014-02-06 21:06:39 +00:00
Lucas Rocha
80fa677593
Bug 963046 - Add image_url column to HomeProvider's fake items (r=margaret)
2014-02-06 21:06:39 +00:00
Lucas Rocha
369c2903d9
Bug 963046 - Use HomeItems DB constract in PanelListRow (r=margaret)
2014-02-06 21:06:39 +00:00
Lucas Rocha
d570458ad5
Bug 963046 - Add Picasso image loading library to the tree (r=nalexander)
2014-02-06 21:06:38 +00:00
Geoff Brown
24da9103b8
Bug 948387 - Avoid intermittent NPE in testAddSearchEngine; r=wesj
2014-02-04 23:47:00 -07:00
Carsten "Tomcat" Book
e24c4eab84
Merge mozilla-central to fx-team
2014-02-06 13:27:21 +01:00
Carsten "Tomcat" Book
b9788c5190
merge fx-team to mozilla-central
2014-02-06 12:51:21 +01:00
Lucas Rocha
5b5cdd7f84
Bug 909550 - Lazy-inflate TabsPanel once the first pageload is finished (r=mfinkle)
2014-02-06 08:59:50 +00:00
