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

20295 Коммитов

Автор SHA1 Сообщение Дата
Dylan Roeh 374fa51f6f Bug 1262536 - Report minidump success/failure in CrashReporter. r=snorp 2016-05-17 15:53:15 -05:00
Ryan VanderMeulen 54c922ca84 Merge inbound to m-c. a=merge
CLOSED TREE
2016-05-18 12:02:42 -04:00
Gian-Carlo Pascutto 2826a7e80f Bug 1273353 - Replace usage of deprecated JS String.proto.contains(). r=francois
MozReview-Commit-ID: 4ZCxGdoGs7n

--HG--
extra : rebase_source : f89668d369608dd47446e3f4f4f9af6eb5509424
2016-05-17 20:44:01 +02:00
SUN Haitao b3a61c24e3 Bug 1252650 - Add a 'data' parameter to GeckoThread.createServices. r=kit 2016-04-16 14:19:37 +08:00
Margaret Leibovic 602a351165 Bug 1273173 - Fix reader button telemetry events. r=mcomella
MozReview-Commit-ID: ED2MFgQnh0z

--HG--
extra : rebase_source : cc7ba90d8c27581e4b1439ad69766a66bda3e806
2016-05-16 21:03:15 -07:00
Wes Kocher 4a048a0f4b Merge m-c to fx-team, a=merge 2016-05-17 14:18:01 -07:00
Wes Kocher 1dd8a84da8 Merge fx-team to central, a=merge 2016-05-17 14:15:06 -07:00
danhuang1202 d513a62608 Bug 1271511 - keep reader mode icon visible when exiting from reader mode to source page. r=ahunt
MozReview-Commit-ID: JxNRdXCSFGx

--HG--
extra : transplant_source : %5E%F2%BC%F7y%AE%B1%85%DA%7C%40%8B.%98%FB%B1Y%1A%BD%E0
extra : histedit_source : 431d9e9ef7a208203d4623d5eeaa9071fef3226e
2016-05-10 11:28:07 +08:00
Chenxia Liu 8a2fbc6805 Bug 1268647 - Add missing TabQueuePanel to moz.build. r=bustage 2016-05-16 18:02:53 -07:00
Chenxia Liu 51e317c1a3 Bug 1268647 - Add control. r=sebastian
MozReview-Commit-ID: DRWiGxPDFXC

--HG--
extra : rebase_source : 7e7e07549c12a222bb53ef129b4431aaf64cbda9
2016-05-11 17:22:31 -07:00
Chenxia Liu 82cc64e7ac Bug 1268647 - Add Tab queue panel. r=sebastian
MozReview-Commit-ID: wac02N7Lh6

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/firstrun/DataPanel.java => mobile/android/base/java/org/mozilla/gecko/firstrun/TabQueuePanel.java
extra : rebase_source : 1e1cb94a83d32d75c1df71488e488e26a511e4a2
2016-05-10 20:46:58 -07:00
Chenxia Liu 3ef1b7e6b4 Bug 1268647 - Add new sync slide. r=sebastian
MozReview-Commit-ID: 69YpFgmIN80

--HG--
extra : rebase_source : aca93ae276b39a9a222fc9b7ce6530338122dcdf
2016-05-10 19:52:30 -07:00
Chenxia Liu 282cc4cde3 Bug 1268647 - Add new basic slides. r=sebastian
MozReview-Commit-ID: AA7FWPiSTsc

--HG--
extra : rebase_source : 41074bfec218106cc4297637e33a0ee9c8e65956
2016-05-10 19:17:40 -07:00
Chenxia Liu 0fef758e7c Bug 1268647 - Add crushed images. r=sebastian
MozReview-Commit-ID: 1hCP0OFNO74

--HG--
extra : rebase_source : e76e1bd7ed2384517ab6fb5cf893eb21faf126ac
2016-05-10 19:12:30 -07:00
Chenxia Liu 94eb985d2c Bug 1268647 - Add to strings.xml.in. r=sebastian
MozReview-Commit-ID: Lb9ajPkg7K6

--HG--
extra : rebase_source : a448cb51774155ed53785157d68b995efe481076
2016-05-10 18:37:24 -07:00
Chenxia Liu 07b83396ba Bug 1268647 - Add localized strings. r=sebastian
MozReview-Commit-ID: 3FMKuGWp9Gr

--HG--
extra : rebase_source : 46e73c687dacab1f99b513ea21fd160678bd7119
2016-05-10 18:27:35 -07:00
Chenxia Liu 77cbb4a5ec Bug 1268647 - Add Switch to layout. r=sebastian
MozReview-Commit-ID: 1CCXAzqVVvO

--HG--
rename : mobile/android/base/resources/layout/firstrun_basepanel_fragment.xml => mobile/android/base/resources/layout/firstrun_basepanel_checkable_fragment.xml
extra : rebase_source : 1fb8026eff4eff6264b618e3cd81662f4e87b5c4
2016-05-10 17:24:08 -07:00
Chenxia Liu 6ade2aca8e Bug 1268647 - Remove obsolete firstrun. r=sebastian
MozReview-Commit-ID: JCXn9wLMhcV

--HG--
extra : rebase_source : f0fbdc697e2d6ad893c32bf605aa88b0e4c96e73
2016-05-11 17:22:42 -07:00
Michael Comella 2614732244 Bug 1253319 - Increment core ping version number. r=me
I forgot to do this in landing the initial patch series.

MozReview-Commit-ID: 1nJ7z4y3q75
2016-05-16 15:51:35 -07:00
Matthew Wein 3540dea819 Bug 1267402 - Implement chrome.pageAction.onClicked on Android. r=kmag, margaret
MozReview-Commit-ID: EJI224vD2Za
2016-05-13 18:36:06 -07:00
Andrzej Hunt dec2b40772 Bug 1259078 - Post: remove unneeded reading list panel resources and code r=liuche
MozReview-Commit-ID: Yoghq4MQRc

--HG--
extra : rebase_source : be6ad845aad794de363180a760a561e3107a6334
extra : histedit_source : 2fbabe092716d0eb9da914b6ffca60845ab580bb
2016-05-04 15:35:57 -07:00
Andrzej Hunt fc34d54579 Bug 1259078 - Remove reading list panel from HomePanels r=liuche
MozReview-Commit-ID: C09O3sOmpxq

--HG--
extra : rebase_source : a943627849ebcfe9cc6c6391b7ceec393343c569
extra : histedit_source : 45c0d9c6ba0f83783483bad080cd72f7273b7463
2016-05-04 15:35:50 -07:00
Michael Comella a4c83938ff Bug 1253319 - getAndZero search counts in core ping builder. r=sebastian
MozReview-Commit-ID: DlVnnKMyxDP

--HG--
extra : rebase_source : 02d1a2fe1ae646d0827fb0dfd35faabed1283645
extra : histedit_source : 1088d07827ceb928688dd5e4048c8fc4e0bc28e3
2016-05-11 15:47:07 -07:00
Michael Comella e07a93f35b Bug 1253319 - Call incrementSearch in BrowserApp. r=sebastian
MozReview-Commit-ID: 26dHCmtsTUq

--HG--
extra : rebase_source : 3216883fc22b4e37acfd5ca76774dcb131021284
extra : histedit_source : 9ad008e370273fe2f27fb2324e90f574788f85a8
2016-05-11 16:45:53 -07:00
Michael Comella a22f13635d Bug 1253319 - Add SearchCountMeasurements & tests. r=sebastian
MozReview-Commit-ID: 1wRAG1oy1d

--HG--
extra : rebase_source : cfe119ce65de40d1193467a3c2fd53b98b150377
extra : histedit_source : 2893661c5a3998a067437fd4603bd90ba01c64bd
2016-05-12 17:06:43 -07:00
Michael Comella 9b29ebd0df Bug 1272817 - Return early if file is empty + regression test. r=sebastian
MozReview-Commit-ID: FPdDr2t1wEy

--HG--
extra : rebase_source : 4fd7975262ac3af23d0a5f6b921cbe7a0863760e
2016-05-13 18:14:25 -07:00
Michael Comella cee6eaeeaa Bug 1261617 - Add UITelemetry for search counts. r=mfinkle
I largerly kept this patch the same as Finkle's initial revision except that
I don't include the engine identifiers due to bug 1272166.

MozReview-Commit-ID: 84672CDOOVX

--HG--
extra : rebase_source : 77c63ad35ec1150400e5bf672043c97f161b9bdd
2016-05-11 17:23:48 -07:00
Michael Kaply ba06994d83 Bug 851969 - Add Amazon search suggestions to Android - r=margaret 2016-05-16 10:47:34 -05:00
Andrzej Hunt a7f1ecfbf0 Bug 1272391 - Send Action instead of Cancel from SimpleHelperUI button r=sebastian
I didn't pay attention while copying telemetry events. We send cancel when dismissing
the prompt, action when the user selects the suggested prompt action.

MozReview-Commit-ID: IAOMRRemCiz

--HG--
extra : amend_source : 0a940fa3109009c85d81765cd4380cd7c227814d
2016-05-12 10:56:50 -07:00
Phil Ringnalda 2f5b16f2a4 Merge m-c to f-t 2016-05-14 14:56:41 -07:00
Phil Ringnalda 082cfb6b13 Bug 1271103 followup, placate checkstyle with a space, a=nnoyance 2016-05-14 14:54:59 -07:00
Mark Capella 3301837485 Bug 1262916 - Option to add custom search engine should disappear when site is added, r=margaret, florian 2016-05-14 16:43:51 -04:00
Phil Ringnalda 2be4cee4d3 Merge f-t to m-c, a=merge 2016-05-14 13:04:50 -07:00
Sebastian Kaspari 586d866e46 Bug 1272021 - FaviconView.updateImageInternal(): Exit early if bitmap is null. r=ahunt
MozReview-Commit-ID: 2ZtAMI1XMoC

--HG--
extra : rebase_source : 68f774bea297f45cbf5c0cdb70398227b26b4c27
2016-05-11 20:00:41 +02:00
Sebastian Kaspari c90925bcc2 Bug 1271698 - Add Switchboard flags for URL bar changes. r=margaret
* urlbar-show-origin-only: Only show origin in URL bar instead of full URL (Bug 1236431)
* urlbar-show-ev-cert-owner: Show name of organization (EV cert) instead of full URL in URL bar (Bug 1249594)

MozReview-Commit-ID: AxbrB1gsobh

--HG--
extra : rebase_source : 185088d363fdfe9ba395caa07f05b9c17201e19a
extra : amend_source : 7879f2f122892a1af93f29c9e64f1076ee20191e
2016-05-11 11:55:06 +02:00
Michael Comella e976d0a153 Bug 1272166 - Update UI telemetry logging. r=margaret
MozReview-Commit-ID: Gzb2qdm3TuT

--HG--
extra : rebase_source : 9f81f860bbae7b61245aae5a02131c8400a1035c
2016-05-11 17:30:34 -07:00
Dylan Roeh 609b4c21e0 Bug 1271103 - Remove possible race condition in GLController.java. r=snorp 2016-05-13 13:43:06 -05:00
Jan-Ivar Bruaroey 93cbd13c88 Bug 802326 - remove "No Video" and "No Audio" choices in cam+mic permission prompt on android. r=sebastian
MozReview-Commit-ID: DyYcKkbpBVl

--HG--
extra : rebase_source : f5fee0f6b283ddcceb7e79b352c7afabd6af6f32
2016-05-05 22:41:26 -04:00
Carsten "Tomcat" Book 50dfc69f35 merge mozilla-inbound to mozilla-central a=merge 2016-05-13 11:59:20 +02:00
L. David Baron d097996b85 Bug 1111440 - Replace -moz- prefixed logical margin/padding/border properties with their standard versions. r=heycam
This patch was generated by the command:
  find . -name "*.css" -exec sed -i -f mozpropsub {} \;
in the root of a mozilla-central tree, with the file mozpropsub
containing the contents:
s/-moz-padding-end\>/padding-inline-end/g
s/-moz-padding-start\>/padding-inline-start/g
s/-moz-margin-end\>/margin-inline-end/g
s/-moz-margin-start\>/margin-inline-start/g
s/-moz-border-end\>/border-inline-end/g
s/-moz-border-end-color\>/border-inline-end-color/g
s/-moz-border-end-style\>/border-inline-end-style/g
s/-moz-border-end-width\>/border-inline-end-width/g
s/-moz-border-start\>/border-inline-start/g
s/-moz-border-start-color\>/border-inline-start-color/g
s/-moz-border-start-style\>/border-inline-start-style/g
s/-moz-border-start-width\>/border-inline-start-width/g

While I didn't manually review all the changes, I did review the list of
files, and manually reviewed the changes in the files that I thought
were more interesting.

Note that there are a few tests that should be fixed up as well, but
I'll do that in a later patch.

MozReview-Commit-ID: EiQTuuV0MNQ
2016-05-12 22:19:58 -07:00
Michael Comella 9e8fce6617 Bug 1270213 - Add comment explaining pruning behavior. r=me
This was prompted in review and was discussed in bug so I didn't request
review.

MozReview-Commit-ID: ERgQ3hQnZai

--HG--
extra : rebase_source : c197b93febf275265e0d13891b241ae93c465a0d
2016-05-12 10:55:20 -07:00
Michael Comella 83ba5b69af Bug 1270213 - Move PingStore* to doc ID filenames. r=sebastian
The code is now expected to compile.

MozReview-Commit-ID: 76dHW9gmyTl

--HG--
extra : rebase_source : a9e6578133e1a7d935af4943c7a1c92ece7eedf5
2016-05-05 17:49:47 -07:00
Michael Comella e0f8ab936b Bug 1270213 - Update TelemetryUploadService to use doc ID. r=sebastian
This is not yet expected to compile.

MozReview-Commit-ID: FQF6z5ni6jC

--HG--
extra : rebase_source : bd7ccc97e44a17f66122242d28e030762c645ee9
2016-05-05 16:52:58 -07:00
Michael Comella efe06ac7a9 Bug 1270213 - Update TelemetryPing & builders to use docID. r=sebastian
Future patches will change the remaining code - This is not yet expected
to compile.

MozReview-Commit-ID: FpqfThcV7dj

--HG--
extra : rebase_source : e01ea217aadd88853d6643c5642d866ba796aa81
2016-05-05 16:32:40 -07:00
Michael Comella 00cba0fcf9 Bug 1270213 - Factor lockAndReadJSONFromFile out from getAllPings. r=sebastian r=sebastian
MozReview-Commit-ID: HtUkO0n50px

--HG--
extra : rebase_source : 03a91752862b02afd0319d9c9f13894cf1cad55b
2016-05-05 14:37:02 -07:00
Michael Comella b712f57236 Bug 1270213 - Add UUIDUtil.isUUID. r=sebastian
MozReview-Commit-ID: S5BbzEVEka

--HG--
extra : rebase_source : 6ae0a62d4747cb2fd9df23a0604918461c5359b1
2016-05-05 16:56:38 -07:00
Michael Comella ded6c511f3 Bug 1270213 - Add FileLastModifiedComparator. r=sebastian
MozReview-Commit-ID: 6JbQoqYbZsn

--HG--
extra : rebase_source : 491b337169b724467db53a584b147e751ad50a05
2016-05-05 14:42:34 -07:00
Michael Comella 56717d85c7 Bug 1270213 - Move generic file filters to FileUtil. r=sebastian
These will be used by the Store in the upcoming patches.

MozReview-Commit-ID: 7sPICagdLMu

--HG--
extra : rebase_source : a7ec0a82f48fde4480ab89ec6f39f6e073c31c71
2016-05-05 17:10:57 -07:00
Jan Henning be9ba0fd90 Bug 1266339 - Part 2 - Delete outdated sessionstore.bak files when restoring tabs automatically. r=margaret
sessionstore.bak, which powers the "tabs from last time" display, is only updated with the data of the previous session if the user chooses to "never restore" tabs, or if we've temporarily disabled session restoring because of too many successive crashes in a row. In all other cases, we restore tabs automatically so sessionstore.bak is never updated with fresh data, meaning its contents get stale pretty soon.

With this patch, we clean up old copies of sessionstore.bak when doing an automatic restore, so they don't linger indefinitely in the "tabs from last time" section of the recent tabs panel.

MozReview-Commit-ID: DrOx5TNwYMv

--HG--
extra : transplant_source : %2Ac%83%F40i%1Ah%3F%B1QI%D6%84%FF%7B%E8%157%F1
extra : histedit_source : 61cc196e844b26e00cf47363c69e6f1672d90f14
2016-04-21 20:43:47 +02:00
Jan Henning fa27d7a370 Bug 1266339 - Part 1 - Move session store file names in GeckoProfile into named constants. r=margaret
MozReview-Commit-ID: 8QESeQ5P6Ys

--HG--
extra : transplant_source : %3F_g%B7%CE%87%A95v%14w%EC%80%CB%10%CB%CB%BB%91%D1
extra : histedit_source : 54eec6a9cd4167a236e6eac1b7e117c919d9654a
2016-04-21 20:28:38 +02:00