Commit Graph

4224 Commits

Author SHA1 Message Date
Phil Ringnalda
0f32b67e2d Merge m-i to m-c, a=merge
MozReview-Commit-ID: Hm1RxN6OaoZ
2016-11-03 19:32:48 -07:00
Thom Chiovoloni
a0412a141a Bug 1313731 - Append /v1 to fxaccount's autoconfig's auth_server_base_url if not present r=rfkelly
Currently the fxaccounts content server passes this through directly from its
configuration files, and accepts this as either containing the trailing /v1 or
not. On stage, it contains it, but on dev it does not.

In the near future, it should be possible to append the trailing /v1
unconditionally, as the FxA content server is being changed to never send it
down (which will be consistent with the other prefs), however it's done
conditionally as to not break autoconfig against stage in the mean time.

MozReview-Commit-ID: AStTm2hHVHQ

--HG--
extra : rebase_source : bf98cef357d5834e08a01b3c233a8ccb37243e64
2016-11-02 12:15:26 -04:00
André Bargull
866168d23c Bug 1313798 - Remove Date.prototype.toLocaleFormat uses in services/sync. r=rnewman 2016-10-28 15:31:30 -07:00
Sebastian Hengst
900199872a Backed out changeset 39e08d903b48 (bug 1253740) 2016-11-02 16:40:07 +01:00
Sebastian Hengst
a3865de0a1 Backed out changeset 77be2faa619f (bug 1253740) 2016-11-02 16:40:03 +01:00
Sebastian Hengst
55e6f64d89 Backed out changeset a73da05c87ba (bug 1253740) 2016-11-02 16:39:42 +01:00
Thom Chiovoloni
7799bcc52b Bug 1312031 - Fix failing TPS test_sync.js test. r=markh
This required:

1. Using the same method of updating keywords used by PlacesSyncUtils. Calling
into PlacesSyncUtils directly is not possible here, since it would pass
SOURCE_SYNC as the source, which would ensure that we ignore the changes).
2. Ensuring that we update the keyword *after* the URI in TPS.

Note that neither one of these changes on their own was sufficient.

MozReview-Commit-ID: Ls4kEVBHdNc

--HG--
extra : rebase_source : f97ff29cdcdadd444fd70df98d97354de10511eb
2016-11-01 13:16:38 -04:00
Thom Chiovoloni
b9e92c7821 Bug 1309774 - Part 2. Add version number to validation data in sync ping. r=markh
MozReview-Commit-ID: FlDSEsT1ah9

--HG--
extra : rebase_source : 327bcac18dba5c685092e311e2be880b6d616e07
2016-10-20 15:20:07 -04:00
Thom Chiovoloni
c392f4a9b5 Bug 1309774 - Part 1. Sync bookmark validator should only expect to see children of roots on server. r=markh
MozReview-Commit-ID: EEoDmsnBraA

--HG--
extra : rebase_source : f122432d49a820e5e0857d82760737bd846bf377
2016-10-20 15:17:33 -04:00
Ethan Glasser-Camp
882fdd80ee Bug 1253740 - Handle password resets more correctly, r=markh
MozReview-Commit-ID: 1mSvbsYP9fV

--HG--
extra : rebase_source : 08d1c6356505a8b60b67e44543c7205c6ba52e54
extra : intermediate-source : 385eb385501deec773b4680e64e8014bddaf0edb
extra : source : 8595b3a68fbd2dccbe63324524fd9532ea62bca5
2016-09-30 12:12:58 -04:00
Ethan Glasser-Camp
1ecd3de17d Bug 1253740 - Add crypto, including tests, r=rnewman
MozReview-Commit-ID: Jq8QRoNtPwb

--HG--
extra : rebase_source : c1eae5a9f720b02bf8aaa0f9b5bb2d205d037677
extra : source : 66877faacf75cd4de31ae868ce034d254ec8a080
2016-09-08 14:21:18 -04:00
Ethan Glasser-Camp
adbd884871 Bug 1253740 - Introduce extension-storage engine with a sanity test, r=markh
Note that this "enables" the engine using a pref, even though it might
not be ready yet, so that the tests can pass.

MozReview-Commit-ID: AZ0TVERiQDU

--HG--
extra : rebase_source : e8518187e3a4f404bad193ce26f6c523ec06abe0
extra : intermediate-source : b052cf501ce8a838706f63f46eb6262b63ac5560
extra : source : 183547f4dbbedc9ee3399b6a474016d0e89a12e8
2016-09-08 14:23:12 -04:00
Thom Chiovoloni
665270b3e6 Bug 1312320 - Report mozIStorageError properly in sync ping r=markh
This required adding a new error type to the sync ping.

MozReview-Commit-ID: LoGEjI0hFRo

--HG--
extra : rebase_source : 579c33d5c4b762ac99ba39cb10bd6d4cb4c428d0
2016-10-24 11:13:26 -04:00
Mark Hammond
ccb60bff9c Bug 1312021 - ensure the addonsreconciler always has the isSyncable attribute. r=tcsc
MozReview-Commit-ID: AlYZCCrEvLV

--HG--
extra : rebase_source : 361974273a7048f090fb4caa1310b983b67f082c
2016-10-25 17:53:44 +11:00
Kit Cambridge
f8747ad476 Bug 1312857 - Pass the correct change sources in getOrCreateTagFolder and importJSONNode. r=markh
MozReview-Commit-ID: Gga9kiC3AxK

--HG--
extra : rebase_source : 0b07551617c277aeaec619d0a4432874fc77e9ec
2016-10-25 11:39:56 -07:00
Thom Chiovoloni
628bd1ae87 Bug 1312015 - Ensure that TPS catches failures when generating sync telemetry r=markh
MozReview-Commit-ID: HdXROi6Ctcj

--HG--
extra : rebase_source : e5f980222f0323c8aaff5f934e606092691d80cb
2016-10-25 12:13:34 -04:00
Cykesiopka
587483aae4 Bug 1312157 - Stop using Scoped.h NSS types in nsSyncJPAKE.(cpp|h). r=rnewman
Scoped.h is deprecated.

MozReview-Commit-ID: AZ4MkXqirTc

--HG--
extra : rebase_source : cc4af8e47b8806dff6871863e5c66803eb014a18
2016-10-23 13:26:08 +08:00
Kit Cambridge
6a43fd2448 Bug 1312494 - Fix up queries that point to the wrong folder in _ensureMobileQuery. r=tcsc
This patch also reports validation errors for left pane queries on the
server, and removes incorrect mobile query migration code.

MozReview-Commit-ID: FT7kAZJapqE

--HG--
extra : rebase_source : 1aa2a14a245bc0bb2a044d951a4c5d274b9d9f13
2016-10-24 12:06:00 -07:00
Thom Chiovoloni
1debb3df7a Bug 1294599 - Implement batched downloads of sync collections on desktop r=markh,rnewman
MozReview-Commit-ID: 6la9t1FxQhH

--HG--
extra : rebase_source : 6fb7df03219bc5643eefc9683bd584325193f3e1
2016-10-06 17:52:27 -04:00
Ryan VanderMeulen
a57d15ff6a Merge inbound to m-c. a=merge 2016-10-23 13:16:27 -04:00
Valentin Gosu
db9440de51 Bug 1305204 - (Part 2) Backout bug 1275746 a=backout
MozReview-Commit-ID: H8aCKdJzEbR
2016-10-23 14:24:45 +02:00
Thom Chiovoloni
4539cf2325 Bug 1311611 - Fix property typo in sync ping building code. r=markh
MozReview-Commit-ID: AOl4Nq9Y6WX

--HG--
extra : rebase_source : c7dde488e62527b18af2823623a92fb515598248
2016-10-21 10:32:40 -04:00
Thom Chiovoloni
0117e0cf73 Bug 1299978 - Reupload parents of revived bookmarks and buffer folder deletion during sync r=markh,rnewman
MozReview-Commit-ID: BDfp5FffCWh

--HG--
extra : rebase_source : 0caecb27d753577373e150dd770370bd328dbe32
2016-10-05 14:04:50 -04:00
Thom Chiovoloni
b072bd5c1e Bug 1311557 - Ensure custom sync engines aren't reported in sync ping. r=markh
MozReview-Commit-ID: 1aRxo9JcCLn

--HG--
extra : rebase_source : d0136d682c656fe257fbef7c47cf793d0478cad8
2016-10-20 20:05:03 -04:00
Kit Cambridge
e32178708e Bug 1310941 - Fix BookmarksTracker.onItemChanged arguments to avoid triggering syncs for remote changes. r=tcsc
MozReview-Commit-ID: K1OcL5m6opv

--HG--
extra : rebase_source : 610d395625a0c4841298331163bc55b89bf7fb31
2016-10-18 08:26:43 -07:00
Ethan Glasser-Camp
bce63cb01d Bug 1308515: Update version of kinto.js client to 5.0.0, r=MattN
MozReview-Commit-ID: D3WISXfSaTz

--HG--
extra : rebase_source : ab9d5497c4b1aa22ae15bae65ef4f7a30ec87626
2016-10-07 10:27:48 -04:00
Ethan Glasser-Camp
061b360de6 Bug 1308515: Fix blocklist-clients.js so that it can work with new kinto.js, r=leplatrem,MattN
MozReview-Commit-ID: AwLBvYQb4DX

--HG--
extra : rebase_source : 5b2b1084aad4f9a1b98a243a9693cfe1ab3e8516
2016-10-17 10:20:50 -04:00
Sebastian Hengst
9f8d517918 Backed out changeset 3ae77edf8ed2 (bug 1310941) for frequent intermittent xpcshell failure in test_bookmark_engine.js. r=backout 2016-10-18 21:45:09 +02:00
Kit Cambridge
5c7c675383 Bug 1310941 - Fix BookmarksTracker.onItemChanged arguments to avoid triggering syncs for remote changes. r=tcsc
MozReview-Commit-ID: K1OcL5m6opv

--HG--
extra : rebase_source : 5c1fb39a027cfebb363a8031639256d3ae7c86d0
2016-10-18 08:26:43 -07:00
Thom Chiovoloni
be9c5a302c Bug 1308567 - Include information about associated devices in sync ping r=bsmedberg,markh
MozReview-Commit-ID: 45c4skQHswy

--HG--
extra : rebase_source : 794f0b0d453596fdec84066bfbb966d81da62372
2016-10-11 14:07:52 -04:00
Mark Hammond
6cbb6e1ffe Bug 1310525 - don't exceed sqlite's max variable limit when many changed bookmarks exist. r=kitcambridge
MozReview-Commit-ID: H2l2L9fZm9t

--HG--
extra : rebase_source : 128c420cf7dc7d6ba1ef71bbc99be5a518a1dcab
2016-10-17 12:54:05 +11:00
Kit Cambridge
07d9b90407 Bug 1302288 - Implement PlacesSyncUtils.bookmarks.fetch. r=markh
MozReview-Commit-ID: 2CcE8DxHott

--HG--
extra : rebase_source : 7af66f06b889ca956cde0ff4499fcc6e74336e5c
2016-09-19 14:53:43 -07:00
Thom Chiovoloni
c9102d7409 Bug 1308841 - Sanity check client-side bookmark roots in sync validator r=markh
MozReview-Commit-ID: 6Y5qfCtVYWf

--HG--
extra : rebase_source : e02121eea46e1625d7ce202e9b379cdf4d3254f9
2016-10-11 12:54:01 -04:00
Wes Kocher
60716bbb13 Backed out changeset 62f88acbfd5a (bug 1308841) for xpcshell failures a=backout 2016-10-12 11:15:13 -07:00
Kit Cambridge
8d01843b2f Bug 1309647 - Remove remaining uses of BookmarkSpecialIds from _ensureMobileQuery. r=tcsc
MozReview-Commit-ID: A6u6SIx2jBL

--HG--
extra : rebase_source : 9ff9a42971d73e7d34755085fd70e8bd94930443
2016-10-12 10:56:00 -07:00
Thom Chiovoloni
7428366743 Bug 1308841 - Sanity check client-side bookmark roots in sync validator r=markh
MozReview-Commit-ID: 6Y5qfCtVYWf

--HG--
extra : rebase_source : b2fb725a1d2257431a6bc36870d30acd567589bf
2016-10-11 12:54:01 -04:00
Michelangelo De Simone
6b31140392 Bug 1309030 - Remove DOM/identity and related code. r=Ehsan
MozReview-Commit-ID: 2v2ZCSoX4Mz

--HG--
extra : rebase_source : 72cbccd1f59758e290294bfcca56523372978120
2016-10-10 13:55:16 -07:00
Kit Cambridge
484808a00f Bug 1295521 - Add a toSyncBookmark method and clean up BookmarksStore. r=markh
MozReview-Commit-ID: 3h2qnOtNPN9

--HG--
extra : rebase_source : 0d657035d02c8bd261f1124072d6a248c94c7e09
2016-09-20 01:52:58 -07:00
Kit Cambridge
e33c30fb05 Bug 1295521 - Remove BookmarkSpecialIds from Sync. r=markh,tcsc
MozReview-Commit-ID: IUVOu0jFXRv

--HG--
extra : rebase_source : 40f23512b976595a094bd4491db434958ae381a1
2016-09-16 14:08:10 -07:00
Thom Chiovoloni
27428f453d Bug 1308994 - Use encodeURIComponent on sync upload batch id, and fix configuration checking r=markh
MozReview-Commit-ID: 1OqryC5oQOj

--HG--
extra : rebase_source : a82822bbe49ff7cfb46ec719cb4499666cac134c
2016-10-10 14:02:13 -04:00
Kit Cambridge
80c9bf152c Bug 1302901 - Remove mobile root creation from Sync. r=markh
MozReview-Commit-ID: 6fphDT1Owni

--HG--
extra : rebase_source : e10d28315b4b6c4d008ad9d5ba5823cd2605e18a
2016-09-15 17:15:20 -07:00
Thom Chiovoloni
3d449661d1 Bug 1308240 - Fix missing this. in Sync's Collection's getters. r=markh
MozReview-Commit-ID: BsYFmkCMYU5

--HG--
extra : rebase_source : b816c2d85bd51e83d1cf5f62a0d13648c44ab824
2016-10-06 11:54:59 -04:00
Thom Chiovoloni
a37575012a Bug 1236897 - Split up sync's test_errorhandler.js into two smaller tests r=markh
MozReview-Commit-ID: K9bVn6nNGk7

--HG--
extra : rebase_source : 6272cf286a3dc5dc3f533f04d87226d9a599a550
2016-10-06 11:37:44 -04:00
Mark Hammond
84add39770 Bug 1305645 - have the FxaPushService log information about push messages received. r=kitcambridge
MozReview-Commit-ID: Jx21Jj92eu4

--HG--
extra : rebase_source : f00c6651650a8980a6b161622f99e0ff0527e881
2016-09-27 17:42:12 +10:00
Thom Chiovoloni
3e4ccfdb57 Bug 1286915 - Implement a validator for the sync addons engine. r=markh
MozReview-Commit-ID: 2sGNs9BUoXt

--HG--
extra : transplant_source : %FBJ%F9%D5%B3%95%E9%A6%10M%CBV%3A%08y%A1%DFsC%DD
2016-09-22 17:29:01 -04:00
Thom Chiovoloni
1a6d2a1483 Bug 1297238 - Make sync forms tracker respect ignoreAll property r=markh
MozReview-Commit-ID: AuIWNcRux3b

--HG--
extra : rebase_source : e940a484b58fdcd1b6fbf2cdad833599d22d5afe
2016-09-23 13:58:19 -04:00
Thom Chiovoloni
ae63800553 Bug 1249520 - Add client support for a fxa-client-configuration endpoint r=markh
MozReview-Commit-ID: 4jTl1yIduKG

--HG--
extra : rebase_source : 0df65d2841f61fa3265453d3eff52a67d76c7276
2016-09-21 15:07:28 -04:00
Iris Hsiao
a95e0164c0 merge fx-team to mozilla-central a=merge 2016-09-26 18:29:38 +08:00
Thom Chiovoloni
9e7ce515e3 Bug 1304865 - Replace remaining uses of _itemSource with itemSource in sync and tps. r=markh
MozReview-Commit-ID: 8FO6vSPAnDZ

--HG--
extra : transplant_source : %82L%8E%18%27%8F%C1%A0%9CM%B6%1Es%F0%10%E8%10%FE%D7%CE
2016-09-22 16:31:08 -04:00
Mark Hammond
126cb4d91c Bug 1276969 - Remove parentName checks from the bookmark validator. r=tcsc
MozReview-Commit-ID: KnF1wiluMBm

--HG--
extra : rebase_source : e0d8bb11a97dc1f129543726c71ac80db778a4ec
2016-09-22 17:25:22 +10:00