Граф коммитов

17246 Коммитов

Автор SHA1 Сообщение Дата
vivek 3d2dc59165 Bug 1055264 - Fixed profile image update after sync now r=nalexander
--HG--
extra : commitid : AUR8B4UYuON
extra : rebase_source : d8d54b861530cdd4fa725408018d5963417a8532
extra : amend_source : a3927870a9746ba92b1e2bfe5ca3633fdc2de94e
2015-08-05 00:47:08 +03:00
Sebastian Kaspari bb0cd238e4 Bug 1190597 - isRestrictedProfile() should check app and user restrictions. r=ally
--HG--
extra : commitid : HsY1QUVvLJG
extra : rebase_source : 2097a66b886d1009d60b6437c0b502932992d7fb
extra : amend_source : 5d57ad455e527e3783f7368f59ce47d6158dbddc
2015-08-04 20:27:49 +02:00
Wes Kocher 83a7cbf448 Merge m-c to inbound, a=merge 2015-08-06 18:11:16 -07:00
Ehsan Akhgari 861692c320 Bug 1018504 - Rename the events used after bug 1190082 2015-08-04 21:20:25 -04:00
Geoff Brown 134c995c5d Bug 1184186 - Convert robocop testWebChannel to mochitest-chrome; r=nalexander 2015-08-06 07:27:48 -06:00
Geoff Brown 9f155071bc Bug 1184186 - Convert robocop testVideoDiscovery to mochitest-chrome; r=mfinkle 2015-08-06 07:27:48 -06:00
Geoff Brown c00d94dbf4 Bug 1184186 - Convert robocop testSimpleDiscovery to mochitest-chrome; r=mfinkle 2015-08-06 07:27:48 -06:00
Geoff Brown 05c65e5fbf Bug 1184186 - Convert robocop testSharedPreferences to mochitest-chrome; r=nalexander 2015-08-06 07:27:48 -06:00
Geoff Brown d1e519c530 Bug 1184186 - Convert robocop testSessionFormData to mochitest-chrome; r=mfinkle 2015-08-06 07:27:48 -06:00
Geoff Brown 795518a80c Bug 1184186 - Convert robocop testRestrictedProfiles to mochitest-chrome; r=mfinkle 2015-08-06 07:27:47 -06:00
Geoff Brown b30d582660 Bug 1184186 - Convert robocop testReaderView to mochitest-chrome; r=margaret 2015-08-06 07:27:47 -06:00
Geoff Brown 567856510b Bug 1184186 - Convert robocop testOfflinePage to mochitest-chrome; r=mfinkle 2015-08-06 07:27:47 -06:00
Geoff Brown 11e1eab85a Bug 1184186 - Convert robocop testNetworkManager to mochitest-chrome; r=mfinkle 2015-08-06 07:27:47 -06:00
Geoff Brown 210dbe66f4 Bug 1184186 - Convert robocop testMigrateUI to mochitest-chrome; r=margaret 2015-08-06 07:27:47 -06:00
Geoff Brown bd7b8ae053 Bug 1184186 - Convert robocop testJNI to mochitest-chrome; r=nalexander 2015-08-06 07:27:47 -06:00
Geoff Brown 75d8d2ebc9 Bug 1184186 - Convert robocop testJavaAddons to mochitest-chrome; r=nalexander 2015-08-06 07:27:47 -06:00
Geoff Brown 4a3307ac9d Bug 1184186 - Convert robocop testHomeProvider to mochitest-chrome; r=margaret 2015-08-06 07:27:47 -06:00
Carsten "Tomcat" Book ba03e3c181 Backed out 2 changesets (bug 1016555, bug 1189427) for making Android 4.3 API11+ debug X3 perma fail in test_ev_certs.js
Backed out changeset ebd4e3880403 (bug 1189427)
Backed out changeset 331e489c7534 (bug 1016555)
2015-08-06 11:51:27 +02:00
Gijs Kruitbosch 127aeefe17 Bug 1182778, r=margaret,f=bz
--HG--
extra : commitid : ATLsconKiIq
extra : rebase_source : 4e6c3207ce438c4429dc32695dcbc4fbf5a2c022
2015-07-17 13:30:42 +01:00
Sebastian Kaspari 752f0c6e63 Bug 1190982 - Restricted Profiles: Fix key of DISALLOW_IMPORT_SETTINGS restriction. r=ally
--HG--
extra : commitid : IaP1ATNTB9D
extra : rebase_source : 00737d77476115196fb05eadb74589bb55722ca0
extra : amend_source : 37deaf53654011cd95538b9e2670818dec474d6f
2015-08-04 20:14:16 +02:00
Mark Capella 81c2c280e9 Bug 1191161 - p2 - Remove OptionalGeneratedParameter, which no longer has any meaning, r=jchen 2015-08-06 01:55:29 -04:00
Mark Capella a715087aff Bug 1191161 - p1 - Merge WrapEntireClassForJNI into WrapElementForJNI, r=jchen 2015-08-06 01:55:29 -04:00
Margaret Leibovic 7e5cfa466d Bug 1132591 - Unpin shortcut tabs when navigating to a new host. r=mcomella
--HG--
extra : commitid : 9YghmSCOxop
extra : rebase_source : ee33ba044d4b102b2d3b1dea01427f9ab6e08bd2
2015-07-16 11:01:03 -07:00
Nick Alexander 3788437b16 Bug 1190940 - Handle MOZ_NATIVE_DEVICES and MOZ_WEBRTC in Gradle build. r=sebastian
This is an information sharing review request.  This patch
demonstrates two ways to handle static build flags in the Java source
base.

For MOZ_NATIVE_DEVICES, we /exclude/ certain Java source files.  This
is unwieldy but works fine.

For MOZ_WEBRTC, we selectively /include/ certain Javas source
directories.  We symlink the directories into the objdir so that the
IntelliJ configuration remains entirely under the project directory --
IJ really doesn't like it when sources are outside of the project
content root.  Since two source directories declare the same package
(org.webrtc.videoengine) we can't symlink deep in the package
hierarchy.  Therefore, we add top-level source directories sibling to
src/main.

--HG--
extra : commitid : 2huDQAbl5NJ
extra : rebase_source : 8171c7e6944722d6d2f772ea9fae710eb2ecaec4
2015-08-04 10:01:26 -07:00
Jonathan Almeida [:jonalmeida] 10cd0eb56a Bug 1184211 - Replace TwoWayView in SearchBar with RecyclerView. r=sebastian
- Also includes changes from bug 1158291 applied on top of the re-written view.

CLOSED TREE

--HG--
extra : amend_source : 51b075ef494ac192230c49910caed1a87749e3e7
2015-07-22 21:06:33 -07:00
Carsten "Tomcat" Book 57a966656a merge mozilla-inbound to mozilla-central a=merge 2015-08-04 13:01:07 +02:00
Chenxia Liu 36fcd19a2d Backout bug 1185173 for accidental landing. r=bustage DONTBUILD
--HG--
extra : commitid : ruW5wmDxF6
2015-08-03 18:34:58 -07:00
Chenxia Liu a59a9d6068 Backed out 2d12d2f2f450 (bug 1138560) for duplication. r=dupe DONTBUILD
--HG--
extra : commitid : 7k3vHdv0raU
extra : amend_source : 1bfa744ed79b747dd3af042272e09d58275e6891
2015-08-03 18:30:52 -07:00
Chenxia Liu fed7edd114 Bug 1185173 - Add support for Passive Mixed Content. r=margaret
--HG--
extra : commitid : 5pM7lIYdkly
extra : rebase_source : b20c1847af7bab94762f1e2e12a2fae9a6082d41
2015-07-23 16:10:36 -07:00
Margaret Leibovic 3cd18c8604 Bug 1018504 - (Part 2) Mute/unmute tab when tapping audio indicator. r=mhaigh
--HG--
extra : commitid : 9syZVptHbWT
extra : rebase_source : c1aa172d72e2e023056bc2038cba2d2cc725c810
2015-07-31 11:32:46 -07:00
Margaret Leibovic f74e42789d Bug 1018504 - (Part 1) Add indicator to show which tab is playing sound. r=mhaigh
--HG--
extra : commitid : 6uFyuLLyATu
extra : rebase_source : 532f6adc6d2d123f2df4ea0ecda652542a8a7c31
2015-07-31 11:08:26 -07:00
Nikhil Marathe 970731b146 Bug 1153499 - Enable push and sw prefs. r=dougt,ehsan
--HG--
extra : commitid : GQaiqrErWLz
extra : rebase_source : 3f01566803616b221b883b51ab079d8868e8e502
extra : source : 06a05093fc417449b9458fa88105e863acddef8d
2015-07-15 13:12:44 -07:00
Wes Kocher de08e9e79c Merge m-c to inbound, a=merge 2015-08-05 16:47:52 -07:00
Richard Barnes dea6d4077f Bug 1016555 - Disable OCSP checking for certificates covered by OneCRL 2015-08-05 17:26:40 -04:00
Jim Chen ca25fd4683 Bug 1189818 - Remove jsconsole-clhandler and nsDefaultCLH in Fennec; r=mfinkle
Fennec doesn't use jsconsole-clhandler or nsDefaultCLH because it has
its own CLH, BrowserCLH.js, but they do take up a small but measurable
amount of time on startup.
2015-08-04 17:47:28 -04:00
Jim Chen 11d1c03111 Bug 1187552 - Make NativeJSContainer use direct ownership model; r=snorp
Make NativeJSContainer/NativeJSObject Java objects own their
corresponding C++ objects directly, to reduce an extra
allocation/deallocation for each object and to simplify code.
2015-08-04 17:47:28 -04:00
Jim Chen 7706596d62 Bug 1186467 - Make NativeJSContainer and NativeJSObject extend JNIObject; r=snorp
JNIObject is the base class for any class that wish to use per-instance
native methods. It encapsulates the long native pointer that used to be
in NativeJSContainer.
2015-08-04 17:47:28 -04:00
Jan-Ivar Bruaroey 0ccb51ddc8 Bug 1175523 - Update most (but not all) tests to use elem.srcObject over .mozSrcObject. r=pehrsons
--HG--
extra : rebase_source : bac0027f4bf5d75b8730c44a10141c114002633b
2015-07-14 10:12:31 -04:00
Geoff Brown 9608ca1de3 Bug 1184186 - Convert robocop testDeviceSearchEngine to mochitest-chrome; r=mfinkle 2015-08-03 12:00:55 -06:00
Geoff Brown f3517986d5 Bug 1184186 - Convert robocop testDesktopUserAgent to mochitest-chrome; r=mfinkle 2015-08-03 12:00:55 -06:00
Geoff Brown a7126d74a6 Bug 1184186 - Convert robocop testDebuggerServer to mochitest-chrome; r=jryans 2015-08-03 12:00:55 -06:00
Geoff Brown 7214023fcf Bug 1184186 - Convert robocop testAndroidLog to mochitest-chrome; r=myk 2015-08-03 12:00:55 -06:00
Geoff Brown 4286569056 Bug 1184186 - Convert robocop testAccounts to mochitest-chrome; r=rnewman 2015-08-03 12:00:55 -06:00
Geoff Brown b0eb7577bf Bug 1184186 - Convert robocop testResourceSubstitutions to mochitest-chrome; r=nalexander 2015-08-03 12:00:55 -06:00
Geoff Brown e2c11b08fe Bug 1184186 - Convert robocop testAboutLogins to mochitest-chrome; r=ally 2015-08-03 09:28:35 -06:00
Geoff Brown d628391e18 Bug 1184186 - Convert robocop testAppConstants to mochitest-chrome; r=nalexander 2015-08-03 09:28:33 -06:00
Geoff Brown dde99300fe Bug 1184186 - Add a mochitest-chrome manifest for Android; r=nalexander 2015-08-03 09:28:32 -06:00
Carsten "Tomcat" Book 6b441cd90a merge mozilla-inbound to mozilla-central a=merge 2015-08-03 13:56:39 +02:00
Kartikaya Gupta 59b72bd9f4 Bug 1189879 - Don't use a CSS viewport height of 480 in desktop mode; compute it from the screen aspect ratio. r=snorp 2015-07-31 16:07:35 -04:00
Ryan VanderMeulen 7dc3f4954e Merge m-c to inbound. a=merge
CLOSED TREE
2015-07-31 15:05:02 -04:00
Karim Benhmida 51b801345e Bug 1188145 - Add Telemetry for Voice input. r=liuche
--HG--
extra : transplant_source : %5Co%F8%608%E6%F5%3ES%BC%0E%C5%B7%F9%BC%8F%CCJO%7F
2015-07-29 15:26:10 -07:00
Karim Benhmida 63560435e6 Bug 1188146 - Add Telemetry for QR code input. r=liuche
--HG--
extra : transplant_source : %88%93%EA%5B%88%BFkN%CC6%84C%ED%8B%C4%2C%5B%BCB%0A
2015-07-29 15:29:57 -07:00
dominique vincent 45c7a6aa25 Bug 1184937 - Hide cycling zoom button and set a default level of zoom in config. r=mcomella 2015-07-31 08:42:50 +02:00
Sebastian Kaspari 44c14baf93 Bug 1125977 - Restricted profiles: Hide setting to set master password. r=ally
--HG--
extra : commitid : 20fbuH5Hyzs
extra : rebase_source : bafc4e8840ae8f53ee36be0937530459a6e71ae0
2015-07-31 10:19:46 +02:00
Sebastian Kaspari 83eed0f628 Bug 1125979 - Restricted profiles: Hide Settings > Privacy > Clear private data. r=ally
--HG--
extra : commitid : 2nl5bcmBIo6
extra : rebase_source : 4a040a7deb330f901a97f8eef7c86d46fc29ce38
2015-07-31 10:18:59 +02:00
Sebastian Kaspari 2592d93a06 Bug 1189233 - Restricted profiles: Block access to about:config. r=ally
--HG--
extra : commitid : 2ZnTCRM53w2
extra : amend_source : 9f12278df5598a9789bd0199b0b1ffa51f879eac
2015-07-31 10:16:50 +02:00
Sebastian Kaspari cf8a9f962f Bug 1188905 - Restricted profiles: Prevent clearing history. r=margaret
--HG--
extra : commitid : 5UXciGuiA05
extra : rebase_source : 246fed443e3d45efd9127a71f69f0e2254db0ebe
2015-07-31 09:59:01 +02:00
Sebastian Kaspari 46be8d30e9 Bug 1184094 - testRestrictions: No restrictions should be enforced when using a normal profile. r=margaret
--HG--
extra : commitid : 1a33HBRndFg
extra : amend_source : 81204c83d132f941044834367b27da03fb6e4014
2015-07-31 09:49:04 +02:00
Sebastian Kaspari 58e78a3578 Bug 1125975 - Restricted profiles: Hide display settings. r=margaret
--HG--
extra : commitid : 97BeGRE6Zj3
extra : rebase_source : de8a3119fb6519d9addb35b1164f76aa963575ad
2015-07-31 09:45:40 +02:00
Allison Naaktgeboren a34fb08ce2 Bug 1183234 - Telemetry probe for usage of about:logins UI interactions.r,p=vladan 2015-07-30 13:36:51 -07:00
Allison Naaktgeboren bd17f298fa Bug 1180795 - KidFox: Disable first-run screen for restricted profile.r=sebastian 2015-07-30 13:02:10 -07:00
Kartikaya Gupta bd57be7daa Bug 1127901 follow-up - Fix a comment. r=me 2015-07-31 13:08:14 -04:00
Kartikaya Gupta 61494b26bd Bug 1189921 - Get rid of the overscroll color in LayerRenderer. r=mfinkle 2015-08-01 00:03:22 -04:00
Wes Kocher 3df52d9ecd Merge m-c to fx-team, a=merge 2015-07-31 17:15:43 -07:00
Allison Naaktgeboren 9533687fbc Bug 1189447 - No default bookmarks in Kidfox.r=sebastian 2015-07-31 16:19:38 -07:00
Allison Naaktgeboren 649781b097 Bug 1185780 - disable save if you delete the entire password in about:logins.r=liuche 2015-07-31 16:17:00 -07:00
Mark Capella 576ec5e5b3 Bug 1188741 - Text selection action bar not appearing, r=kats 2015-07-31 17:25:29 -04:00
Chenxia Liu 1e670272fa Bug 1189089 - Update Tracking Protection icon to grey stripe, not white. r=mhaigh
--HG--
extra : commitid : 5VQXpWxXnca
extra : rebase_source : 76e651389fde5d27be51152bb8e16fdb3e702a19
2015-07-30 16:52:24 -07:00
Chenxia Liu 7f88785dd8 Bug 1187107 - Add "Learn more" link about Mixed Content to Site Identity doorhanger. r=mhaigh
--HG--
extra : commitid : HL6BYHUa8LG
extra : rebase_source : a4756e2f0cedf4b270da2365c0128377ab48f49b
2015-07-30 18:44:06 -07:00
Michael Comella b916886a4e Bug 1189585 - Change SearchEngineBar to use the DrawableUtil class. r=sebastian
--HG--
extra : commitid : Azeh6bAK8qa
extra : rebase_source : fb334d71e39e3ad3e06f1c0bc3f05f947888ba85
2015-07-30 18:41:13 -07:00
Michael Comella a434eb2d77 Bug 1189585 - Add DrawableUtil class. r=sebastian
This includes a method to tint drawables.

--HG--
extra : commitid : DbqlZdnw4ZH
extra : rebase_source : 75133c6aa6add290ce62432daaca0a33a145f0a2
2015-07-30 19:16:41 -07:00
Michael Comella f709cd9f13 Bug 1175532 - Only add CATEGORY_BROWSABLE to intent & android-app uris. r=margaret
This patch is originally from bug 1182328 and r+'d there.

--HG--
extra : commitid : IqJshUI635a
extra : rebase_source : 33ccf13fafcc9d73a1ae1144d5b34eaf44c181b2
extra : source : 86e571eafb2fc942c7e36e1b842c98a4e3c5b46b
2015-07-10 16:42:00 -07:00
Michael Comella 5339ae3bc9 Bug 1175532 - Use Intent.parseUri for intent:// & android-app://. r=margaret
We now specify no flags to Intent.parseUri so it can accept and parse arbitrary
URIs.

This patch is originally from bug 1182328 and r+'d there.

--HG--
extra : commitid : iZzNuK1lTR
extra : rebase_source : 73112ac5561c5312282c2490b9ac81a6a29d93ca
extra : source : b9ac6d0b5f4c8116f1ecf490141468a4a47ffd27
2015-07-10 16:40:00 -07:00
Allison Naaktgeboren ee1f7d2d9a Bug 1187059 - change the header to use light font weight on about:logins.r=liuche 2015-07-30 11:56:49 -07:00
Michael Comella 219be0cbf1 Bug 1187538 - Wrap tab tray thumbnails in TabThumbnailWrapper and add id. r=mhaigh
I don't have a device to screen cast to test this makes state_recording work in
*_tabs_item_cell, but following the code, the bits to turn state_recording on
or off are in place in TabsListLayout and presumably working for tabs_item_row,
so it should automatically work for tabs_item_cell, and the same bits are in
TabsGridLayout so this should presumably work for new_tablet_tabs_item_cell.

I verified the changes do not cause crashing or a difference in appearance.

--HG--
extra : commitid : 6UL2Wf814Ax
extra : rebase_source : 184c48b2f5d8aa866bca1c472caabfda8d5a2223
2015-07-28 11:58:25 -07:00
Michael Comella b96edf057a Bug 1188557 - Update ThemedView template to import the correct LWT. r=mhaigh
I believe I just used an IDE to update the files last time, meaning the
template never got updated.

This was originally implemented but no longer used in bug 1177611.

--HG--
extra : commitid : 6Wp4qTCjyTk
extra : rebase_source : 215f9eef9e203a4e2cbf26051204c6b25bdf3779
extra : source : 14e9ba975f55242c773420d77143717acf7f8456
2015-07-24 17:09:35 -07:00
Sebastian Kaspari 208eda38c4 Bug 1125309 - Restricted profiles: Hide all Location Services features and related UI. r=margaret
--HG--
extra : commitid : 42c8GrRQAla
extra : amend_source : b3babc754a9bce1d26fcde235ed2d88aae431d1d
2015-07-30 20:18:03 +02:00
Sebastian Kaspari a750930a71 Bug 1125283 - Restricted profiles: Disable snippets (promotional banner) support. r=margaret
--HG--
extra : commitid : L9P2X923tuL
extra : amend_source : fd89d8944fc4e0a6c7aa73becdacd5a4934eddfa
2015-07-30 20:12:58 +02:00
Sebastian Kaspari 17fae17791 Bug 1125293 - Restricted profiles: Check global restrictions in isAllowed(). r=ally
This effectively hides all sync features and related UI for restricted profiles
because this is controlled by the DISALLOW_MODIFY_ACCOUNTS restriction of the
system.

--HG--
extra : commitid : 3wHdNQwo3u3
extra : amend_source : 97a9936ddddd30d3da16801675b65837addcae70
2015-07-30 20:00:16 +02:00
Sebastian Kaspari 2b86ebbaeb Bug 1125290 - Hide private browsing support and all related UI. r=margaret
--HG--
extra : commitid : 2LWSL6EAKjQ
extra : amend_source : fef3505c7afebef412827a3bbc99ca92166d97da
2015-07-30 19:55:18 +02:00
Sebastian Kaspari fd4e2c2e8c Bug 1125315 - Restricted profiles: Hide setting "Customize > Home". r=ally
--HG--
extra : commitid : DYDNNfg9MCz
extra : amend_source : c0bf203ca0e6f01fc1bf2081bddd933e736bc88e
2015-07-30 19:52:54 +02:00
Sebastian Kaspari f5fdc72920 Bug 1125288 - Restricted profiles: Hide all developer tools and related UI. r=margaret
--HG--
extra : commitid : 3IGiZUnPlf4
extra : amend_source : 2b8f787cd6b45a941097f8e183561039c8e8a61c
2015-07-30 19:48:38 +02:00
Sebastian Kaspari d7f1de6d04 Bug 1187260 - Simplify RestrictedProfiles class. r=ally
This patch transforms RestrictedProfiles to delegate isAllowed() and
canLoadUrl() calls to an object implementing the RestrictionConfiguration
interface.

DefaultConfiguration, GuestProfileConfiguration and
RestrictedProfileConfiguration are implementing RestrictionConfiguration
and will take care of handling the restrictions for the different types
of profiles.

--HG--
extra : commitid : LQ2YsdyG6oR
extra : rebase_source : 015f7f02c6e7fded16d3811a71f0ae23547e5f71
2015-07-24 19:47:31 +02:00
vivek 9f7a7b0482 Bug 1181284 - Enable swipe to refresh on remote panel list based on scroll position r=mcomella.
--HG--
extra : rebase_source : 008f67dcdc563ea510f53ac26f58d49fb4bceaa1
extra : amend_source : 56eee0b512c970401b4be81953d6c63da2c34348
extra : histedit_source : 39a020e816e28b3786d3be084750f3df7223a2a2
2015-07-29 23:08:38 +03:00
Sebastian Kaspari f4aea2e31e Bug 1187278 - Adjust tabContentStart for "scrollable tabs" on phones. r=mhaigh
--HG--
extra : commitid : KO3q4vghhpO
extra : rebase_source : 3c5379041bf775926fd50112c344e309e8cdb298
extra : amend_source : 2912682c1253280bebd1dab7cb5222a84e3a04a4
2015-07-28 19:20:02 +02:00
Ryan VanderMeulen ee5201bc8f Merge m-c to fx-team. a=merge 2015-08-03 15:04:31 -04:00
Michael Comella 9311929b7b Bug 1189944 - Annotate DrawableUtil method. r=sebastian
This *just works* with Gradle. :)

--HG--
extra : commitid : JQa6hrJM1QV
extra : rebase_source : ac0d143fc16a3b225a54412169d3c886832bc5ae
2015-07-31 14:34:44 -07:00
Martyn Haigh 7c50e01340 Bug 1187984 - Update about:privatebrowsing to include information about TP; r=liuche
--HG--
extra : commitid : 4rzcE5psRjn
extra : rebase_source : e4798ca421c5ab039a95a898743e7e59805e17dc
2015-07-31 14:04:46 +01:00
Wes Kocher 19cf04fb40 Merge m-c to fx-team, a=merge 2015-07-29 20:22:12 -07:00
Wes Kocher 10301118e8 Merge inbound to central, a=merge 2015-07-29 18:12:11 -07:00
Mark Finkle 517cb01e92 Bug 1188609 - Remove mirroring support from RokuApp (Android) r=margaret 2015-07-29 16:09:29 -04:00
Chenxia Liu 9d6f8b582d Bug 1177576 - Update padding. r=margaret
--HG--
extra : commitid : LA4c0UivM4o
extra : rebase_source : 2b3f6ea7d437924828be6d83f5981ec2df630939
2015-07-23 19:31:11 -07:00
Chenxia Liu e14a6d3e9f Bug 1177576 - Update styling for Owner text. r=ally
--HG--
extra : commitid : 9732xpWZWOV
extra : rebase_source : 081234d3401a3982e4744c9eb0f91abe562d8dab
2015-07-21 18:28:48 -07:00
Chenxia Liu 358872f8b1 Bug 1177576 - Update icons for different Mixed Content Blocking states. r=margaret
--HG--
rename : mobile/android/base/resources/drawable-hdpi/lock_identified.png => mobile/android/base/resources/drawable-hdpi/lock_secure.png
rename : mobile/android/base/resources/drawable-xhdpi/lock_identified.png => mobile/android/base/resources/drawable-xhdpi/lock_secure.png
rename : mobile/android/base/resources/drawable-xxhdpi/lock_identified.png => mobile/android/base/resources/drawable-xxhdpi/lock_secure.png
extra : commitid : J12cFSFgibk
extra : rebase_source : a1903f4c1a54d704fd30490574689304ba34f851
2015-07-21 18:10:32 -07:00
Ryan VanderMeulen e61fe71db0 Merge fx-team to m-c. a=merge 2015-07-29 13:55:46 -04:00
Ryan VanderMeulen 0cdb86e630 Merge fx-team to m-c. a=merge 2015-07-29 13:49:24 -04:00
Chenxia Liu 38d871aea6 Bug 1186260 - Favicon in site info doorhanger is too large when using default favicon. r=margaret
--HG--
extra : commitid : 5Vv8CgE3XTE
extra : rebase_source : d3b4fbb8e6fecde0f4f9d67ab6e0bc66698bce1d
extra : amend_source : c3739697caf0c0fd711ea355c28a9869d4c31c40
2015-07-22 14:45:45 -07:00
Sebastian Kaspari 527af74b4b Bug 1186841 - TabMenuStrip: Draw divider all the way. r=margaret
--HG--
extra : commitid : 6dytiVId1Ta
extra : rebase_source : bc1bde5cd1b336f6eabc44a1bf1972b8e62b1e95
2015-07-23 12:58:03 +02:00
Sebastian Kaspari 563cdc918b Bug 1125289 - Restricted profiles: Disallow browsing about:addons. r=margaret
--HG--
extra : commitid : GQvyhHTw9QA
2015-07-28 14:20:51 +02:00
Giovanny Andres Gongora Granada 6869f90b29 Bug 1183902 - _shareStringWithDefault is unused. r=mcomella
--HG--
extra : commitid : BktCoT1lbEv
2015-07-29 00:43:37 -07:00