fde361620f
merge mozilla-inbound to mozilla-central a=merge
2015-11-12 12:00:55 +01:00
73f6c40812
Bug 1197625 - delay sync on wake for 5 seconds in the hope the network is back up by then. r=rnewman
2015-11-12 10:54:55 +11:00
4f99faeaed
Bug 967873 - Proxy nsDocumentViewer::PermitUnload to the child process (r=Gijs)
2015-11-11 18:04:21 -08:00
17d87da8ac
Bug 1217077 - Remove for-each from services/. r=gps
...
--HG--
extra : commitid : Fyer74kcwGc
2015-10-19 03:52:58 +09:00
84680f0783
Merge mozilla-central to fx-team
2015-11-04 12:43:13 +01:00
77a625b250
Bug 691849 - Replace custom Sync notification bars with standard ones. r=markh
2015-11-04 10:21:47 +01:00
1a625d9f04
Bug 1216623 - Part 1: Rename some loop variables to avoid conflicts with ES6 scoping rules. r=fitzgen, r=ttaubert, r=MattN, r=gps.
...
--HG--
extra : commitid : 3eLC5U91GM8
extra : rebase_source : 0933f07c19c0ba87fc34ddd9beaff4bb89e7c690
extra : amend_source : 76fa887d541bfd9f6592b6a6113d76b4df82dea0
2015-10-26 16:33:59 -05:00
f24fea9d1a
Bug 643633 - Remove TTLs from form history records. r=markh,nalexander
...
--HG--
extra : commitid : HxQHAP2SacO
2015-10-30 22:19:56 -07:00
d31ed2617b
Merge inbound to central, a=merge
...
--HG--
extra : commitid : GwjoFY5dx7Q
2015-10-30 16:35:46 -07:00
5d07d0d9b5
Bug 1216749 - Additional kinto client tests (r=rnewman)
2015-10-30 09:02:01 +00:00
199296f744
Bug 1216749 - Land the Firefox Kinto.js client (r=rnewman)
...
Kinto.js lives here: https://github.com/Kinto/kinto.js - there is a set of files
(currently in a branch) that allow creation of the jsm included in this patch.
The branch is here: https://github.com/Kinto/kinto.js/tree/212-firefox-entry-point
To create the jsm, run 'npm run dist-fx' in the kinto.js dir
2015-10-30 09:01:58 +00:00
ec6c8fefef
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
2015-10-29 07:45:54 -04:00
cf26a3fcc7
Merge m-c to fx-team, a=merge
2015-10-22 16:58:03 -07:00
008e0c5f43
Bug 1205928 - update the Sync migration code to automatically and unconditionally disconnect from legacy Sync. r=adw
2015-10-23 08:37:31 +11:00
9fcc822888
Backed out changeset 1df2049352ff (bug 1205928) for bc7 test bustage on a CLOSED TREE
2015-10-21 12:01:38 +02:00
43b5036225
Bug 1205928 - update the Sync migration code to automatically and unconditionally disconnect from legacy Sync. r=adw
...
--HG--
extra : rebase_source : d25e174f975077705bb0070161253e34a22e478e
2015-10-21 15:00:13 +11:00
a2be7792f3
Bug 1215509 - Allow signUp in FxAccountsClient to use ?key=true. r=markh
2015-10-22 16:18:17 +08:00
853a55e6e0
Bug 1124185 - Replace removeAllPages with history.clear() and deprecate it. r=mak
...
--HG--
extra : transplant_source : %A1QQ%C1T%99y%9B%92%3A%D6Jc%E9%D1UoQ%C3X
2015-10-28 13:51:59 -04:00
22e4079a60
Bug 1211606 - Only fetch keys when Sync is enabled via 'services.sync.enabled' pref changed from Gaia. r=fabrice
2015-10-15 23:36:58 +02:00
f8d9dac2f5
Bug 1214076 - allow TokenServerClient errors to be JSON.stringify'd. r=rnewman
2015-10-15 08:57:31 +11:00
11d951d563
Bug 1212633 - include mobile and unfiled folders in Sync's concept of 'all IDs'. r=rnewman
2015-10-13 10:32:18 +11:00
b212501277
Bug 1167627 - Part 9: Use mozinfo in services/. r=rnewman
2015-10-11 21:50:00 +02:00
c5d5457154
Back out bug 967873 - Proxy nsDocumentViewer::PermitUnload to the child process
2015-10-07 11:15:11 -07:00
08997000eb
Backed out 2 changesets (bug 1202902) to recking bug 1202902 to be able to reopen inbound on a CLOSED TREE
...
Backed out changeset 647025383676 (bug 12029021202902
2015-10-07 14:03:21 +02:00
e7ef778c9d
Backed out 1 changesets (bug 1202902) for causing merge conflicts to mozilla-central
...
Backed out changeset cfc1820361f5 (bug 1202902
2015-10-07 12:13:45 +02:00
d06b6030f6
Bug 1202902 - Scripted fix the world.
2015-10-06 14:00:31 -07:00
e664d8af04
Bug 820865 - Clean up Sync strings. r=rnewman
...
--HG--
extra : rebase_source : 06451c643eb7a4c77710c84a878a586f130d2b83
2015-09-26 08:49:37 +07:00
207404ad2d
Bug 967873 - Proxy nsDocumentViewer::PermitUnload to the child process (r=Gijs)
2015-10-01 21:18:48 -07:00
d176e0d847
Bug 1204965 - Graphene support. Merge larch into mozilla-central. r=fabrice r=glandium
2015-09-30 23:49:00 +02:00
639d6c6d42
Bug 1207840 - add '?service=sync' to the URL used when disconnecting from Sync. r=zaach
2015-09-30 09:34:37 +10:00
1f8ec8e3d4
Bug 1207496 - Part 4: Remove use of expression closure from services/sync/. r=gps
...
--HG--
extra : commitid : JyCsU57jx9W
extra : rebase_source : ed21660ac295a1d1a2fd423e86b8a74267eba088
2015-09-23 18:40:53 +09:00
1bddf54a42
Bug 1207496 - Part 3: Remove use of expression closure from services/fxaccounts/. r=markh
...
--HG--
extra : commitid : HCAQePE8WbS
extra : rebase_source : 2d0c293f88060e187f92f437b2b45aa2c50cfb04
2015-09-23 18:40:52 +09:00
eee84639cb
Bug 1207496 - Part 2: Remove use of expression closure from services/crypt/. r=mrbkap
...
--HG--
extra : commitid : LkPx7u92lV8
extra : rebase_source : 6de876017e9758260ea3ba84633262d44e7bdee5
2015-09-23 18:40:52 +09:00
95e75e96f8
Bug 1207496 - Part 1: Remove use of expression closure from services/common/. r=gps
...
--HG--
extra : commitid : EeWW6zhKp9t
extra : rebase_source : b23def2c39cad03dd5e4b3a3b440e43d3b343b7a
2015-09-23 18:40:52 +09:00
e348d6bbbb
Bug 1205111 - return a transient error on 401 fetching info/collections using FxA. r=rnewman
2015-09-28 17:21:42 +10:00
9db1b58606
No bug - convert 3 test files from CRLF to LF line-endings, r=me
2015-09-28 16:29:06 +10:00
702e137410
Bug 1208376 - Disable v2 data upload in Firefox 42+. r=gfritzsche
2015-09-25 06:02:00 +02:00
a22c2d1f9e
Bug 1192924: Expose the update URL formatting code a new UpdateUtils module. r=rstrong
...
The GMP manager uses a copy of the update service's url formatting code and has
since fallen out of sync. We'll also want to use the same formatting code for
the system add-on update checks so this just exposes it in a shared API.
I've moved the contents of UpdateChannel.jsm to UpdateUtils.jsm and exposed
formatUpdateURL there as well as a few properties that the update service still
needs access to.
UpdateUtils.UpdateChannel is intended to be a lazy getter but isn't for now
since tests expect to be able to change the update channel at runtime.
--HG--
extra : commitid : KsbH21csjH4
extra : rebase_source : bc7c08de1ec6e802261b8cd294d88ee2c4e75c2d
2015-09-14 11:04:19 -07:00
468b697f04
Backed out 3 changesets (bug 1192924) for Android bustage CLOSED TREE
...
Backed out changeset 30d612836685 (bug 1192924)
Backed out changeset a6860f880e01 (bug 1192924)
Backed out changeset 10e1fa2cc23a (bug 1192924)
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app1/features/system1@tests.mozilla.org.xpi
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_1.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app1/features/system2@tests.mozilla.org.xpi
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_2.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app2/features/system1@tests.mozilla.org.xpi
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_1.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app2/features/system3@tests.mozilla.org.xpi
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app3/features/system1@tests.mozilla.org.xpi
2015-09-22 11:02:55 -07:00
fb7653707b
Bug 1192924: Expose the update URL formatting code a new UpdateUtils module. r=rstrong
...
The GMP manager uses a copy of the update service's url formatting code and has
since fallen out of sync. We'll also want to use the same formatting code for
the system add-on update checks so this just exposes it in a shared API.
I've moved the contents of UpdateChannel.jsm to UpdateUtils.jsm and exposed
formatUpdateURL there as well as a few properties that the update service still
needs access to.
UpdateUtils.UpdateChannel is intended to be a lazy getter but isn't for now
since tests expect to be able to change the update channel at runtime.
--HG--
extra : commitid : FuPUB9X4oYJ
extra : rebase_source : cfcd31d7da5f5b636a2ec11546dbada973d681de
extra : histedit_source : 3df840dc502c6ee4177f1858920d1260e4dc27af
2015-09-14 11:04:19 -07:00
875e811e58
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
2015-09-21 10:15:23 -04:00
053d626c80
Bug 1124428 - Add telemetry probes for FxA-related authentication issues. r=markh,vladan
...
--HG--
extra : commitid : AgENo3CiQTo
extra : rebase_source : 502d7dd6ac9e0931119df9ee26ab5c10fe7aa037
2015-09-15 18:18:04 -07:00
64db2267cf
Bug 1202902 - Mass replace toplevel 'let' with 'var' in preparation for global lexical scope. (rs=jorendorff)
2015-09-15 11:19:45 -07:00
1a0ce23fe9
merge mozilla-inbound to mozilla-central a=merge
2015-09-11 16:36:35 +02:00
8ecf115473
Bug 1200886 - add tooltips to the Sync buttons which reflect the current state of Sync. r=adw
2015-09-11 10:01:22 +10:00
c8c46494d5
Bug 753289 - Apply prefs-related prefs before applying other synced prefs. r=rnewman
...
--HG--
extra : commitid : 6g41EmqibSo
2015-09-10 17:33:50 +01:00
6a04679f34
Bug 753289 - Pre: rename WEAVE_SYNC_PREFS to PREF_SYNC_PREFS_PREFIX.
...
--HG--
extra : commitid : 5R2KFzCCnD4
2015-09-10 17:33:50 +01:00
b6645d901e
Bug 1186348 - don't initialize the sync identity (and thus don't spin the event loop) as Sync initialized. r=ckarlof
2015-09-07 18:11:40 +10:00
beb58d3c00
Bug 1196008 - have test_errorhandler.js use a real server to speed it up. r=rnewman
2015-09-04 08:53:37 +10:00
5b662cbb9a
Bug 999190 - Part 2 - Listen to logout commands from fxa remote server. r=markh
2015-09-01 11:42:00 +02:00
Carsten "Tomcat" Book
Mark Hammond
Bill McCloskey
Tooru Fujisawa
Pablo Almenar
Jason Orendorff
Richard Newman
Wes Kocher
Mark Goodwin
ffxbld
Fernando Jimenez
Andrew Krawchyk
Hiroyuki Ikezoe
Shu-yu Guo
Ekanan Ketunuti
Kevin Grandon
Alessio Placitelli
Dave Townsend
Kit Cambridge
onemen
Edouard Oger