Tim Taubert
10b26b16ea
merge m-c to elm
2013-12-20 15:05:28 +01:00
Mark Hammond
43925801cc
Bug 949695 tests followup - fix test_handleSyncError to reset error account so it passes when run twice
2013-12-20 15:57:26 +11:00
Mark Hammond
152f80143a
Bug 949695 tests followup - convert more tests to run with both identity managers.
2013-12-20 15:57:26 +11:00
Mark Hammond
789370bf6f
Bug 949695 tests followup - convert test_service_wipeServer to identity_test infrastructure
2013-12-20 15:57:26 +11:00
Mark Hammond
6c7ce4fcfd
Bug 949695 tests followup - Add ability to run tests twice - once with each identity manager - and have test_service_startOver use it.
2013-12-20 15:57:26 +11:00
Mark Hammond
3bab750dd5
Bug 949259 followup - refactor identity config for tests and remove need to pass params to BrowserIDManager.
2013-12-20 15:57:26 +11:00
Mark Hammond
d350805b4b
Bug 949695 followup - add resetCredentials/resetSyncKey to avoid BrowserID setters from being called.
2013-12-20 15:57:25 +11:00
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