Brian Warner
286a2e0658
Bug 949259 (elm) - bring elm up-to-date with patch in bug 949259.
2013-12-17 15:45:03 +11:00
Brian Warner
ff04ea39c5
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
163b1929e5
Merge m-c to elm
2013-12-16 09:13:10 -08:00
Nick Alexander
03c9e15f08
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
3520f2dfa1
Merge m-c to elm
2013-12-11 14:08:02 -08:00
Nick Alexander
f99f8d5a0d
Merge m-c to elm
2013-12-11 10:25:40 -08:00
Gregory Szorc
d4f9e0f585
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
97f0b84177
Merge m-c to elm
2013-11-18 08:22:59 -08:00
Gregory Szorc
ce6b807848
Bug 939866 - Add Services docs to Sphinx; r=rnewman
...
DONTBUILD (NPOTB)
--HG--
extra : rebase_source : 5e4125ab7faa5493a10db903cf685ee1760f79ec
2013-11-17 19:39:55 -06:00
Nick Alexander
c01daad066
Merge b-i to elm
...
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
2013-11-13 15:16:51 -08:00
Ryan VanderMeulen
0a96ec2e55
Merge fx-team to m-c.
2013-12-13 15:39:51 -05:00
Brian Warner
7ab0a7f7ea
Bug 949241 - Enhance HAWK tests. r=rnewman
2013-12-13 12:12:01 -05:00
Chris Karlof
654bf66577
Bug 772261 - Add duration to token server and client. r=rnewman
2013-12-13 12:12:00 -05:00
Jed Parsons
471512cdd2
Bug 948212 - Fix FxAccounts.jsm: internal.signOut() is not a function. r=markh
2013-12-09 17:15:30 -08:00
Fernando Jiménez
6f4e632c54
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
c9a5febee3
Bug 949526 - FxAccountsManager and B2G implementation. Part 4: Tests. r=markh
2013-12-13 12:25:27 +01:00
Fernando Jiménez
e0fba84689
Bug 949526 - FxAccountsManager and B2G implementation. Part 2: UI Glue r=fabrice
2013-12-13 12:25:26 +01:00
Fernando Jiménez
71e468b2a6
Bug 949526 - FxAccountsManager and B2G implementation. Part 1: FxAccountsManager. r=markh
2013-12-13 12:25:26 +01:00
Gregory Szorc
4ba80f0f47
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
b55814a608
Bug 911384 - Follow-up: tolerate explicitly falsy payloads in computeHAWK. r=rnewman
2013-10-29 13:45:37 -07:00
Richard Newman
f5a8098382
Merge m-c to elm.
2013-10-30 17:19:21 -07:00
Nick Alexander
85101095c8
Merge m-c to elm
2013-10-29 13:13:49 -07:00
Nick Alexander
e3f1e90097
Merge m-c to elm
2013-10-26 17:23:11 -07:00
Mike Hommey
b000a846c2
Bug 929905 - Consolidate sources in moz.build. r=gps
2013-10-25 08:23:05 +09:00
Richard Newman
af2e02d2a2
Merge m-c to s-c.
2013-10-28 17:51:05 -07:00
Lukas Blakk
1fcd935dd9
Merging in version bump NO BUG
2013-10-28 13:37:48 -07:00
Richard Newman
286bec1974
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
80262df43e
Bug 925521 - Part 1: remove filter on recorded search engine identifiers. r=gps
2013-10-18 12:27:57 -07:00
Nick Alexander
c0e6e1451b
Merge fx-team to elm
2013-10-18 11:39:01 -07:00
David Rajchenbach-Teller
0299c684c8
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
b8d6f7c28e
No Bug - Fix Log4Moz xpcshell bustage
2013-10-17 11:42:18 -07:00
Tim Taubert
b08ff3c212
merge m-c to elm
2013-10-16 10:25:32 -07:00
Sam Penrose
875032f949
Bug 911378 - A BrowserID/Hawk based IdentityManager for Sync. r=rnewman
2013-10-02 23:48:08 +02:00
Nick Alexander
7b1b54a29d
Merge m-c to elm
2013-10-03 09:19:36 -07:00
Ms2ger
f4153f40d4
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
fc3d2f695c
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
8bc14ea94c
Merge m-c to s-c.
2013-09-26 21:32:35 -07:00
Richard Newman
bdc7e7cc64
Bug 911478 - Intermittent sync\tests\unit\test_addons_engine.js | test failed. r=gps
2013-09-25 17:09:10 -07:00
Nick Alexander
2a54591395
Merge m-c to elm
2013-09-25 08:47:59 -07:00
Richard Newman
f65f84b77f
Merge m-c to s-c.
2013-09-23 22:01:40 -07:00
Zach Carter
e096241162
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
7bd3c0ae36
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
750c76f251
Merge m-c to elm
2013-09-18 11:08:28 -04:00
Richard Newman
7362b54d0c
Bug 916186 - Don't record birth time in crashes provider. r=gps
2013-09-16 09:51:54 -04:00
Brian Warner
9239060230
Bug 911384 - add HAWK support (HTTP client authentication protocol). r=rnewman
2013-09-12 14:34:34 -07:00
Cykesiopka
bb15ac3786
Bug 914273 - Move JS_MODULES_PATH to mozbuild. r=joey
2013-09-24 10:29:30 -04:00
Blair McBride
89d1cbef27
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
78cc8a9f85
Merging in version bump NO BUG
2013-09-17 09:38:37 -04:00
Mike Hommey
a470038314
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
2812d11fce
Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps
...
Landing on a CLOSED TREE.
2013-11-19 11:50:54 +09:00
