Wes Kocher
68833cae98
Merge m-c to inbound, a=merge
...
--HG--
extra : commitid : Ji790Lmkepf
2015-11-30 17:47:00 -08:00
Carsten "Tomcat" Book
906d89bc14
Merge mozilla-central to fx-team
2015-11-30 13:46:30 +01:00
Carsten "Tomcat" Book
5a9f09086a
merge mozilla-inbound to mozilla-central a=merge
2015-11-30 13:19:02 +01:00
Mark Finkle
e76f2ab0c8
Bug 1227997 - Make theme fallback actually work r=mossop
2015-11-28 12:52:22 -05:00
Phil Ringnalda
2ef1ebcef2
Back out 5 changesets (bug 1209184) on suspicion of causing OS X opt build startup cache precompilation failures
...
CLOSED TREE
Backed out changeset d0404928473e (bug 1209184)
Backed out changeset 24282235336d (bug 1209184)
Backed out changeset 399404ff25e4 (bug 1209184)
Backed out changeset a517959befe9 (bug 1209184)
Backed out changeset a4f1765a6cdf (bug 1209184)
2015-11-28 20:29:48 -08:00
Kris Maglione
bbfcb6bd68
Bug 1209184: Follow-up: Disable WebExtension xpcshell tests on Android and gonk. r=me
...
--HG--
extra : commitid : BAyWC1DtflD
extra : amend_source : 60f56b9557b55bc67189d52692311f1af309dfc5
2015-11-28 01:00:57 -08:00
Dave Townsend
361cd471ff
Bug 1228359: Allow experiments to register chrome. r=felipe
...
Simple obvious fix. Adds tests by making BootstrapMonitor (which
test_experiments.js and others use for verifying bootstrap startup and shutdown)
verify the list of registered chrome manifests at various points. Without the
fix this makes test_experiment fail as expected.
--HG--
extra : commitid : DhCOtar9Mqu
extra : rebase_source : c194a4d390bbd460b9c17ec09e9c3a219b5025d6
2015-11-27 12:44:22 -08:00
Francois Marier
88fc749776
Bug 1216793 - Add tests for TP in XHRs and fetch(). r=gcp
2015-11-30 16:28:39 -08:00
Mike Hommey
8caec249c9
Bug 1228742 - Don't install CrashTestUtils.jsm to dist/bin/modules. r=mshal
...
It's actually shipped by mistake, and it's copied to the appropriate
test directory by other means.
2015-12-01 08:25:22 +09:00
Eddy Bruel
87593f3827
Bug 1218817 - Implement RootActor.listServiceWorkerRegistrations;r=janx
2015-11-30 06:00:31 +01:00
Kris Maglione
0e62607b98
Bug 1209184: Part 4 - [webext] Add tests for CSS localization filters. r=billm
...
--HG--
extra : commitid : 7QQXwv6dFlO
extra : source : 8e692344588a9b0155259d0d3fb1050b5f22230c
extra : histedit_source : 8eaf0490a1f62b6379cdca19bdc5a415a4d5c3c8
2015-11-20 22:39:58 -08:00
Kris Maglione
63106cd553
Bug 1209184: Part 3 - [webext] Add tests for locale stream converter. r=billm
...
--HG--
extra : commitid : C6EPqRUd2zd
extra : source : f9ab766896106b5718920a274ef4fe3605823b75
extra : histedit_source : b8bc9c984956d543d935a0fc6db77875ac8680d5%2Ccd119681f1f3e43e22999fdb3eb2848f47962436
2015-11-27 23:02:41 -08:00
Kris Maglione
1c4163c307
Bug 1209184: Part 1b - [webext] Create a stream converter for localization placeholders. r=billm
...
--HG--
extra : commitid : 2ksN8QqqAqR
extra : source : e75f9f24d0dc7c08131ebc08b0dcfcb4f310269c
2015-11-20 22:39:44 -08:00
Phil Ringnalda
6c3da9ec36
Back out 4 changesets (bug 1209184) for Android/B2G xpcshell bustage
...
CLOSED TREE
Backed out changeset 8e692344588a (bug 1209184)
Backed out changeset f9ab76689610 (bug 1209184)
Backed out changeset 9c63ffd499eb (bug 1209184)
Backed out changeset e75f9f24d0dc (bug 1209184)
2015-11-27 22:40:54 -08:00
Kris Maglione
29e0cf5229
Bug 1209184: Part 4 - [webext] Add tests for CSS localization filters. r=billm
...
--HG--
extra : commitid : I3iiuKUJqSF
extra : rebase_source : 652a56ec50167cf8283da80b45ba2f1bf709732d
2015-11-20 22:39:58 -08:00
Phil Ringnalda
2ad5117d1a
Back out a25efba616ac (bug 1218473
) on suspicion of causing Windows 8 shutdown crashes "with exit code 3221225477"
2015-11-29 12:38:30 -08:00
Kris Maglione
2ee98de7f1
Bug 1209184: Part 3 - [webext] Add tests for locale stream converter. r=billm
...
--HG--
extra : commitid : 3k0QW6ROCfV
extra : rebase_source : 120500a612301055c4262644314420e2692c4627
2015-11-16 17:38:02 -08:00
Kris Maglione
881cb75ad4
Bug 1209184: Part 1b - [webext] Create a stream converter for localization placeholders. r=billm
...
--HG--
extra : commitid : HAvBpLW4dYJ
extra : rebase_source : 5c805f068c383cffdead97ad7d8f87b315dc4620
2015-11-20 22:39:44 -08:00
Sebastian Kaspari
db5aae07ef
Bug 1189336 - (Part 3) Move from a list of disallowed things to a list of restrictable features. r=ally
...
--HG--
extra : commitid : KSNcNwqDdsf
extra : rebase_source : b5a8becbf236df83ed3773a76456f905a29c0cc1
2015-11-11 18:17:19 +01:00
Sebastian Kaspari
33f113a021
Bug 1189336 - (Part 1) Rename RestrictedProfiles to Restrictions. r=ally
...
RestrictedProfiles: The name of the class can be confusing because it handles
guest profiles and restricted profiles. We might even query it from a normal
profile.
--HG--
rename : mobile/android/base/RestrictedProfiles.java => mobile/android/base/Restrictions.java
extra : commitid : BtjvH8aWSlk
extra : rebase_source : 262c9537d7e93658ceea6f94c8481a393ddd3072
2015-11-11 12:29:07 +01:00
Carsten "Tomcat" Book
57d83d3910
merge mozilla-inbound to mozilla-central a=merge
2015-11-27 11:08:41 +01:00
Carsten "Tomcat" Book
e4ebb70be5
Merge mozilla-central to fx-team
2015-11-26 16:55:41 +01:00
Carsten "Tomcat" Book
358e4575c4
merge mozilla-inbound to mozilla-central a=merge
2015-11-26 16:54:27 +01:00
Carsten "Tomcat" Book
cb55d72c64
merge fx-team to mozilla-central a=merge
2015-11-26 16:53:23 +01:00
Carsten "Tomcat" Book
a1980896be
merge fx-team to mozilla-central a=merge
2015-11-26 11:57:05 +01:00
Mark Hammond
ba3cdf4717
Bug 1220926 - include some sync preferences in about:support. r=bsmedberg
2015-11-26 11:14:11 +11:00
Manuel Casas
447d846853
Bug 1214214 - Update style of sharing notifications bar, and make it persistent. r=mikedeboer
2015-11-25 01:40:00 +01:00
Jared Wein
e70da30f79
Bug 1211635 - Popups should be treated as top-level windows, allowing XUL alerts translucency. r=MattN r=roc
...
--HG--
extra : rebase_source : 9fd3b1eb57b54fcb33b0012cbd7555674eb9b913
2015-11-25 08:49:23 -05:00
Carsten "Tomcat" Book
7fc565c303
Merge mozilla-central to fx-team
2015-11-25 13:59:23 +01:00
Carsten "Tomcat" Book
1edd1500db
merge mozilla-inbound to mozilla-central a=merge
2015-11-25 12:51:53 +01:00
Jared Wein
d464a0a985
Bug 1227717 - Tweak the margin-end on the gear button on Windows to better align with the alert close button. r=MattN
...
--HG--
extra : rebase_source : 1789a4c9cbb5a4e501b6eef293e7db2e9b67ae30
2015-11-24 20:07:56 -05:00
Wes Kocher
28cb6089db
Merge m-c to fx-team, a=merge
...
--HG--
extra : commitid : 86BszxSMu06
2015-11-24 16:56:56 -08:00
Wes Kocher
d04352af5d
Merge fx-team to central, a=merge
...
--HG--
extra : commitid : GWsEhTdRTPF
2015-11-24 16:33:15 -08:00
Wes Kocher
bee783ac06
Merge inbound to m-c a=merge
...
--HG--
extra : commitid : C5ZGJHM8FSu
2015-11-24 13:54:06 -08:00
Tooru Fujisawa
9ac197b45d
Bug 1226936 - Part 2: Update Histograms.json description to follow jscompartment.h. r=bsmedberg
...
--HG--
extra : rebase_source : 2914bfa0317a95b0e4aec100c486e254ca047f4f
2015-11-24 23:19:04 +09:00
Hector Zhao
c2ba6eaea5
Bug 1227428 - Update partner section with correct information once available. r=gfritzsche
2015-11-24 16:18:03 +08:00
Kris Maglione
3b218341fa
Bug 1208761: [webext] Support l10n.getMessage in content scripts. r=billm
...
--HG--
extra : commitid : Iuj6mzu3KIU
extra : rebase_source : 08612b809866cf35057dc690bdf62dd74a330b46
2015-11-23 17:52:23 -08:00
Jim Chen
3f2aedd313
Bug 1221270 - Let AddonUpdateService use AddonManagerPrivate to check for updates; r=mfinkle
...
The Android-specific AddonUpdateService has a bit of redundant code
because AddonManagerPrivate has a backgroundUpdateCheck method that does
a lot of the same thing. This patch makes AddonUpdateService call that
method so there's less code and more consistency.
This requires flipping the "extensions.update.enabled" pref, which was
disabled in bug 528588 for showing the XUL addon update dialog. I don't
think this is relevant anymore in native Fennec and with the later
rewrite of AddonManager, so I'm fairly certain it's okay to flip that
pref.
The patch also disables the AddonManager update timer because we have
our own update timer on Android.
2015-11-23 23:31:49 -05:00
Felipe Gomes
e94f5becc6
Bug 1226487 - Allow e10s to run on Beta. r=mconley
2015-11-23 23:59:47 -02:00
Kris Maglione
9e04ae1c2d
Bug 1209184: Part 1a - [webext] Make localization work in content processes. r=billm
...
--HG--
extra : commitid : ABk7hGXVH2U
extra : rebase_source : 20b78132b0ec5e3cc2c3e33b142593c7e8574fcf
2015-11-21 12:07:14 -08:00
Kris Maglione
74af7d53bc
Bug 1226423
: [webext] Add tests for API injection into background pages. r=billm
...
--HG--
extra : commitid : 70rSfBGK8XG
extra : rebase_source : 829a3f270e89f4a64262a5e5f4f5499ed3251424
2015-11-20 15:14:25 -08:00
Kris Maglione
e826fe671b
Bug 1226423
: Don't inject WebExtension APIs into documents without WebExtension principals. r=billm
...
--HG--
extra : commitid : L1KjekH6dHI
extra : rebase_source : b4acb2ab011c175b6316793da4a99da2ee4de660
2015-11-20 15:09:28 -08:00
J. Ryan Stinnett
5dfb0fb402
Bug 1226661 - DevTools client JSM global tweak for B2G. r=ochameau
2015-11-23 18:10:11 -06:00
Mark Banner
fbca33b0b0
Bug 1227138 - Fix browser_AddonWatcher not to fail if system add-ons are present. r=Mossop
2015-11-23 19:45:24 +00:00
Carsten "Tomcat" Book
5f1ac1afb3
merge mozilla-inbound to mozilla-central a=merge
2015-11-23 14:08:50 +01:00
Andreas Wagner
9b54d50fea
Bug 1195256 - preferences: Align question mark to the header of the pane, r=gijs
...
--HG--
extra : commitid : BqAw6PW94ip
2015-11-24 09:14:46 +00:00
Carsten "Tomcat" Book
e0d8a174d7
Backed out changeset 098f2c2291ef (bug 634063) for causing merge conflicts when merging to mozilla-central
...
--HG--
extra : rebase_source : 16ae5b7fb5fb67d9900a17c4a9d1cc76b4110aec
2015-11-24 16:56:32 +01:00
Carsten "Tomcat" Book
4478aaa8da
Merge mozilla-central to b2g-inbound
2015-11-25 14:00:32 +01:00
Johann Hofmann
75a90ffc8e
Bug 1200674 - Allow flexible icon sizes in ExtensionUtils. r=dtownsend
2015-11-24 18:20:26 +01:00
David Rajchenbach-Teller
a775946746
Bug 1216972 - OS.File AsyncShutdown for content processes. r=froydnj
...
--HG--
extra : amend_source : 3c491f00ff06c12c710eefcd29fd0b6975bc07f7
extra : transplant_source : %95%E6%5Bet%5E%88%A57%1E%A2N%82%EE%8C%D6%C7X%B2%1D
2015-11-19 00:11:14 +01:00