Mark Banner
df3fdf012f
Bug 1333044 - Fix no-shadow issues in services/. r=markh
...
MozReview-Commit-ID: KqYfpjdR7QS
--HG--
extra : rebase_source : b93a673073045ddfec6e4b4b347b4e8494425310
2017-01-23 14:07:55 +00:00
Mark Banner
2ecc79b536
Bug 1333044 - Prepare services/ for enabling no-undef eslint rule. r=jaws
...
MozReview-Commit-ID: 29KwwyZH2jn
--HG--
extra : rebase_source : c4b19fe3714b19b445011ae1c413ca0e624cb46e
2017-01-17 12:25:43 +00:00
Wes Kocher
7cd28f7e5d
Merge inbound to central, a=merge
...
MozReview-Commit-ID: HvoljuLV6Gj
2017-01-27 16:37:18 -08:00
Edouard Oger
1d38375171
Bug 1296767 part 13 - Repair Weave Service getStorageInfo. r=markh
...
MozReview-Commit-ID: E4S5xYTNDIH
2017-01-27 13:31:58 -05:00
Edouard Oger
ffa8a4f046
Bug 1296767 part 12 - Remove Weave.fxAccountsEnabled. r=markh
...
MozReview-Commit-ID: L4dM9xN2ELp
2017-01-27 13:31:58 -05:00
Edouard Oger
ad36606986
Bug 1296767 part 11 - Remove Weave.Service.serverURL and friends. r=markh
...
MozReview-Commit-ID: Kmsxn10sA2X
2017-01-27 13:31:58 -05:00
Edouard Oger
7314dabc8c
Bug 1296767 part 10 - Remove FxA Migration code. r=markh
...
MozReview-Commit-ID: DamrbblcMmZ
2017-01-27 13:31:58 -05:00
Edouard Oger
3844e92a36
Bug 1296767 part 8 - Remove legacy Sync in-content pref screens. r=markh
...
MozReview-Commit-ID: Blpdd3jeeww
2017-01-27 13:31:58 -05:00
Edouard Oger
f5eb6dc494
Bug 1296767 part 7 - Remove non-in-content legacy Sync pref screens. r=markh
...
MozReview-Commit-ID: LK9akz4chd1
2017-01-27 13:31:57 -05:00
Edouard Oger
ea99e4442d
Bug 1296767 part 6 - Remove startOverKeepIdentity pref. r=markh
...
MozReview-Commit-ID: 7YDYTCRiKZa
2017-01-27 13:30:48 -05:00
Edouard Oger
cdce850c10
Bug 1296767 part 5 - Remove add_identity_test helper. r=markh
...
MozReview-Commit-ID: 12pP01IHRyp
2017-01-27 13:30:48 -05:00
Edouard Oger
df80e282e9
Bug 1296767 part 4 - Update tests to work with the BrowserID identity manager. r=markh
...
MozReview-Commit-ID: AFRyZFW6xZU
2017-01-27 13:30:48 -05:00
Edouard Oger
bf4dae4e25
Bug 1296767 part 3 - Make BrowserID the only Sync identity manager. r=markh
...
MozReview-Commit-ID: IC7kRjgtPp8
2017-01-27 13:30:47 -05:00
Edouard Oger
c94655827a
Bug 1296767 part 2 - Remove Sync UserApi. r=markh
...
MozReview-Commit-ID: CdgLxCN52Os
2017-01-27 13:30:47 -05:00
Edouard Oger
bb525e4654
Bug 1296767 part 1 - Remove J-PAKE from Sync. r=markh
...
MozReview-Commit-ID: iD4OJv436i
2017-01-27 13:30:47 -05:00
Florian Quèze
b11907c7aa
Bug 1334156 - script-generated patch to replace .ownerDocument.defaultView with .ownerGlobal, r=jaws.
2017-01-27 10:51:03 +01:00
Florian Quèze
0cb03c69e1
Bug 1334156 - replace ownerDocument.defaultView usages by hand in a few places, r=jaws.
2017-01-27 10:51:02 +01:00
Phil Ringnalda
39e57631eb
Merge m-c to m-i
2017-01-25 20:48:39 -08:00
Kit Cambridge
009412ee92
Bug 1332024 - Finalize tracker storage and consolidate cleanup logic in engine tests. r=markh
...
MozReview-Commit-ID: 8t9bXFrLA1Z
--HG--
extra : rebase_source : 51e15f6cc8fd44947f42cc59be413df6775291b0
2017-01-24 09:59:09 -08:00
Edouard Oger
8561ffa3a2
Bug 1319433 - Bump tabs engine TTL to 21 days. r=markh
...
MozReview-Commit-ID: GdEZkQEdZMD
--HG--
extra : rebase_source : 949e172445996b71271788d11cf136bef95254f8
2017-01-23 11:05:41 -05:00
Carsten "Tomcat" Book
aaafcb0f0a
Backed out changeset f8b29e24280b (bug 1333044) for perma failures in test_load_modules.js
...
--HG--
extra : rebase_source : ef649da0bb1acaabcb55a42e5df4164f1cf8b6d4
2017-01-25 15:29:53 +01:00
Carsten "Tomcat" Book
f868542f9b
Backed out changeset 06a658a93aab (bug 1333044)
...
--HG--
extra : rebase_source : 554fed79a1c36ce418ab95952cde9669a3297cb6
2017-01-25 15:29:35 +01:00
Carsten "Tomcat" Book
a6178c3af9
Backed out changeset 9c6b98edac72 (bug 1333044)
...
--HG--
extra : rebase_source : e81a05f7fa7ffca19ced3e0aca62ada7bde935b2
2017-01-25 15:29:33 +01:00
Carsten "Tomcat" Book
514a5e3a68
Backed out changeset d1f3d30546a1 (bug 1333044)
...
--HG--
extra : rebase_source : 272f382a06733b065cec30d2bdcec282ef847297
2017-01-25 15:29:31 +01:00
Mark Banner
605ae8736f
Bug 1333044 - "Enable eslint no-undef for services/" a=tomcat
2017-01-25 05:09:00 +01:00
Carsten "Tomcat" Book
ff34e66ec7
Merge mozilla-central to autoland
2017-01-25 13:52:18 +01:00
Florian Quèze
0e0865f4fc
Bug 1331599 - script-generated patch to replace removeEventListener calls with the once option when possible, r=jaws.
2017-01-25 07:01:52 +01:00
Mark Banner
eb102a103e
Bug 1333044 - Enable no-undef eslint rule for services/. r=markh
...
MozReview-Commit-ID: IrtWclENDth
--HG--
extra : rebase_source : 19e5895756579ecf88d5be70e8aaaf8c3166ada1
2017-01-23 15:15:05 +00:00
Mark Banner
caa2f51ce1
Bug 1333044 - Fix no-shadow issues in services/. r=markh
...
MozReview-Commit-ID: KqYfpjdR7QS
--HG--
extra : rebase_source : 32511d0a015fe57f0b8262b0faa28dbd4bd7a623
2017-01-23 14:07:55 +00:00
Mark Banner
33c00194c2
Bug 1333044 - Prepare services/ for enabling no-undef eslint rule. r=jaws
...
MozReview-Commit-ID: 29KwwyZH2jn
--HG--
extra : rebase_source : 9b5edc75897af35754433b6fccfcecf83293c62b
2017-01-17 12:25:43 +00:00
Phil Ringnalda
bf98cd4315
Merge m-i to m-c, a=merge
2017-01-24 18:53:29 -08:00
stefanh@inbox.com
caff960805
Bug 1313045 - Remove toolkit/identity, part2: Move used files/bits to services/crypto and remove remaining files in toolkit/identity. r=MattN.
...
--HG--
rename : toolkit/identity/IdentityCryptoService.cpp => services/crypto/component/IdentityCryptoService.cpp
rename : toolkit/identity/nsIIdentityCryptoService.idl => services/crypto/component/nsIIdentityCryptoService.idl
rename : toolkit/identity/LogUtils.jsm => services/crypto/modules/LogUtils.jsm
rename : toolkit/identity/jwcrypto.jsm => services/crypto/modules/jwcrypto.jsm
rename : toolkit/identity/tests/unit/test_crypto_service.js => services/crypto/tests/unit/test_crypto_service.js
rename : toolkit/identity/tests/unit/test_jwcrypto.js => services/crypto/tests/unit/test_jwcrypto.js
2017-01-23 20:43:35 +01:00
stefanh@inbox.com
f28e3f1e0d
Bug 1313045 - Remove toolkit/identity, part1: Remove unneeded files/bits. r=MattN.
2017-01-23 20:20:54 +01:00
Phil Ringnalda
8a8c8d9816
Merge autoland to m-c, a=merge
2017-01-23 18:42:45 -08:00
ffxbld
ed04f7a449
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
2017-01-23 15:38:06 +00:00
Thom Chiovoloni
c197835bcf
Bug 1295237 - Add 'Mobile Bookmarks' root to the bookmark menus if we have it. r=markh
...
MozReview-Commit-ID: 3ybnskOID1O
--HG--
extra : rebase_source : 3faec9e53939626dc89c039706aaa2f003571d18
2017-01-17 13:15:49 -05:00
Edouard Oger
d22c7ab8ed
Bug 1332993 - Do not write logs on FxA profile 304 response. r=markh
...
MozReview-Commit-ID: Hf5d6rz8HNQ
--HG--
extra : rebase_source : f51a3a9b1fb0c4f5e6c56114e289f67ee99b315f
2017-01-23 11:25:04 -05:00
Sebastian Hengst
461878052c
Backed out changeset ccc602619a07 (bug 1332993) for failing xpcshell test test_accounts.js at least on Linux. r=backout on a CLOSED TREE
2017-01-24 18:34:08 +01:00
Edouard Oger
274682c188
Bug 1332993 - Do not write logs on FxA profile 304 response. r=markh
...
MozReview-Commit-ID: Hf5d6rz8HNQ
--HG--
extra : rebase_source : 5861ee29ff229b44f999119d95a94ba673f22e2e
2017-01-23 11:25:04 -05:00
aleth
05bfbf26be
Bug 1333692 - Disable nsIIdentityCryptoService and jwcrypto tests for TB as these modules are only used by FxAccounts. r=MattN.
2017-01-25 18:47:57 +01:00
Wes Kocher
c3cc3b6407
Backed out 13 changesets (bug 1296767) for xpcshell failures a=backout CLOSED TREE
...
Backed out changeset 41ed77788333 (bug 1296767)
Backed out changeset 1c0c9289b532 (bug 1296767)
Backed out changeset 50294db1d871 (bug 1296767)
Backed out changeset 26c065f79c54 (bug 1296767)
Backed out changeset 0362a78d6978 (bug 1296767)
Backed out changeset 4e71cf94e4ee (bug 1296767)
Backed out changeset f6f59447d22a (bug 1296767)
Backed out changeset 6c9b792cc296 (bug 1296767)
Backed out changeset 46a52b10a868 (bug 1296767)
Backed out changeset 5d70d87d2a8f (bug 1296767)
Backed out changeset 8219686be6a2 (bug 1296767)
Backed out changeset 0a989b0cea67 (bug 1296767)
Backed out changeset 9f59a0b75c1f (bug 1296767)
MozReview-Commit-ID: 2XBNsd8JrZL
--HG--
extra : amend_source : 1afafaa8127fcebac31ce1d7743dc16872fa0522
2017-01-26 11:16:12 -08:00
Edouard Oger
1595b78c75
Bug 1296767 part 13 - Repair Weave Service getStorageInfo. r=markh
...
MozReview-Commit-ID: E4S5xYTNDIH
--HG--
extra : rebase_source : 6a98b9503183bbf679622b00073d162fd3e4f5e4
2017-01-23 15:19:04 -05:00
Edouard Oger
b0e947451a
Bug 1296767 part 12 - Remove Weave.fxAccountsEnabled. r=markh
...
MozReview-Commit-ID: L4dM9xN2ELp
--HG--
extra : rebase_source : deec727f4fe7c2bc5858e7bfb6f0fecee7b2c45c
2017-01-19 14:53:37 -05:00
Edouard Oger
f49ecb465d
Bug 1296767 part 11 - Remove Weave.Service.serverURL and friends. r=markh
...
MozReview-Commit-ID: Kmsxn10sA2X
--HG--
extra : rebase_source : 87bebd2abc19a6b62647d4bcb48193765a3622e2
2017-01-19 13:19:33 -05:00
Edouard Oger
775061c90e
Bug 1296767 part 10 - Remove FxA Migration code. r=markh
...
MozReview-Commit-ID: DamrbblcMmZ
--HG--
extra : rebase_source : 7356a6a99005ae702e90eb5d5e2f0cbee35ff861
2017-01-19 13:03:38 -05:00
Edouard Oger
0de554147f
Bug 1296767 part 8 - Remove legacy Sync in-content pref screens. r=markh
...
MozReview-Commit-ID: Blpdd3jeeww
--HG--
extra : rebase_source : c22ba5c1924b3dba15803f0adbf4026c72b47d68
2017-01-19 11:52:37 -05:00
Edouard Oger
b41402ea7b
Bug 1296767 part 7 - Remove non-in-content legacy Sync pref screens. r=markh
...
MozReview-Commit-ID: LK9akz4chd1
--HG--
extra : rebase_source : b7113c37a486f88ae1138c54e314bb0ff07ef1af
2017-01-18 17:39:11 -05:00
Edouard Oger
17b83cde16
Bug 1296767 part 6 - Remove startOverKeepIdentity pref. r=markh
...
MozReview-Commit-ID: 7YDYTCRiKZa
--HG--
extra : rebase_source : 41574e70bd92ee2abe6f92a799c57e1f5910f8b4
2017-01-18 16:30:38 -05:00
Edouard Oger
9050cab070
Bug 1296767 part 5 - Remove add_identity_test helper. r=markh
...
MozReview-Commit-ID: 12pP01IHRyp
--HG--
extra : rebase_source : 2c5af253df77ed08dd8bdf0c7645ed98e6a96c9a
2017-01-18 15:52:47 -05:00
Edouard Oger
cfef81983f
Bug 1296767 part 4 - Update tests to work with the BrowserID identity manager. r=markh
...
MozReview-Commit-ID: AFRyZFW6xZU
--HG--
extra : rebase_source : 6110e19a51d6d3375b47f785c8f644ee879fb924
2017-01-13 15:59:32 -05:00
Edouard Oger
49552f7919
Bug 1296767 part 3 - Make BrowserID the only Sync identity manager. r=markh
...
MozReview-Commit-ID: IC7kRjgtPp8
--HG--
extra : rebase_source : ec10c24400afa4b1c1fd3840f31a9d57d498ec8a
2017-01-13 15:02:21 -05:00
Edouard Oger
eb0c42bf7a
Bug 1296767 part 2 - Remove Sync UserApi. r=markh
...
MozReview-Commit-ID: CdgLxCN52Os
--HG--
extra : rebase_source : c270d7dfbaf621c1eb8f440009b361212969a8bc
2017-01-13 15:54:46 -05:00
Edouard Oger
0c915a6f46
Bug 1296767 part 1 - Remove J-PAKE from Sync. r=markh
...
MozReview-Commit-ID: iD4OJv436i
--HG--
extra : rebase_source : 1653284a3b2e014719a7eb37588f99df868e2060
2017-01-10 13:47:24 -05:00
Valentin Gosu
fd0c022031
Bug 1275746 - Fix tests that assume a HTTP url without a hostname is valid r=bz,MattN,jdm,markh
...
MozReview-Commit-ID: DzRenakrcAG
2016-07-07 16:20:47 +03:00
Phil Ringnalda
68b37a46e8
Merge m-i to m-c, a=merge
2017-01-20 19:00:04 -08:00
Jared Wein
a1b9179389
Bug 1330791 - Enable the no-native-reassign rule for eslint in /services and fix the associated error. r=markh
...
MozReview-Commit-ID: 65EsZGCJPMD
--HG--
extra : rebase_source : 4dc9dddaa26d1c10f859dc7a08b64168a1d0fdd5
2017-01-12 18:28:48 -05:00
Jared Wein
95fba3cca3
Bug 1330791 - Enable the no-ex-assign rule for eslint in /services. There are no associated errors with enabling this rule. r=markh
...
MozReview-Commit-ID: 8AsaN1gyjkm
--HG--
extra : rebase_source : 7f35d170620ce24fff5920d9376f46fc02e3817e
2017-01-12 18:27:39 -05:00
Jared Wein
02c3be3118
Bug 1330791 - Enable the no-cond-assign rule for eslint in /services. There are no associated errors with enabling this rule. r=markh
...
MozReview-Commit-ID: BM83kDZJpZ3
--HG--
extra : rebase_source : 3769dc72cfe5d0b328926d94bd7d45fc4d02a215
2017-01-12 18:27:00 -05:00
Jared Wein
285bebb13e
Bug 1330791 - Enable the brace-style rule for eslint in /services and fix the associated errors. r=markh
...
MozReview-Commit-ID: Ebl3bODX14z
--HG--
extra : rebase_source : 20fe1d8043b04c53b9521bc0ad30b72ebf253062
2017-01-12 18:24:52 -05:00
Jared Wein
bcf58381e1
Bug 1330791 - Enable the no-octal rule for eslint and fix the associated error. r=markh
...
MozReview-Commit-ID: LLYKmP7HOei
--HG--
extra : rebase_source : 7c4dbf5fa57f7ef38460a9bc071475a6ad70f18d
2017-01-12 18:21:43 -05:00
Jared Wein
516a926c6e
Bug 1330791 - Enable the no-redeclare rule for eslint in /services and fix the associated errors. r=markh
...
MozReview-Commit-ID: 7ADLmPB4eSu
--HG--
extra : rebase_source : 94a966d6cbc5c2b6b6097355fc3aa84dd50e27f5
2017-01-12 18:19:47 -05:00
Jared Wein
49ca473486
Bug 1330791 - Enable the no-unreachable rule for eslint in /services and fix the associated errors. r=markh
...
MozReview-Commit-ID: e60hfjiUmS
--HG--
extra : rebase_source : 3a8687fcfe76687581dd8a43f3e7fc7089c5553a
2017-01-12 18:18:31 -05:00
Jared Wein
377910a84e
Bug 1330791 - Enable the no-unsafe-finally rule for eslint in /services. There are no associated errors with this rule. r=markh
...
MozReview-Commit-ID: E057aetXRv
--HG--
extra : rebase_source : 161f178337636e55b10b232cd4e9cfe3fc3aa4d7
2017-01-12 18:16:34 -05:00
Jared Wein
ac53e1b8be
Bug 1330791 - Enable no-else-return rule for eslint in /services and fix associated errors. r=markh
...
MozReview-Commit-ID: 7Os4uZQCDox
--HG--
extra : rebase_source : 2a1d9ef6fb6510f7f3b02b6c727bc706e56637b0
2017-01-12 18:14:54 -05:00
Jared Wein
cd4fc8120a
Bug 1330791 - Enable the no-empty rule for eslint. There were no associated errors with this rule. r=markh
...
MozReview-Commit-ID: JlhO0F45cYL
--HG--
extra : rebase_source : 66e0cd06a7af1712d609f11adc438d26cd79da25
2017-01-12 18:09:24 -05:00
Jared Wein
d019dbcaa8
Bug 1330791 - Enable the no-useless-call eslint rule for /services and fix associated errors. r=markh
...
MozReview-Commit-ID: Ixd7jk5G5CB
--HG--
extra : rebase_source : 0f5817cb03f26c28d401706069ba9aa23f6acce3
2017-01-12 18:08:10 -05:00
Jared Wein
7cb8b041fe
Bug 1330791 - Enable the no-unused-vars rule for eslint in /services and fix associated errors. r=markh
...
MozReview-Commit-ID: DFcvEllwGSb
--HG--
extra : rebase_source : c6abc288124c1c47480cc73db8294195d8832fa2
2017-01-12 18:02:08 -05:00
Jared Wein
6d19607e67
Bug 1330791 - Enable the no-irregular-whitespace rule for /services and fix the associated errors. r=markh
...
MozReview-Commit-ID: 5rledRlxUl2
--HG--
extra : rebase_source : 4612dacb80a5f11041fccc3a3edee6b121cdd2ff
2017-01-12 17:27:34 -05:00
Jared Wein
8b1f142e1f
Bug 1330791 - Enable the no-mixed-spaces-and-tabs rule and fix the associated errors. r=markh
...
MozReview-Commit-ID: D1CTiez7BDy
--HG--
extra : rebase_source : b1a972925bf220cc7a5e550ce89fad705d2e8c44
2017-01-12 17:24:41 -05:00
Mark Banner
16e6d381ac
Bug 503613 - Remove old 'tail =' lines from xpcshell.ini files; r=gps
...
MozReview-Commit-ID: 62Hp5ISxowJ
--HG--
extra : rebase_source : daa8efb3409031fea553f4fd0c9d0746e38dc308
extra : histedit_source : b4c23aacf678ba0d0ac9c09191a7c494ead11a08
2017-01-18 10:30:39 +00:00
Florian Quèze
59ca1bd6d8
Bug 1330821 - Remove unused files from services/fxaccounts/, r=markh.
2017-01-20 12:50:11 +01:00
Edouard Oger
12b3049ea8
Bug 1323102 - Cache the FxA profile. r=markh
...
MozReview-Commit-ID: Fzw8Tg6WoM0
--HG--
extra : rebase_source : e910f334870ff54ae1adc398980c8e94c40f3ffa
2017-01-09 15:56:28 -05:00
Kit Cambridge
14b98b514b
Bug 1317579 - Don't send a sync ping for self-hosters. r=tcsc
...
MozReview-Commit-ID: 601nfXW0gT6
--HG--
extra : rebase_source : e0f96250cb101c3de020fadd856f28f0d8a4bfa8
2016-12-22 19:00:34 -07:00
Mathieu Leplatre
ef51c56995
Bug 1331604
- Minor style and idiom changes (r=mgoodwin)
...
MozReview-Commit-ID: IdO8EP3hg0P
--HG--
extra : rebase_source : 86f6da5d655bd84fa849b4a5374a41aebb8e814f
2017-01-17 15:04:43 +01:00
Mathieu Leplatre
8f6110a8e5
Bug 1331604
- Upgrade kinto libraries (r=glasserc,RyanVM)
...
MozReview-Commit-ID: AfbkZozKDzb
--HG--
extra : rebase_source : 7a2ad054d5d449903a1d659ace183d3ecc613c01
2017-01-18 14:53:52 +01:00
Wes Kocher
20dc006d88
Backed out 14 changesets (bug 1330791) for various android failures a=backout
...
Backed out changeset eada8de7256f (bug 1330791)
Backed out changeset a3c656a9f3ca (bug 1330791)
Backed out changeset e0cbc754e841 (bug 1330791)
Backed out changeset 49d8016fab12 (bug 1330791)
Backed out changeset 53d4b83ccd22 (bug 1330791)
Backed out changeset b35cbfcd801f (bug 1330791)
Backed out changeset 25a6356de622 (bug 1330791)
Backed out changeset 46f9c247550d (bug 1330791)
Backed out changeset ef7356099bd3 (bug 1330791)
Backed out changeset a5fe483288db (bug 1330791)
Backed out changeset 4902107b7568 (bug 1330791)
Backed out changeset 5b2b2be2e389 (bug 1330791)
Backed out changeset 610ec89e98bb (bug 1330791)
Backed out changeset 631adda26a21 (bug 1330791)
MozReview-Commit-ID: GGUFW29U3TL
2017-01-17 17:06:36 -08:00
Jared Wein
4bca295e61
Bug 1330791 - Enable the no-native-reassign rule for eslint in /services and fix the associated error. r=markh
...
MozReview-Commit-ID: 65EsZGCJPMD
--HG--
extra : rebase_source : 716697450e8506240a50a29508bf4943c37f48ef
2017-01-12 18:28:48 -05:00
Jared Wein
2da3b5c9e4
Bug 1330791 - Enable the no-ex-assign rule for eslint in /services. There are no associated errors with enabling this rule. r=markh
...
MozReview-Commit-ID: 8AsaN1gyjkm
--HG--
extra : rebase_source : b6dd88509994bd402bc976916bd155f6552f4996
2017-01-12 18:27:39 -05:00
Jared Wein
5736b2a7b2
Bug 1330791 - Enable the no-cond-assign rule for eslint in /services. There are no associated errors with enabling this rule. r=markh
...
MozReview-Commit-ID: BM83kDZJpZ3
--HG--
extra : rebase_source : e458f2990fea6a9374237c5d1d128c3b71075d4b
2017-01-12 18:27:00 -05:00
Jared Wein
3ebade8189
Bug 1330791 - Enable the brace-style rule for eslint in /services and fix the associated errors. r=markh
...
MozReview-Commit-ID: Ebl3bODX14z
--HG--
extra : rebase_source : f708038a1e3d27f7397d2ff6ac8981d1e5fa5d43
2017-01-12 18:24:52 -05:00
Jared Wein
40ff88887b
Bug 1330791 - Enable the no-octal rule for eslint and fix the associated error. r=markh
...
MozReview-Commit-ID: LLYKmP7HOei
--HG--
extra : rebase_source : f10d3c6fe0816cea4054132833736182f60ac555
2017-01-12 18:21:43 -05:00
Jared Wein
16f3cc90b4
Bug 1330791 - Enable the no-redeclare rule for eslint in /services and fix the associated errors. r=markh
...
MozReview-Commit-ID: 7ADLmPB4eSu
--HG--
extra : rebase_source : 2305e778e5a37a6c32753b021789c3a8c0077c69
2017-01-12 18:19:47 -05:00
Jared Wein
e4956c0ce7
Bug 1330791 - Enable the no-unreachable rule for eslint in /services and fix the associated errors. r=markh
...
MozReview-Commit-ID: e60hfjiUmS
--HG--
extra : rebase_source : 5d6d804683d45c7e08bac19ffa7d04a56c298adb
2017-01-12 18:18:31 -05:00
Jared Wein
41155f0fea
Bug 1330791 - Enable the no-unsafe-finally rule for eslint in /services. There are no associated errors with this rule. r=markh
...
MozReview-Commit-ID: E057aetXRv
--HG--
extra : rebase_source : 26b2b0e92bcd0bfbf4e5ecbae9f82fccbcc07558
2017-01-12 18:16:34 -05:00
Jared Wein
d3dba448bd
Bug 1330791 - Enable no-else-return rule for eslint in /services and fix associated errors. r=markh
...
MozReview-Commit-ID: 7Os4uZQCDox
--HG--
extra : rebase_source : 8d14b02c97b8024268b5625a633393e75efed117
2017-01-12 18:14:54 -05:00
Jared Wein
f60caed47a
Bug 1330791 - Enable the no-empty rule for eslint. There were no associated errors with this rule. r=markh
...
MozReview-Commit-ID: JlhO0F45cYL
--HG--
extra : rebase_source : deda15122cb9b34f1f177e19cb1d08613468e90b
2017-01-12 18:09:24 -05:00
Jared Wein
e1a3fb1d47
Bug 1330791 - Enable the no-useless-call eslint rule for /services and fix associated errors. r=markh
...
MozReview-Commit-ID: Ixd7jk5G5CB
--HG--
extra : rebase_source : a4c226744a30df49d408a8c904fefa27b1439388
2017-01-12 18:08:10 -05:00
Jared Wein
42349d27b4
Bug 1330791 - Enable the no-unused-vars rule for eslint in /services and fix associated errors. r=markh
...
MozReview-Commit-ID: DFcvEllwGSb
--HG--
extra : rebase_source : 24dc56342d6b1a95df64c0c7c5a1819344cfe603
2017-01-12 18:02:08 -05:00
Jared Wein
0a92e3f3d3
Bug 1330791 - Enable the no-irregular-whitespace rule for /services and fix the associated errors. r=markh
...
MozReview-Commit-ID: 5rledRlxUl2
--HG--
extra : rebase_source : 662cd590663b6fb5d8efa091704343bd180fabb2
2017-01-12 17:27:34 -05:00
Jared Wein
6e7a183d9a
Bug 1330791 - Enable the no-mixed-spaces-and-tabs rule and fix the associated errors. r=markh
...
MozReview-Commit-ID: D1CTiez7BDy
--HG--
extra : rebase_source : ef904deee535d301d0cf33d9d941d254036ba442
2017-01-12 17:24:41 -05:00
Thom Chiovoloni
0861a8ce52
Bug 1312094 - Don't show 'send to device' for huge or otherwise unsyncable URIs. r=markh
...
MozReview-Commit-ID: 8Eh23UGOwNv
--HG--
extra : rebase_source : 635e6bf7eb2763e7d417770782270bd636676d39
2017-01-09 17:38:34 -05:00
Jared Wein
43bac26d30
Bug 1331661 - Enable the 'quotes' rule for eslint and fix most of the errors with --fix. r=Gijs
...
MozReview-Commit-ID: 6tv0Z06CO4a
--HG--
extra : rebase_source : 014c0b04d8538dc5f15bc6dd4ed6bd220c55c5d4
2017-01-17 09:48:17 -06:00
Florian Quèze
85611a7b6d
Bug 1331081
- script generated patch to omit addEventListener/removeEventListener's third parameter when it's false, r=jaws.
...
--HG--
extra : rebase_source : a22344ee1569f58f1f0a01017bfe0d46a6a14602
2017-01-17 11:50:25 +01:00
Wes Kocher
f8a62a9ce6
Merge m-c to inbound, a=merge
...
MozReview-Commit-ID: ASajzspkOe1
2017-01-13 15:48:34 -08:00
Florian Quèze
22d9b71466
Bug 1330464 - make the no-useless-parameters eslint rule detect misuses of the Services.prefs APIs, r=jaws.
2017-01-13 20:21:55 +01:00
Florian Quèze
1e42cad36c
Bug 1330464 - script-generated removal of additional parameters that don't exist in the interface, r=jaws.
2017-01-13 20:21:53 +01:00
Jared Wein
9a0aefca79
Bug 1330014 - Remove extra lines that eslint --fix adds for no-useless-return. r=standard8
...
MozReview-Commit-ID: Be36laqLQQ2
--HG--
extra : rebase_source : 48f6fc7a832e51035c04ea825f77a38cb08a7151
2017-01-10 12:08:32 -05:00
Jared Wein
65605f286e
Bug 1330014 - Add .eslintrc.js file to /services and run eslint --fix to automatically fix most of the errors. --fix brings the error count down from 4083 to 321 errors. r=markh,standard8
...
MozReview-Commit-ID: EjyAssqiQk8
--HG--
extra : rebase_source : cbfc8d4474b6c3d46eb21374e33fd3341403444f
2017-01-10 12:09:02 -05:00
Iris Hsiao
55313b4bc9
Backed out changeset 7e0a0bd74199 (bug 1330014)
2017-01-13 11:06:43 +08:00
Iris Hsiao
303147b9fa
Backed out changeset afe70927277c (bug 1330014) for xpcshell test_storage_manager.js failures
2017-01-13 11:06:38 +08:00
Jared Wein
dd7ec3a99b
Bug 1330014 - Remove extra lines that eslint --fix adds for no-useless-return. r=standard8
...
MozReview-Commit-ID: Be36laqLQQ2
--HG--
extra : rebase_source : 05c863e038aa1a6571500f4178c325b1b9913af9
2017-01-10 12:08:32 -05:00
Jared Wein
81cb5e57b9
Bug 1330014 - Add .eslintrc.js file to /services and run eslint --fix to automatically fix most of the errors. --fix brings the error count down from 4083 to 321 errors. r=markh,standard8
...
MozReview-Commit-ID: EjyAssqiQk8
--HG--
extra : rebase_source : d783829bc7fced3044d0d076c4786a6957d29bb6
2017-01-10 12:09:02 -05:00
Ethan Glasser-Camp
90c9daf114
Bug 1320324: deleted values are not handled correctly on sync, r=markh
...
No tests existed for this functionality either, so add some.
MozReview-Commit-ID: FkHV0GBTHov
--HG--
extra : rebase_source : 3784eca629db62cc1f92a87622afe0f3da091501
2016-12-22 13:37:12 -05:00
Kit Cambridge
08ec8494fb
No bug - Log tracker contents in test_telemetry.js to diagnose intermittent failures. a=testonly
...
MozReview-Commit-ID: 2qUNV7Cz7pd
--HG--
extra : rebase_source : b9c6e4c6adc506f05ef7ec5982444aebdba32fc4
2017-01-11 15:30:25 -07:00
Florian Quèze
a03918c148
Bug 1330147 - automatic removal of the third boolean parameter in removeObserver calls, r=jaws.
2017-01-11 22:27:42 +01:00
Mark Banner
582fcb8090
Bug 1329614 - [eslint] Catch more cases of importing globals from 'var foo = Cu.import('...');'. r=jaws
...
MozReview-Commit-ID: 5NKHHb70YA6
--HG--
extra : rebase_source : 4551e56f56065349fb9ddc8d90e67f9dc84c1701
2017-01-09 10:12:26 +00:00
Carsten "Tomcat" Book
89882dc5f4
merge mozilla-inbound to mozilla-central a=merge
2017-01-10 12:11:31 +01:00
Mark Banner
dca9ea6f22
Bug 1329621 - test_crypto_random.js attempts to test different key algorithms, but WeaveCrypto no longer supports them. r=rnewman
...
MozReview-Commit-ID: AsI0c9cVSug
--HG--
extra : rebase_source : 966a022129824b84f74d335576cd4d17294180e2
2017-01-09 11:05:22 +00:00
Mark Hammond
5f7905c8f3
Bug 1289536 (part 2) - Add a unique flowID GUID to each command sent via the clients collection. r=rnewman
...
MozReview-Commit-ID: 4eTFDq4Yr7S
--HG--
extra : rebase_source : faa5cb3ddd41e107b898412b0c9c5899df91c335
2016-11-04 12:46:57 +11:00
Mark Hammond
85c80336b8
Bug 1289536 (part 1) - Add events to Sync ping. r=gfritzsche
...
MozReview-Commit-ID: 184fIhelOa6
--HG--
extra : rebase_source : bf7c96a473b92a42411fe5c94ac6802d42ff57d5
2016-11-04 17:57:09 +11:00
Edouard Oger
cc7fbb3df8
Bug 1201335 - Display notification when a new device is added to Sync account. r=markh
...
MozReview-Commit-ID: D03prgIdL1M
--HG--
extra : rebase_source : 424372a3499e121cb76553f55d94057b017f2482
2017-01-04 19:21:36 -05:00
Thom Chiovoloni
1330224f6a
Bug 1301389 - Only include the uid and device ID once in the sync ping. r=markh
...
Previously this was included for each sync. In addition to being less efficient,
this makes certain info that's planned to be added in the future more difficult.
MozReview-Commit-ID: fjOvAJJVI6
--HG--
extra : rebase_source : edb9a60a101c1110560c1ceb61a927248bed06e9
2016-11-21 16:34:46 -05:00
Kit Cambridge
1897a70d72
Bug 1325523 - Clean up after tests that modify tracker contents. r=markh
...
MozReview-Commit-ID: 45g4n4UipTW
--HG--
extra : rebase_source : 1be78706cab9b42d0c6c949243b9a835351486fa
2016-12-29 18:18:38 -07:00
David Keeler
104c38c723
bug 1324071 - add nsIPK11Token.hasPassword to replace unnecessary uses of nsIPKCS11Slot.status r=Cykesiopka,gps,MattN,sebastian
...
MozReview-Commit-ID: C2jwQHPEDC0
--HG--
extra : rebase_source : 16271e70ef32da8657cdc4f8df41b7822430e3bf
2016-12-02 15:09:35 -08:00
Kit Cambridge
4797a3b6cd
Bug 1319175 - Switch to `JSONFile` for tracker persistence. r=markh
...
MozReview-Commit-ID: 6nhGe9aHSk3
--HG--
extra : rebase_source : 43449f689a47287e034b80d3cbdd2fd5fbba44ab
2016-12-20 12:25:27 -07:00
Florian Quèze
fc6379e827
Bug 1329182 - remove trailing newURI null parameters in the rest of the tree, r=jaws.
2017-01-09 20:27:26 +01:00
Mark Goodwin
31afeff0c3
Bug 1283109 - Create a services client for augmenting the STS preload list between releases. r=leplatrem
...
MozReview-Commit-ID: H9zZpBwJRgi
--HG--
extra : rebase_source : ae9f58eea512c020ea96fe293c7825bbcc3ccf15
2016-12-21 15:36:31 +00:00
Mark Hammond
b59199d7c5
Bug 1324583 - don't log an error on normal FxA device disconnection. r=kitcambridge
...
MozReview-Commit-ID: 8NG2AftJdDR
--HG--
extra : rebase_source : ffa6499a27e92c2fe2ad94f1a988b435fc7f05b2
2016-12-20 10:00:36 +11:00
Mark Goodwin
a4645b5275
Bug 1306470 - Create a services client for augmenting the PKP preload list between releases. r=leplatrem
...
This makes use of the recent changes to the nsISiteSecurityService (from bug
1306471) to provide a self-updating public key preload list.
MozReview-Commit-ID: 4s3LORibAN1
--HG--
extra : rebase_source : 90a5a242177d4d8826c80e6c1f424805b62608d4
2016-12-16 16:34:42 +00:00
Kris Maglione
22eba76d86
Bug 987512: Part 5 - Remove manual AddonManager promise wrappers. r=rhelmer
...
MozReview-Commit-ID: LrEiGbQGrt6
--HG--
extra : rebase_source : 38971f7242261e5d8b11d586f6eb033b6364c6cf
extra : histedit_source : 0b9403a97d3f3092b8991e8e6af5095b898dd8c3
2016-12-15 12:03:24 -10:00
Kit Cambridge
8558928fe7
Bug 1322954 - Fix incorrect `instanceof` negations. r=markh
...
MozReview-Commit-ID: PgQmAu9hbQ
--HG--
extra : rebase_source : 376b83af517442cc05bc46ff7ca36e6ac46b06e2
2016-12-12 13:50:10 -08:00
Wes Kocher
b5de71ec44
Merge m-c to autoland, a=merge
2016-12-01 15:46:49 -08:00
Wes Kocher
d360bdebf5
Merge inbound to central, a=merge
2016-12-01 15:31:47 -08:00
Ethan Glasser-Camp
b80b66c130
Bug 1319884 - Address FirefoxAdapter feedback from kinto.js#589, r=mgoodwin
...
Change FirefoxAdapter definitively to require an externally-managed
Sqlite connection in order to function. This connection must be
produced by calling an openConnection() static method, which does the
work of initializing the tables and schema. Passing any other
connection is wrong, but won't be detected at runtime, and might even
work depending on the previous state of the database. Future work
might define a new KintoSqliteConnection type that can only be
produced by this method, so that it's impossible to create an
uninitialized Kinto database.
This change, since it moves Sqlite connections out of the
FirefoxAdapter, also means that the path option is no longer handled
or provided with a default. This means that the previous default,
"kinto.sqlite", is now preserved in a bunch of places all over the
codebase. This is unfortunate, but a migration is outside the scope of
this patch.
MozReview-Commit-ID: BKJqPR3jOTq
--HG--
extra : rebase_source : 91e0027890ac5fd0ba683abddc23e268f672d169
2016-11-23 14:18:53 -05:00
Kit Cambridge
666a52df0a
Bug 1319037 - Disable trace logging and increase timeout factor for test_bookmark_tracker.js. a=testonly
...
MozReview-Commit-ID: EmSdy92cYzc
--HG--
extra : rebase_source : 8e15718c657cbd7fd1ecae0bf4a4c86c51a70b8c
2016-11-29 13:21:56 -07:00
Kit Cambridge
52ddf2d3d0
Bug 1319328 - Wait for pending statements before checking annos in test_mobile_query. a=testonly
...
MozReview-Commit-ID: BW5b0FgvwMD
--HG--
extra : rebase_source : 6af0f95c3aca4e434533bc496f1b695b8c74100d
2016-11-29 13:13:20 -07:00
André Bargull
82ed270fce
Bug 1319937 - Remove String generics uses in services/sync. r=markh
2016-11-24 13:17:08 -08:00
Thom Chiovoloni
39c3163cf7
Bug 1321396 - Skip oversized records without aborting the sync by default in sync engines. r=markh
...
MozReview-Commit-ID: 7hgzyKb2UxY
--HG--
extra : rebase_source : 7c7f238a8e46b0776afe83798061d1539b07f76c
2016-11-30 17:28:52 -05:00
Mark Hammond
632c46235a
Bug 1317216 - consistently use the Sync client GUID as the basis for the device ID in the sync ping. r=tcsc
...
MozReview-Commit-ID: BDTqnM7de6n
--HG--
extra : rebase_source : 169b3ad54dd19b5ef319d1e09684c0fd474e695b
2016-11-10 19:12:55 +11:00
Mark Hammond
40140fc9de
Bug 1319323 (part 2) - improve sync unit tests; SyncTestingInfrastructure now uses the FxA identity provider. r=tcsc
...
MozReview-Commit-ID: 2zpZMpvbAy
--HG--
extra : rebase_source : a33b15a3ef8acf39a7a423694093a690ca519c88
2016-11-22 15:03:47 +11:00
Mark Hammond
f3312b9b72
Bug 1319323 (part 1) - improve sync unit tests; remove many ensureLegacyIdentityManager calls. r=tcsc
...
MozReview-Commit-ID: CV6cpo2Tp5O
--HG--
extra : rebase_source : 03f8fb39e69065bf7263b8bc20e4b2641a247b01
2016-11-21 12:22:24 +11:00
Kit Cambridge
73fba410f4
Bug 1173359 - Exclude hidden pages and framed links from syncing. r=markh
...
MozReview-Commit-ID: 8I4Sulyr0H7
--HG--
extra : rebase_source : 55fb1ff567c0a2916bc0153a09c41b03d396cfeb
2016-11-22 12:52:09 -07:00
Kit Cambridge
ce8909d3fb
Bug 1173359 - Convert the history tracker tests to use async functions. r=markh
...
MozReview-Commit-ID: CFNLQkRa7Qb
--HG--
extra : rebase_source : 086dbe074f6979428e826aa1faa7ab75100a0dad
2016-11-22 12:34:02 -07:00
Mark Hammond
682d81fa5d
Bug 1316500 - remove use of tasks and promise.jsm promises from Sync tests. r=tcsc
...
MozReview-Commit-ID: 5itPSLBKguc
--HG--
extra : rebase_source : 2b16f697902736ef39cded96c1bd98b547136263
2016-11-10 14:34:38 +11:00
Thom Chiovoloni
15acd98009
Bug 1273342 - Don't retry skippable records that fail to sync due to being too large. r=markh
...
MozReview-Commit-ID: HjzL1crTVDB
--HG--
extra : rebase_source : 887c3364bf0dec05353c2ea7e7c23d6393158fa3
2016-11-21 15:37:35 -05:00
Ethan Glasser-Camp
5a6b486919
Bug 1318669 - Remove stripPrivateProps from blocklist-clients.js, r=mgoodwin
...
MozReview-Commit-ID: 84yvzpBr3Q6
--HG--
extra : rebase_source : 727b0d86405c9f4db217a290b7fd7c68d689b2f4
2016-11-18 10:07:39 -05:00
Ethan Glasser-Camp
877252b989
Bug 1317841 - Stylistic pass on new kinto-storage-adapter, r=MattN
...
- Reflow things to try to avoid long lines.
- Add terminal comma where possible.
MozReview-Commit-ID: 1USxo0lO33w
--HG--
extra : rebase_source : 0869cc9f9ba29cc39b227a0694e9cd6d635ccc3f
2016-11-16 11:13:32 -05:00
Ethan Glasser-Camp
4742db4baa
Bug 1317841 - Update version of kinto.js to v6.0.0, r=MattN
...
This major version of kinto.js released without a FirefoxStorage
adapter. Since Gecko is the only project with a need for this adapter
as well as the only one who can use it, that file moves to this repo
as a new kinto-storage-adapter.js. This file is mostly a copy of the
most recent FirefoxStorage.js, plus some other non-exported utility
functions copied from kinto.js to make it work.
This changes the export of the kinto-offline-client.js from a
`loadKinto` function which returns the Kinto class, to the actual
Kinto class itself, with the user expected to "hook up" the
adapter. It turns out that this doesn't change much in how we actually
use Kinto, since we were always previously explicitly selecting the
Kinto adapter.
This release of kinto.js also changes some of the build options
around, which changes the minified output of kinto-offline-client.js.
There are still some outstanding stylistic complaints about
FirefoxAdapter having to do with its _init static method which is
public and the fact that sometimes FirefoxAdapter manages its own
Sqlite connection and sometimes it doesn't. These will be addressed in
a future patch.
MozReview-Commit-ID: HF0oNCEDcFs
--HG--
rename : services/common/kinto-offline-client.js => services/common/kinto-storage-adapter.js
extra : rebase_source : 11d01e573b259798305494ac072575247ac01e2c
2016-11-15 19:38:53 -05:00
Kit Cambridge
8c2abe0611
Bug 1318414 - Default to empty strings for titles and parent titles if not set. r=rnewman,tcsc
...
MozReview-Commit-ID: DppxJuVrbAM
--HG--
extra : rebase_source : a214d54fda7d25798039fc9844c34cabd3165a27
2016-11-19 08:29:26 -08:00
Kit Cambridge
ccee4d37f5
Bug 1258127 - Add migration logic for old synced bookmarks. r=markh,rnewman
...
MozReview-Commit-ID: Gye30bYZejy
--HG--
extra : rebase_source : 882c4769d28ad4b56829e5b6037f74c04028f03a
2016-11-18 14:00:56 -08:00
Kit Cambridge
4c26a7b758
Bug 1258127 - Move bookmark deletion logic into `PlacesSyncUtils.bookmarks.remove`. r=tcsc
...
This patch moves most of `BookmarksStore::deletePending` and
`BookmarksStore::_shouldReviveRemotelyDeletedRecord` into
`PlacesSyncUtils.bookmarks.remove` and `touch`, respectively. Both
methods use the same approach as `PlacesSyncUtils.bookmarks.dedupe` to
amend the `_modified` changeset with new change records.
We use the new `SYNC_REPARENT_REMOVED_FOLDER_CHILDREN` change source to
bump the change counters for the reparented items and their new
parents, without bumping the score and triggering extra syncs.
MozReview-Commit-ID: 1SZvygWNkgL
--HG--
extra : rebase_source : 97fdac6ccb0d0326a3da7e42259dc6a961994ac3
2016-11-17 15:07:14 -08:00
Kit Cambridge
69350f8b7b
Bug 1258127 - Move bookmark de-duping logic into `PlacesSyncUtils.bookmarks.dedupe`. r=markh
...
This patch moves the logic from `BookmarksEngine::_switchItemToDupe`
into `PlacesSyncUtils.bookmarks.dedupe`, and updates it to work with
the new tracker. `dedupe` returns an object containing new change
records, which the bookmarks engine merges into the initial changeset
from `PlacesSyncUtils.bookmarks.pullChanges`.
This patch also removes `changeItemID` and
`PlacesSyncUtils.bookmarks.changeGuid`, since `dedupe` subsumes them.
MozReview-Commit-ID: Iw3YRxWuZnK
--HG--
extra : rebase_source : 6fd80c64b160103e1090b87a300ed74b8ef85eed
2016-11-17 15:04:19 -08:00
Kit Cambridge
ccf45973d0
Bug 1258127 - Update the bookmarks engine to pull changes from Places. r=markh
...
MozReview-Commit-ID: 4YESuxP2rRf
--HG--
extra : rebase_source : 9c2f5830d10ba280e45c30076f19f498e6913fd0
2016-11-17 15:39:15 -08:00
Sebastian Hengst
0849ed2bea
Backed out changeset c644b01be649 (bug 1318414) for failing xpcshell test test_bookmark_store.js. r=backout
2016-11-19 09:35:02 +01:00
Kit Cambridge
96702bd1f2
Bug 1318414 - Default to empty strings for titles and parent titles if not set. r=rnewman,tcsc
...
MozReview-Commit-ID: DppxJuVrbAM
--HG--
extra : rebase_source : 649bc0b945c8a2dd69dade682bf80c874053bc92
2016-11-17 10:42:32 -08:00
Phil Ringnalda
1583627c71
Backed out changeset ca02f30bc3a0 (bug 1316500) for eslint failures
2016-11-16 19:32:10 -08:00
Mark Hammond
a5e2bb0e72
Bug 1317589 - store the most recent hashed UID so we can still report it on transient errors renewing tokens. r=tcsc
...
MozReview-Commit-ID: 4qCFBltcPi1
--HG--
extra : rebase_source : 4ee6b0725729e8db2ba8d18d06dce7816a5e1da3
2016-11-15 16:03:41 +11:00
Mark Hammond
e35c5ab29f
Bug 1316500 - remove use of tasks and promise.jsm promises from Sync tests. r=tcsc
...
MozReview-Commit-ID: 5itPSLBKguc
--HG--
extra : rebase_source : 9c0ee4387d4b3d7df56c1e9ccda0ec39cd5b11e2
2016-11-10 14:34:38 +11:00
Mark Hammond
9c1b1b298b
Bug 1317587 - don't start scheduled sync after shutdown. r=rnewman
...
MozReview-Commit-ID: GSyWAUa1qyr
--HG--
extra : rebase_source : 45d0dfd5c686803f017230ab6152d0204a3d4c8e
2016-11-15 15:28:52 +11:00
Mark Hammond
e6302fe87d
Bug 1317592 - don't try syncing other engines after one fails with a shutdown error. r=rnewman
...
MozReview-Commit-ID: LZ72JbOtpm4
--HG--
extra : rebase_source : 00493ea6d24470e5b45a2d42e8b64468427f89d3
2016-11-15 16:15:03 +11:00