Commit graph

550 commits

Author SHA1 Message Date
Gijs Kruitbosch
b30d0cb67b Bug 1299445 - use distribution.ini directly to check if automigration is enabled, r=mkaply
MozReview-Commit-ID: DINI8rnyMfe

--HG--
extra : rebase_source : b215ff2344417c844ffa9f73ed61de0fadf82998
2016-08-31 14:58:23 +01:00
Henrik Skupin
1aa1a59ead Bug 1283919 - Move packaging of Marionette from make to the test archiver r=gps
MozReview-Commit-ID: AOQHcA46bCh

--HG--
extra : rebase_source : e313c669ad0ae999ecba954538572d22ae28b120
2016-08-17 13:43:51 +02:00
Justin Dolske
5547aa8006 Bug 1298208 - followup fix for correct JS type. CLOSED TREE 2016-08-26 15:20:48 -07:00
Justin Dolske
19f629190b Bug 1298208 - FX_MIGRATION_HOMEPAGE_IMPORTED probe is (incorrectly) always true. r=mattn
MozReview-Commit-ID: 6wZUeRTKExw
2016-08-26 13:06:14 -07:00
Wes Kocher
12e25dac0f Backed out changeset 8f30fd1bbbe1 (bug 1298208) for build bustage a=backout 2016-08-25 16:37:44 -07:00
Justin Dolske
adb45e70b6 Bug 1298208 - FX_MIGRATION_HOMEPAGE_IMPORTED probe is (incorrectly) always true. r=MattN
MozReview-Commit-ID: 6wZUeRTKExw

--HG--
extra : rebase_source : 2ddbb5906e29dae6e47af8409031f31ddf2bca80
2016-08-25 15:50:41 -07:00
Gijs Kruitbosch
40188f3de6 Bug 1297479 - create a pref to turn off UI to undo automatic migration for use by funnelcake builds, r=Dolske
MozReview-Commit-ID: JZQuhMxxrXU

--HG--
extra : rebase_source : f796b9504e10aa0e19a57ea312ebe337dcdb1e1d
2016-08-23 19:30:32 +01:00
Ryan VanderMeulen
69113163cf Merge m-c to inbound. a=merge 2016-08-24 09:09:05 -04:00
Jinank Jain
3fc0725787 Bug 1276701 - Remove Windows code from Safari migrator. r=Gijs
MozReview-Commit-ID: CuV2xSmXnq
2016-08-23 14:49:39 -07:00
Gijs Kruitbosch
e8ac5e77fb Bug 1289436 - add telemetry for the length of time we take to import data, r=jaws,bsmedberg
MozReview-Commit-ID: CkbHJVRucr5

--HG--
extra : rebase_source : fc6c698e7df76a54fd7a30d5b840f5d838370c7b
2016-07-26 18:05:08 +01:00
Gijs Kruitbosch
7116496e95 Bug 1289231 - part 2: remove notification after it's been displayed for 3 days, r=dolske
MozReview-Commit-ID: CFARPDu3FnI

--HG--
extra : rebase_source : f740e99b8169f35cfa64812d6465eb31375530ae
2016-07-26 13:14:44 +01:00
Gijs Kruitbosch
8b7f8ba630 Bug 1289231 - show 'undo' notification bar, r=dolske
MozReview-Commit-ID: 1qy7GUSaowb

--HG--
extra : rebase_source : b9b302a0cd99fbf665958b6d4844af831e296287
2016-08-20 12:15:02 +01:00
Gijs Kruitbosch
ad09f51c7d Bug 1289906 - part 2: add more generic telemetry for undo reasons, r=bsmedberg,markh
MozReview-Commit-ID: 1wwLdY2iumV

--HG--
extra : rebase_source : 82c3edba7d04e3574e6480c16d24cfd6d63afa29
2016-08-20 14:15:12 +01:00
Gijs Kruitbosch
53b0c89309 Bug 1289906 - part 1: use an observer to know when the user signs into sync after an undo, r=markh
MozReview-Commit-ID: BPjUVvYdsRG

--HG--
extra : rebase_source : 96b7d88b1774afbbd605ab7e561b766af1431f53
2016-08-22 12:39:39 +01:00
Jared Wein
e6276ea7f5 Bug 1294547 - Enable the comma-spacing rule for eslint. r=felipe
MozReview-Commit-ID: RCSDEvvk2I
2016-08-16 15:44:15 -04:00
Jared Wein
fd84c776c7 Bug 1292042 - Enable the keyword-spacing rule for eslint. Most of this patch was autogenerated by 'eslint --fix'. Files with .xml extension needed to be changed by hand due to limitations of custom plugin. r=markh
MozReview-Commit-ID: EMjJ3yWt9Wt

--HG--
extra : rebase_source : 2b8327e5a7cf0bfd190d696ad5fe475f13faa3cc
2016-08-04 03:28:58 -04:00
Jared Wein
169d66a3ed Bug 1292035 - Enable the space-before-blocks rule for eslint. This patch was generated using 'eslint --fix'. r=markh
MozReview-Commit-ID: 2XVoU05YvES

--HG--
extra : rebase_source : e7ed2d094c21b59dd59476b8930b75da2e6d6980
2016-08-04 03:20:25 -04:00
Gijs Kruitbosch
c99c0d5e93 Bug 1289229 - disable automigration undo if people create/change bookmarks/logins, r=mak
MozReview-Commit-ID: DAoNV9H71Yv

--HG--
extra : rebase_source : b75fce027c28a98566523f54427b7f965e79ad52
2016-07-26 12:48:37 +01:00
Tom Tromey
5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
Carsten "Tomcat" Book
eec8b2656e Merge mozilla-central to autoland 2016-07-02 11:16:11 +02:00
Gijs Kruitbosch
d71d400a4a Bug 1283565 - add telemetry to determine whether undo works and how often it's unavailable due to sync, r=dolske,data-r=bsmedberg
MozReview-Commit-ID: LwFrwbEQLtV

--HG--
extra : transplant_source : %151E%E3%5E%C0%1C%EB%3D%13%99%10%BC%C7%0C%F4%21%EEL%E8
2016-06-30 19:02:46 +01:00
Gijs Kruitbosch
0423031f08 Bug 1283267 - save start time of automigration when we save the finished time, to ensure both actually get written to prefs, r=Dolske
MozReview-Commit-ID: J4foRyWlJTv

--HG--
extra : rebase_source : b0c75e8a66468d063ddfd6cf21bdc0085072d64e
2016-06-29 20:59:23 +01:00
Gijs Kruitbosch
b1bd30f80e Bug 1199678 - recognize MS Edge in MigrationUtils.jsm for default browser detection, r=Dolske
MozReview-Commit-ID: Bmuyv59fRAv

--HG--
extra : rebase_source : 0869e916cf5adda158f417d0a50160a37bc8ff40
2016-06-29 19:37:48 +01:00
Gijs Kruitbosch
51c24100f1 Bug 1281602 - rework automigration telemetry to use an enumerated histogram, r=bsmedberg,dolske
MozReview-Commit-ID: 37XarohGgMN

--HG--
extra : rebase_source : 34134ccfb413eae7d25c811008a8dc647dbbeba4
extra : amend_source : 4d04fc59349673c7f6540fd9468b0d78409262ca
2016-06-23 10:02:59 +01:00
Gijs Kruitbosch
579b36016a Bug 1276694 - store recency of browser data in telemetry when importing to see how good a predictor default browser is, r=dolske,bsmedberg
MozReview-Commit-ID: 16uPNGGDE68

--HG--
extra : rebase_source : fdb3ad8a3429079cb23cddd4a003b03043a95728
2016-05-30 17:10:54 +01:00
Gijs Kruitbosch
a580940405 Bug 1271799 - implement undo functionality in automigration code, r=mak
MozReview-Commit-ID: 28yvZyVimOx

--HG--
extra : rebase_source : 216da87f46d1bb7cde17507431b04b8bbc3367c3
2016-06-20 12:12:28 +01:00
Gijs Kruitbosch
28d158c562 Bug 1283542 - fix profile detection code in AutoMigrate to deal with profile objects instead of identifiers, r=Dolske
MozReview-Commit-ID: KHjsOsxwzb7

--HG--
extra : rebase_source : eaf68fbe779b277efe90471c5f2074cbaa8ddc69
2016-06-30 17:57:33 +01:00
Carsten "Tomcat" Book
2266139ee3 Merge mozilla-central to mozilla-inbound 2016-06-10 15:44:04 +02:00
Gijs Kruitbosch
c7b3a300d9 Bug 1271775 - shut up eslint warning about return value, rs=bustage
MozReview-Commit-ID: ESoog14WDSw

--HG--
extra : rebase_source : b0321f9911090894d6a1167d267289fb64e33a6c
2016-06-10 10:11:51 +01:00
Gijs Kruitbosch
592e9bcfd9 Bug 1271775 - allow bypassing the initial migration dialog, r=jaws
MozReview-Commit-ID: LkhHl7ipGEb

--HG--
extra : rebase_source : f61fd08c394196468a7594acf8bb8926da04d0f2
2016-06-01 19:00:53 +01:00
Jonathan Watt
b15368cfcb Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
Gijs Kruitbosch
b46aa62ca8 Bug 1275114 - add telemetry to determine how to make browser choices when automatically migrating on first profile startup, r=bsmedberg,Dolske
MozReview-Commit-ID: zVmKTBzAS9

--HG--
extra : rebase_source : 3a311a15534ffe769df550ca4fac320c6f6131f2
2016-05-24 11:44:49 +01:00
Tim Huang
8ec727cd19 Bug 1267910 - Part 2: Update all existing functions of add() and getCookiesFromHost() to make them origin attributes aware. r=jdm, r=mratcliffe
--HG--
extra : rebase_source : 288c9cab8340c5cc06861d4f2c7ee43ae4de608e
2016-05-25 11:54:21 +08:00
Marco Bonardo
6961882734 Bug 1272652 - Firefox fails to import bookmarks from Chrome if it also imports a large history. r=gijs
MozReview-Commit-ID: 3w5TIPi2S8d

--HG--
extra : rebase_source : 616e2fe71ab04404608f06475752e50c9d4b2b92
extra : histedit_source : bcd1e9d41927a72a9dcf3c804ad75454b8948db6%2C852a5b150616724887b4d2ea37d4aa3a1f3006da
2016-05-24 17:29:30 +02:00
Gijs Kruitbosch
29525495be Bug 1272414 - rip out qemu/browser/b2g flags from marionette manifests, r=AutomatedTester
MozReview-Commit-ID: 9RjGgykh0pR

--HG--
extra : rebase_source : a5bc5e888cc24e05fb4b5843c3738aa5456aea80
2016-05-19 17:23:26 +01:00
Wes Kocher
2596f34110 Backed out 3 changesets (bug 1267910) for reports of it breaking session restore a=backout
Backed out changeset 5962f8e6d030 (bug 1267910)
Backed out changeset f8afc5cf9e0e (bug 1267910)
Backed out changeset cc202e0ac0dd (bug 1267910)
2016-05-20 21:15:17 -07:00
Gijs Kruitbosch
b067cf32c4 Bug 1274007 - Firefox Refresh shouldn't show the 'Firefox on Windows 10' start page when you refresh on Windows 10, r=MattN
MozReview-Commit-ID: 68CaJR5IsE1

--HG--
extra : rebase_source : 3a6a23ee6eab7845bc26ac42572a748f0ed7300f
2016-05-19 11:01:03 +01:00
Tim Huang
ad550d017f Bug 1267910 - Part 2: Update all existing functions of add() and getCookiesFromHost() to make them origin attributes aware. r=jdm, r=mratcliffe
--HG--
extra : rebase_source : 3d8b306dfa83363c01c4db5d018c55fddf6d1595
2016-05-18 20:42:00 -04:00
Gijs Kruitbosch
ff8adcb0fe Bug 888624 - add test for Firefox refresh, r=automatedtester,MattN
MozReview-Commit-ID: 4svIbYYGTKX

--HG--
extra : rebase_source : 2f04b3a21b45e15c9c3648fd301454a44676bdf2
2016-04-08 17:17:47 +01:00
Gijs Kruitbosch
939515d3cc Bug 1265368 - enable resetting non-default profiles, r=MattN
MozReview-Commit-ID: KpW9JgghFkn

--HG--
extra : rebase_source : e1a6ce0a05ccd6ef94026c6fdeaf6421d5cffe03
extra : histedit_source : ca0ed957aa68ed495cc2d8897aae3e553dd2ebff%2C8ce1e45de095401a6cc85f912cfebacd384eb989
2016-05-05 21:38:49 +01:00
Andrea Marchesini
83a08cd72e Bug 1259169 - nsICookieManager::remove() should be back-compatible, r=jdm 2016-04-10 05:46:07 +01:00
Ryan VanderMeulen
1c7872d0af Backed out changeset 7d5f1e9ce04c (bug 1259169) for various cookie-related crashes and test failures. 2016-04-09 15:36:07 -04:00
Andrea Marchesini
d09d8959fe Bug 1259169 - nsICookieManager::remove() should be back-compatible, r=jdm 2016-04-09 19:09:49 +01:00
Dave Townsend
4bf4f02ce7 Bug 1257246: Update browser for eslint 2. r=felipe
Most of this is fixing functions that in some cases return a value but then
can also run to completion without returning anything. ESLint 2 catches this
where previous versions didn't. Unless there was an obvious other choice I just
made these functions return undefined at the end which is effectively what
already happens.

MozReview-Commit-ID: DEskVIjiKDM

--HG--
extra : rebase_source : 07ba1d14655f5d761624b105ef025ec88323d4d5
extra : histedit_source : 9e5ab54ce1b1a5ee1f0fb143f8d1450522455e3b
2016-04-05 11:33:33 -07:00
Gijs Kruitbosch
f310165068 Bug 1255526 - fix import of typed URLs on versions of windows that do not store timestamps, r=MattN
MozReview-Commit-ID: KSXtQAS7meZ

--HG--
extra : rebase_source : fa72b5f58779b7223ecea5ca9d95a5473dca8262
extra : amend_source : 5f9a1ca7d102905b245fbe7b800e967217e16ede
2016-04-01 20:43:25 +01:00
Andrea Marchesini
b1768e7ec3 Bug 1245184 - Update mochitests, r=me 2016-02-25 16:41:13 +01:00
Gijs Kruitbosch
0b885cef41 Bug 1236154 - add test for ESE migration code, r=MattN
MozReview-Commit-ID: 5lILvkVn3tW

--HG--
extra : rebase_source : 9365c2fc58f0020927f8fcefc1475f3bfb1ca9d6
extra : amend_source : 6100f05bfc75d06a9884192a42ce15b10b710da6
2016-02-11 18:46:32 +00:00
Florian Quèze
010262d7d1 Bug 1245139 - the welcomeback2.tabtitle string is never used, rs=Gijs over IRC. 2016-02-15 19:55:36 +01:00
Gijs Kruitbosch
fa5c8f764b Bug 1246591 - followup: fix rules enabled in the last 24 hours in migration, rs=bustage
--HG--
extra : commitid : 1lyYyXGTTYY
extra : rebase_source : 50d51a9fdb2e16349e84b66b21840deb0cbc20ca
2016-02-09 10:57:55 +00:00
Gijs Kruitbosch
1b8fd05302 Bug 1246591 - fix moz.build file and .eslintignore, r=MattN
--HG--
extra : commitid : JDnRUikojj9
extra : rebase_source : 7075c06b2ef03490728d752a8c754c97e5ed75dd
2016-02-08 12:58:28 +00:00