Wes Kocher
d4bfbd2d16
Merge m-c to inbound, a=merge CLOSED TREE
2015-07-10 16:20:27 -07:00
Wes Kocher
7888a63c73
Merge inbound to central, a=merge
2015-07-10 16:06:49 -07:00
Mike Hommey
67e02ffc14
Bug 1182407 - Use unpack feature of tooltool wherever possible. r=mshal
2015-07-11 06:26:21 +09:00
Mike Hommey
84878777a1
Bug 1181040 - Include mozconfig.cache after mozconfig.common.override. r=mshal
...
Enable sccache on windows b2g builds at the same time to simplify things.
2015-07-11 06:26:20 +09:00
Wes Kocher
027fd9354a
Backed out 5 changesets (bug 1178850) for android build bustage CLOSED TREE
...
Backed out changeset 79085d3894e8 (bug 1178850)
Backed out changeset c02b603104ea (bug 1178850)
Backed out changeset d6dab7810669 (bug 1178850)
Backed out changeset 8ee5809f349b (bug 1178850)
Backed out changeset 821b22ce79e1 (bug 1178850)
2015-07-10 14:17:53 -07:00
Jim Chen
94084a1639
Bug 1178850 - Copy generated natives header; r=nalexander
...
Copy the natives header from the objdir to the source directory,
along with the generated wrapper files from before.
The patch also removes saving the originals to .old files to avoid
producing untracked files in the source tree.
2015-07-10 16:52:52 -04:00
Terrence Cole
ea81ddeb48
Bug 1171904 - Remove --enable-js-crash-diagnostics and just use the NIGHTLY defines; r=sfink
2015-07-10 10:50:19 -07:00
Eugen Sawin
a28184b2b3
Bug 1178818
- Don't use promises in DOMApplicationRegistry proxy object. r=myk
2015-07-10 14:30:04 +02:00
Wes Kocher
97bb5a6f42
Merge m-c to fx-team, a=merge
2015-07-09 18:08:05 -07:00
Wes Kocher
2c7068c994
Merge inbound to central, a=merge
2015-07-09 18:01:25 -07:00
vivek
950c51e39d
Bug 1182248 - Debug mode setting updated from static flag r=nalexander.
...
* The checkbox setting would be reflected until the FxAccountUtils is not gc-ed.
--HG--
extra : commitid : 7DYPFsmPhsh
extra : rebase_source : 8871d267f831e9411db521184c13e5e19a1948a1
2015-07-10 00:34:51 +03:00
Ryan VanderMeulen
f416bf7777
Merge m-c to fx-team. a=merge
2015-07-09 13:53:46 -04:00
Carsten "Tomcat" Book
f494aa659e
merge mozilla-inbound to mozilla-central a=merge
2015-07-09 17:54:48 +02:00
Geoff Brown
65e4c8cee0
Bug 1179981 - A new test harness for robocop; r=jmaher
2015-07-09 12:30:01 -06:00
Michael Comella
d5150631bb
Bug 1179731 - Hide autocomplete suggestions when showing the home pager. r=sebastian
...
--HG--
extra : commitid : L8snhFbg4vf
extra : rebase_source : 028fd29ae4962307374a836d444e4d17bfbcf706
2015-07-08 17:53:25 -07:00
Ryan VanderMeulen
dc954fae3a
Merge m-c to inbound. a=merge
...
CLOSED TREE
2015-07-09 13:52:22 -04:00
Maksim Lebedev
dbc64b549d
Bug 1177323 - disable decode-only-on-draw preference. r=seth
...
--HG--
extra : rebase_source : 3c452f3188fd22c1d5d293103645d30bcef6a939
2015-07-08 00:19:00 +02:00
Martyn Haigh
472e082735
Bug 1181124 - Remove mdpi folder from CONSTRAINED_AAPT_CONFIGURATIONS in Makefile.in r=nalexander
...
--HG--
extra : commitid : HybZqiNAnRO
extra : rebase_source : fa88d8de028c877546171a7a81f35dfb640fcf40
2015-07-07 17:35:09 +01:00
Martyn Haigh
32adeccc6a
Bug 1180766 - tab_queue_prompt.xml file has two elements with the id of tab_queue_container r=sebastian
...
--HG--
extra : commitid : 70SsxGsgFZW
extra : rebase_source : 5ae4e02e25540354581ab0bf2e9e3d700bd82bfd
extra : amend_source : 1e1291472db55350ab7c47ef8053f40167470bdd
2015-07-07 16:35:36 +01:00
Margaret Leibovic
313ec41bae
Bug 1179872 - Remove about:apps page and menu item. r=mcomella
...
--HG--
extra : commitid : I868jpOSYPO
extra : rebase_source : bc65dc5c0f6389b79fddc5c553f6f6ef9110751e
2015-07-07 16:01:43 -07:00
Michael Comella
be905ce5c3
Bug 1180011
- Replace tablet private browsing url bar assets. r=margaret
...
The phone assets were updated but the tablet assets were not.
Ideally, we'd merge these assets but let's not yak shave.
--HG--
extra : commitid : 1nkbfuuK85h
extra : rebase_source : 5252de4c79a74112f4837ca84f00f90e431a5598
2015-07-07 13:42:19 -07:00
Nick Alexander
3116ddce8f
Bug 1161234 - Part 2: Accept non-default auth, token, and profile endpoints. r=me
...
This allows us to create accounts that Sync against non-production
endpoints from JavaScript. In future we will include oauth and
eventually content server endpoints in these messages.
--HG--
extra : commitid : IwJPgL5C3fO
extra : rebase_source : 092e5052f6185c73df8d46285b1529e6fe83d4ef
2015-07-08 13:46:07 -07:00
Martyn Haigh
e67cc9971b
Bug 1182011 - Remove ScrollAnimator.java r=sebastian
...
--HG--
extra : commitid : IEa2XHzNIwi
extra : rebase_source : b643276ab092888a945dc11fe1b3c30bc863e0bc
extra : amend_source : 03db29b5eb5d0d251dfbc7a0f97edc53aae430a4
2015-07-09 11:56:25 +01:00
Sebastian Kaspari
2523bc8f66
Bug 1125312 - Bug 1125313 - Restriced profiles: Hide "Tools" and "Report Site Issue" menu items. r=ally
...
--HG--
extra : commitid : 7gRtjkmHG9Q
extra : rebase_source : 93b44eea82001dcc9731ab1905b545c0f2c20bbd
extra : amend_source : 2dc6285f4f918c1c8bb79f18ceb4c43fc83be2e8
2015-07-06 17:08:06 +02:00
Dylan Roeh
0be73f2720
Bug 1176682 - Checks for empty Intent as result of camera activity in onActivityResult. r=snorp
2015-07-07 16:56:38 -05:00
J. Ryan Stinnett
037d573caf
Bug 1180996 - Remote debugging via WiFi for Android. r=margaret
2015-07-09 10:36:29 -05:00
J. Ryan Stinnett
447b851dab
Bug 1180996 - Extract remote debugger to separate file. r=margaret
2015-07-09 10:36:28 -05:00
J. Ryan Stinnett
a82a303f06
Bug 1180996 - Enable DevTools security on Android. r=margaret
2015-07-09 10:36:28 -05:00
Dustin J. Mitchell
82affbd482
Bug 1161075: build android with JDK from tooltool; r=nalexander
...
--HG--
extra : commitid : KiuOv4xzgiH
extra : rebase_source : 8a8e2438882d3e26581c1f375a3508da01657f04
2015-06-30 11:18:01 -04:00
Michael LoPiccolo
8d50fbe7bb
Bug 1105271 - Increased size of tabs tray elements on tablet. r=mcomella
2015-06-26 17:35:17 -05:00
Carsten "Tomcat" Book
da83a15284
Merge mozilla-central to fx-team
2015-07-08 12:04:53 +02:00
Kyle Machulis
8058218a2d
Bug 1176300 - Add lgpllibs library to build system; r=glandium
2015-07-07 21:17:08 -07:00
Sebastian Kaspari
e68ea8c5bc
Bug 1172136 - Create API for add-ons to add header image to grid panels. r=mhaigh
...
--HG--
extra : commitid : 9tnhmEVPipo
extra : rebase_source : 28de3ef4beb78425760212233e8ada98a7092442
2015-07-06 10:47:38 +02:00
Nick Rosbrook
4d33ca0eeb
Bug 1156546
- Remove "Developer Tools" preference category when in Guest Mode. r=liuche
...
--HG--
extra : commitid : 8AwHKacUBzG
extra : rebase_source : 84ff40f12d05a171a6a95fc76cb693469cdbd772
2015-07-07 11:55:18 -07:00
Ryan VanderMeulen
a249083da4
Merge m-c to fx-team. a=merge
2015-07-07 14:41:18 -04:00
Ryan VanderMeulen
de7e734bc6
Merge m-c to inbound. a=merge
...
CLOSED TREE
2015-07-07 13:38:10 -04:00
Michael Comella
84a16d7f27
Bug 1180907 - Mutate search label before tinting it. r=sebastian
...
If we don't mutate, we're tinting the shared Drawable state and other Drawables
using the same asset might also get tinted.
--HG--
extra : commitid : KZghkGnS9ty
extra : rebase_source : f45ac49e5c6c8dcdfa07709ca42b692ef197916e
2015-07-06 14:42:22 -07:00
Martyn Haigh
24d2c94a39
Bug 1180191 - Remove the drawable-large-mdpi-v11 folder r=mcomella
...
--HG--
extra : commitid : AEdE2vjWc6F
extra : rebase_source : 828415d119d3646761f7c5d3e099ff3d2adb41fb
2015-07-03 14:46:19 +01:00
Martyn Haigh
ba1eff7e3d
Bug 1178813 - Revise the autocomplete_list_bg.9.png asset r=mcomella
...
--HG--
extra : commitid : HuNfvQuJFgg
extra : rebase_source : cf5f2590920440601f2c9b74bd9c093e56e7182c
extra : amend_source : 06635eb41655b62f48113da470f2dafcdd35e0f4
2015-07-03 13:59:40 +01:00
Wes Kocher
5b118ee71e
Merge m-c to fx-team, a=merge
2015-07-06 17:21:43 -07:00
Wes Kocher
874c765c11
Merge inbound to central, a=merge
2015-07-06 17:07:18 -07:00
Chenxia Liu
ff71447c98
Bug 1179509 - Include title + favicon in Site Identity doorhanger for unencrypted sites. r=ally
...
--HG--
extra : commitid : 1oyrHAEBarh
extra : rebase_source : 12fd13a215dcd25393085b953f5e3364de96e110
extra : amend_source : cee7c735c34d50c2b466463febf8beff3bd52716
2015-07-01 15:37:28 -07:00
Chenxia Liu
17e09443bf
Bug 1173623 - Update "Learn more" link in Tracking protection to be consistent with other doorhanger links. r=ally
...
--HG--
extra : commitid : GeuJsWuygDf
extra : rebase_source : f5bd5810775de2814b74f74056ffb3c435dc2cd9
2015-07-01 15:29:36 -07:00
Carsten "Tomcat" Book
fdcdeb40d9
Merge mozilla-central to fx-team
2015-07-06 13:07:21 +02:00
Sebastian Kaspari
6163a11444
Bug 1180605 - spoon-gradle-plugin: Set spoon runner dependency to 1.1.10. r=mhaigh
...
--HG--
extra : commitid : Kl030ouSZGu
extra : rebase_source : 4e00660e3a471edf69be724cb5de0382d2308a6b
2015-07-06 11:29:06 +02:00
Fabrice Desré
cb4b3faae4
Bug 1180507 - Don't hardcode defaultChromeURI in BrowserCLH.js r=mfinkle
2015-07-05 20:26:17 -07:00
Phil Ringnalda
900c693e30
Merge m-c to m-i
2015-07-03 19:15:06 -07:00
Phil Ringnalda
8c831d6371
Merge f-t to m-c, a=merge
2015-07-03 18:55:10 -07:00
vivek
2685b61124
Bug 1178378 - Debug personal information exposed as Menu item r=nalexander
...
--HG--
extra : commitid : IQ3uFEOoKYE
extra : rebase_source : 5ab5944e7d9101faafa677265b499c752f34f959
extra : histedit_source : f422e6be27c8780314b89b38e1e9f62356bb1bcd
2015-07-02 22:26:35 +03:00
Martyn Haigh
6d10cb1ed6
Bug 1178804 - Implement new fxaccount_sync_error.png assets; r=nalexander
...
--HG--
extra : commitid : LfUMOUGmBGh
extra : rebase_source : ad4e45875ee9fd12fa110bdb81d20778c5ebdbd2
extra : amend_source : 887ae311d3e393ee0694da551474112c49a4169b
2015-07-03 13:18:01 +01:00