Wes Kocher
8572872387
Merge inbound to m-c
2013-12-19 18:58:45 -08:00
Richard Newman
90d4d0b764
Bug 947772 - Follow-up: fix sneaky test (disabled on some platforms). r=me
2013-12-19 11:48:23 -08:00
Tim Taubert
4be4a6b411
merge m-c to elm
2013-12-19 15:52:32 +01:00
Richard Newman
f54050893e
Merge m-c to s-c.
2013-12-18 21:47:50 -08:00
Richard Newman
6244e79e8b
Bug 947772 - Sync adds tracker observers regardless of engine enabled state. r=gps
2013-12-18 21:42:17 -08:00
Mark Hammond
86a705e741
dump JSON.stringified error on HAWK.signCertificate error
2013-12-19 16:38:35 +11:00
Mark Hammond
160f195539
put sync identity initialization behind a pref
2013-12-19 16:38:35 +11:00
Tim Taubert
f96735c7a9
merge m-c to elm
2013-12-18 17:54:23 +01:00
Chris Karlof
a607ea974b
Bug 949695 - integrate weave with browserid_identity on elm.
2013-12-17 15:45:03 +11:00
Brian Warner
b001fa2734
Bug 949259 (elm) - bring elm up-to-date with patch in bug 949259.
2013-12-17 15:45:03 +11:00
Brian Warner
c8f872faad
Bug 949244 - fix getSignedInUser when the email is still unverified and other FxAccounts.jsm improvements.
2013-12-17 15:45:03 +11:00
Nick Alexander
3bf2796013
Merge m-c to elm
2013-12-16 09:13:10 -08:00
Jeff Walden
5514a61695
Remove an exact-error-message check from an xpcshell test -- error message string format is not a stable interface, and tests shouldn't break when message strings change from time to time. Followup to bug 507998, r=orange
...
--HG--
extra : rebase_source : b30fe2c6dc49c3278e1177bee7e55b6ee833dac6
2013-12-19 16:29:10 -05:00
Nick Alexander
51c2e9cbfe
Merge m-c to elm
...
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-12-12 08:21:15 -08:00
Nick Alexander
4eb068477b
Merge m-c to elm
2013-12-11 14:08:02 -08:00
Nick Alexander
17885804f2
Merge m-c to elm
2013-12-11 10:25:40 -08:00
Ryan VanderMeulen
d9662b7431
Merge fx-team to m-c.
2013-12-13 15:39:51 -05:00
Brian Warner
0ea0c34d5d
Bug 949241 - Enhance HAWK tests. r=rnewman
2013-12-13 12:12:01 -05:00
Chris Karlof
124d02bea1
Bug 772261 - Add duration to token server and client. r=rnewman
2013-12-13 12:12:00 -05:00
Jed Parsons
0152d432ca
Bug 948212 - Fix FxAccounts.jsm: internal.signOut() is not a function. r=markh
2013-12-09 17:15:30 -08:00
Fernando Jiménez
119fa6913e
Bug 943998 - Need debug and uri pref for FirefoxAccounts. r=markh
...
--HG--
rename : services/fxaccounts/FxAccountsConsts.js => services/fxaccounts/FxAccountsCommon.js
2013-12-13 12:37:55 +01:00
Fernando Jiménez
2843b70836
Bug 949526 - FxAccountsManager and B2G implementation. Part 4: Tests. r=markh
2013-12-13 12:25:27 +01:00
Fernando Jiménez
5d402010a7
Bug 949526 - FxAccountsManager and B2G implementation. Part 2: UI Glue r=fabrice
2013-12-13 12:25:26 +01:00
Fernando Jiménez
f9db20d83c
Bug 949526 - FxAccountsManager and B2G implementation. Part 1: FxAccountsManager. r=markh
2013-12-13 12:25:26 +01:00
Gregory Szorc
158ed8b3ec
Bug 774572 - Part 2: Define JAR_MANIFESTS in moz.build files; r=glandium
...
Every directory with a jar.mn now has JAR_MANIFESTS defined in its
moz.build file.
We also removed the may_skip special consideration of jar.mn files
because this information is now available during tier traversal by the
reader courtesy of the variables being present in moz.build files.
--HG--
extra : rebase_source : 21049b15e6bd9cf65b0805ccaccc4ba5aae93c98
extra : amend_source : 0b1ea866d725beef92d37c6f6d475369ac002e19
2013-12-10 16:18:11 +09:00
Fernando Jiménez
cfc17421e6
Bug 950631 - ReferenceError: credentials is not defined in FxAccounts.jsm. r=jedp
2013-12-17 08:48:45 +01:00
Gregory Szorc
158e9a5661
Bug 924307 - More logging and error checking during FHR init; r=rnewman
...
--HG--
extra : rebase_source : d4d0b29eef195b62d133680edfee6bc541159c5c
extra : amend_source : 2ea9b8576a2d91912c1078fe25969bf52dbd05dd
2013-11-21 09:39:16 -08:00
Nick Alexander
93e112c0d8
Merge m-c to elm
2013-11-18 08:22:59 -08:00
Gregory Szorc
c4e75265bc
Bug 939866 - Add Services docs to Sphinx; r=rnewman
...
DONTBUILD (NPOTB)
--HG--
extra : rebase_source : 5e4125ab7faa5493a10db903cf685ee1760f79ec
2013-11-17 19:39:55 -06:00
Jed Parsons
b61a009e33
Bug 951118 - TypeError when null account is verified. r=ferjm
2013-12-17 11:14:11 -08:00
Nick Alexander
954a0cd13b
Merge b-i to elm
...
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
2013-11-13 15:16:51 -08:00
Gregory Szorc
33263936d0
Bug 924307 - Intermittent "reporter is null at abouthealth.js:27"; r=rnewman
...
The error message comes from abouthealth.js not checking if a variable
is null before access. That bug is fixed.
However, the underlying issue of "the reporter is null" still remains.
Logging has been added to hopefully catch issues. The signature of the
failure will change.
--HG--
extra : rebase_source : bc887406a3570a767bae5407b5836314157ac421
extra : amend_source : f22cad2eae46bd08ae25a7d376fbf8e2d1d0ea92
2013-11-20 11:41:08 -08:00
Sam Penrose
0e7a78f6c8
Bug 911384 - Follow-up: tolerate explicitly falsy payloads in computeHAWK. r=rnewman
2013-10-29 13:45:37 -07:00
Richard Newman
ffed248bcc
Merge m-c to elm.
2013-10-30 17:19:21 -07:00
Nick Alexander
b2ece0addd
Merge m-c to elm
2013-10-29 13:13:49 -07:00
Nick Alexander
abaf8ce510
Merge m-c to elm
2013-10-26 17:23:11 -07:00
Mike Hommey
1d566f7586
Bug 929905 - Consolidate sources in moz.build. r=gps
2013-10-25 08:23:05 +09:00
Richard Newman
96df1725af
Merge m-c to s-c.
2013-10-28 17:51:05 -07:00
Lukas Blakk
b28a096524
Merging in version bump NO BUG
2013-10-28 13:37:48 -07:00
Richard Newman
72e1ff6dbd
Bug 925521 - Part 2: correctly record identifiers for non-pre-installed engines. r=gps
...
* * *
Bug 925521 - Review comments.
2013-10-18 12:31:39 -07:00
Richard Newman
8f55a03027
Bug 925521 - Part 1: remove filter on recorded search engine identifiers. r=gps
2013-10-18 12:27:57 -07:00
Nick Alexander
bcdd987f34
Merge fx-team to elm
2013-10-18 11:39:01 -07:00
David Rajchenbach-Teller
9d8c8b77fd
Bug 917883 - Use AsyncShutdown instead of spinning the event loop in healthreporter.jsm. r=gps
2013-11-15 21:46:38 -05:00
Tim Taubert
458faed3e6
No Bug - Fix Log4Moz xpcshell bustage
2013-10-17 11:42:18 -07:00
Tim Taubert
90c78483c7
merge m-c to elm
2013-10-16 10:25:32 -07:00
Sam Penrose
2a656e7a26
Bug 911378 - A BrowserID/Hawk based IdentityManager for Sync. r=rnewman
2013-10-02 23:48:08 +02:00
Nick Alexander
012c065ae0
Merge m-c to elm
2013-10-03 09:19:36 -07:00
Ms2ger
7ffcd856c2
Bug 900980 - Part a: Move unconditional assignments to EXPORT_LIBRARY to moz.build; rs=gps
2013-10-03 09:11:13 +02:00
Zach Carter
20d5669512
Bug 913199 - Use HTTPS for FxAccounts server URL. r=rnewman
...
--HG--
extra : rebase_source : 61f4e1d3f071da8ec504b0a91e77926eac72f86d
2013-09-27 12:02:20 -07:00
Richard Newman
8e35b44d23
Merge m-c to s-c.
2013-09-26 21:32:35 -07:00
Richard Newman
1e2eae316d
Bug 911478 - Intermittent sync\tests\unit\test_addons_engine.js | test failed. r=gps
2013-09-25 17:09:10 -07:00
Nick Alexander
b91421f4b8
Merge m-c to elm
2013-09-25 08:47:59 -07:00
Richard Newman
ec60927aa5
Merge m-c to s-c.
2013-09-23 22:01:40 -07:00
Zach Carter
02455c610e
Bug 909967 - Introduce a Firefox Accounts module for storing/retrieving user credentials. r=gavin,gps
2013-09-23 18:35:37 -07:00
Gregory Szorc
ed68c2482b
Bug 901990 - Part 2: Upgrade xpcshell manifests; r=ted
...
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell-unpack/head_unpack.js => toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
2013-09-24 11:50:08 -07:00
Nick Alexander
9f905ada96
Merge m-c to elm
2013-09-18 11:08:28 -04:00
Richard Newman
bfc5fa6688
Bug 916186 - Don't record birth time in crashes provider. r=gps
2013-09-16 09:51:54 -04:00
Brian Warner
51790cf627
Bug 911384 - add HAWK support (HTTP client authentication protocol). r=rnewman
2013-09-12 14:34:34 -07:00
Cykesiopka
8bbc511111
Bug 914273 - Move JS_MODULES_PATH to mozbuild. r=joey
2013-09-24 10:29:30 -04:00
Blair McBride
f44c1d0d2f
Bug 451283 - Move log4moz.js to Toolkit as Log.jsm. r=gps,Mossop
...
--HG--
rename : services/common/log4moz.js => toolkit/modules/Log.jsm
rename : services/common/tests/unit/test_log4moz.js => toolkit/modules/tests/xpcshell/test_Log.js
2013-08-26 11:55:58 -07:00
Alex Keybl
9312d29ec1
Merging in version bump NO BUG
2013-09-17 09:38:37 -04:00
Mike Hommey
8f10c67fbb
Bug 935305 - Move preprocessor to mozbuild.action. r=gps
...
--HG--
rename : config/Preprocessor.py => python/mozbuild/mozbuild/preprocessor.py
rename : config/tests/unit-Expression.py => python/mozbuild/mozbuild/test/test_expression.py
rename : config/tests/unit-LineEndings.py => python/mozbuild/mozbuild/test/test_line_endings.py
rename : config/tests/unit-Preprocessor.py => python/mozbuild/mozbuild/test/test_preprocessor.py
2013-11-09 10:35:44 +09:00
Mike Hommey
a65383e1e9
Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps
...
Landing on a CLOSED TREE.
2013-11-19 11:50:54 +09:00
Mike Hommey
8ceb917350
Bug 939074 - Remove most LIBXUL_LIBRARY. rs=gps
2013-11-19 11:48:10 +09:00
Mike Hommey
bb6779efe3
Bug 939044 - Remove most definitions of MODULE. r=mshal
2013-11-19 11:47:39 +09:00
Mike Hommey
d7b6f95761
Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps
2013-11-19 11:47:14 +09:00
Mark Hammond
e883ceb840
Bug 927457 - processTokenResponse fails to handle 401 response correctly. r=gps
2013-10-16 11:32:36 -07:00
Stefan Mirea
012901e614
Bug 887518 - Move loadAddonManager() to test_provider_addons.js. r=gps
2013-06-26 15:32:27 -07:00
Stefan Mirea
ba46a76f9c
Bug 887081 - Attach healthreporter to global object. r=gps
2013-09-06 09:08:26 -07:00
Stefan Mirea
9079fb6bc6
Bug 887580 - Properly export object in profile.jsm and policy.jsm. r=gps
2013-06-26 17:01:45 -07:00
Nick Alexander
f42f8416d0
Merge m-c to s-c.
2013-09-05 09:07:12 -07:00
Richard Newman
8d12973cd0
Bug 908461 - Protocol deprecation indicators for Sync: client support. r=gps
2013-09-03 16:11:46 -07:00
Mike Hommey
f1cf3b4238
Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps
2013-09-05 09:01:46 +09:00
Ed Morley
206c371633
Merge latest green fx-team changeset and mozilla-central
2013-08-28 12:22:35 +01:00
Marco Castelluccio
fad72f5ff6
Bug 836547 - Remove apps sync engine. r=fabrice
2013-08-27 23:41:16 -04:00
Jeff Walden
38577c2633
Bug 907958 - Disallow |function function() {}| and similar unreadabilities. r=jorendorff, r=wingo for the yield interactions, r=luke for the asm.js interactions
2013-08-15 10:07:40 -07:00
Ms2ger
c3e345584c
Bug 883284 - Part f: Move LIBXUL_LIBRARY into moz.build (p-z); r=glandium
2013-08-22 08:56:01 +02:00
Ms2ger
4d968c40e1
Bug 882859 - Part b: Move FAIL_ON_WARNINGS into moz.build; r=joey+gps
2013-08-22 08:55:59 +02:00
Gregory Szorc
8c4bf189c5
Bug 845623 - Intermittent failure in test_storage_server.js; r=gbrown
2013-08-20 11:21:02 -07:00
Ryan VanderMeulen
f1e0878203
Merge m-c to fx-team.
2013-08-19 22:36:47 -04:00
Gregory Szorc
1a22cf646a
Bug 831404 - More attempts to fix intermittent failure; r=orange
2013-08-19 19:22:27 -07:00
Gregory Szorc
145fc21873
Bug 831404 - Increase timer interval to hopefully prevent intermittent failure; r=rnewman
2013-08-19 16:16:35 -07:00
Mihnea Dobrescu-Balaur
147c709b51
Bug 906126 - Adapt remaining sync xpcshell test for parallel runs. r=gps
2013-08-16 11:51:19 -07:00
Sam Penrose
5a9a76b978
Bug 911384 - Follow-up: tolerate explicitly falsy payloads in computeHAWK. r=rnewman
2013-10-29 13:45:37 -07:00
Brian Warner
330162be85
Bug 911384 - add HAWK support (HTTP client authentication protocol). r=rnewman
2013-09-12 14:34:34 -07:00
Alex Keybl
b260957292
Merging in version bump NO BUG
2013-12-09 13:38:06 -05:00
Jed Parsons
1924efa375
Bug 909967 - Firefox Account Signed-in User module. p=warner,spenrose,zcarter,jedp, r=markh
2013-12-05 22:46:12 -08:00
Gregory Szorc
c2ffac6b06
Bug 946604 - Move makeFakeAppDir into testing/modules. r=rnewman
2013-12-05 16:54:15 +08:00
Ryan VanderMeulen
b2b7a0f29e
Bug 931642 - Backed out changeset f4449a06e97f (bug 917883) for causing frequent OSX crashes.
2013-12-03 18:45:17 -05:00
Carsten "Tomcat" Book
c40b2ecd96
merge fx-team to mozilla-central
2013-12-03 10:39:56 +01:00
Zachary Carter
6598d03bb0
Bug 935232 - Implement a client for the Firefox Accounts auth server. r=markh
2013-12-02 13:56:24 -08:00
Mike Hommey
bf60896454
Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense). r=mshal
2013-12-03 06:34:21 +09:00
Mounir Lamouri
4f2383e3f3
Bug 610346 - Remove nsIFormSubmitObserver interface from FormTracker. r=rnewman
2010-11-08 13:23:39 +01:00
Trevor Saunders
7da524d402
bug 886526 - remove IS_COMPONENT and MODULE_NAME makefile vars for things in libxul r=bsmedberg r=glandium
2013-08-08 20:12:37 -04:00
Bhavana Bajaj
b6cbf2289d
Merging in version bump NO BUG
2013-08-05 11:06:54 -07:00
Joey Armstrong
9bdf289b5e
Bug 870370 - Move EXTRA_COMPONENTS to mozbuild (file batch #3 ); r=mshal
2013-06-11 16:38:22 -04:00
Ms2ger
25c19f9737
Bug 897458 - Move EXTRA_PP_JS_MODULES to moz.build; r=gps
2013-08-02 09:03:25 +02:00
Birunthan Mohanathas
5b39f2fdf1
Bug 784739 - Switch from NULL to nullptr in services/; r=ehsan
2013-07-31 11:44:18 -04:00
Trevor Saunders
6b3c839046
backout bug 886526 because it probably made us use a lot more memory to link on windows
2013-07-29 11:03:21 -04:00
Mihnea Dobrescu-Balaur
287426e5bc
Bug 898820 - test_resource_header.js should use a dynamic port. r=gps
2013-07-27 23:34:21 -07:00