Commit Graph

2995 Commits

Author SHA1 Message Date
Sam Penrose
98097b9dd7 Bug 983445 - Verification causes logout on device. r=jedp 2014-04-21 16:45:58 -07:00
Carsten "Tomcat" Book
c55de21cc3 merge fx-team to mozilla-central 2014-04-17 12:49:25 +02:00
Mark Hammond
c97626cc7f Bug 985868 - only report prolonged sync errors once per application invocation. r=rnewman 2014-04-17 11:25:44 +10:00
Henrik Skupin
c606a4119a Bug 996027 - Ensure that TPS always fakes login into Weave. r=rnewman DONTBUILD 2014-04-14 18:22:23 +02:00
Roberto A. Vitillo
fd71acaf46 Bug 993468 - TypeError: callback is undefined in jsonSave(). r=rnewman 2014-04-13 14:28:20 -04:00
Ed Morley
73c827f7b3 Merge latest green inbound changeset and mozilla-central 2014-04-10 17:55:29 +01:00
Henrik Skupin
7936999b7f Bug 992198 - TPS.Sync() fails for special options like 'wipeRemote' if the user is not logged in yet. r=jgriffin DONTBUILD
--HG--
extra : rebase_source : d4ff28171ebdd7d2a23e7cc395d7087831d30f96
2014-04-09 23:35:57 +02:00
Mark Hammond
f59a4e6887 Bug 985145 - make node reassignment work correctly with FxA. r=rnewman 2014-04-10 12:18:24 +10:00
Mark Hammond
e2705bdbf4 Bug 990834 (part 3) - Fix handling of hawk errors. r=ckarlof 2014-04-10 12:08:19 +10:00
Mark Hammond
bc93fc2b9d Bug 990834 (part 2) - Add support/tweak retry and backoff header support to hawk and tokenserverclient. r=rnewman 2014-04-10 12:08:19 +10:00
Mark Hammond
1cfe00f9c1 Bug 990834 (part 1) - minor refactor of hawk tests. r=ckarlof 2014-04-10 12:08:18 +10:00
Marco Castelluccio
6924f0bb5f Bug 988301 - Avoid main-thread IO in Sync code. r=Yoric, r=rnewman 2014-04-07 10:49:32 -04:00
David Rajchenbach-Teller
7e80df0235 Bug 992363 - Fix a few uncaught async errors in services. r=rnewman 2014-04-07 10:33:56 -04:00
Carsten "Tomcat" Book
d4d8a64c7a merge fx-team to mozilla-central 2014-04-03 12:46:58 +02:00
Mark Hammond
7dc2e440e9 Bug 987468 - remove sync delayed notification. r=ttaubert 2014-04-03 09:56:59 +11:00
Richard Newman
bc9c137228 Bug 990872 - Eliminate Places dependency in Sync utils. r=gps 2014-04-01 21:33:42 -07:00
Henrik Skupin
0d814619fc Bug 986190 - [tps] Synced data on the server is not always wiped at the end of a test. r=jgriffin, r=rnewman DONTBUILD 2014-04-02 22:58:14 +02:00
Henrik Skupin
5e6c5a1faf Bug 989249 - test_addon_reconciling.js broken due to missing sync. r=jgriffin DONTBUILD 2014-04-01 12:13:37 +02:00
Henrik Skupin
af7d3cf41b Bug 989045 - [tps] Registering of observer topics happens too late so 'weave:engine:start-tracking' can be missed during startup. r=jgriffin DONTBUILD 2014-04-01 08:35:32 +02:00
Andrei Eftimie
807e96807c Bug 983642 - [tps] AddonRepository.getAddonsByIDs fails in mutiple tps tests. r=hskupin DONTBUILD
--HG--
extra : rebase_source : 51ed8adff60cd7a0ddcd9c7c36a81f3510350089
2014-03-27 20:06:56 +01:00
Henrik Skupin
e985fb4331 Bug 981848 - [tps] Don't force login each time the browser gets started. r=jgriffin - DONTBUILD 2014-03-26 21:55:00 +01:00
Wes Kocher
0d58e41dd9 Merge fx-team to m-c 2014-03-25 20:03:13 -07:00
Richard Newman
cc0d0bda5a Bug 841096 - Follow-up: remove debugging cruft. r=trivial 2014-03-25 09:00:07 -07:00
Henrik Skupin
ff4ec74c43 Bug 987682 - DumpBookmarks() in bookmarks.jsm hangs due to invalid JSON data. r=jgriffin DONTBUILD 2014-03-25 19:43:33 +01:00
Valery Yundin
b8f18c9040 Bug 841096 - Part 2: speed up retrieval of open tabs. r=rnewman 2014-03-24 16:11:37 -07:00
Valery Yundin
7542910281 Bug 841096 - Part 1: speed up about:sync-tabs. r=rnewman 2014-03-24 16:11:37 -07:00
Mark Hammond
40e12f4211 Bug 985212 - check if the username looks like an email address to determine what sync to use. r=rnewman 2014-03-24 11:44:43 +11:00
Phil Ringnalda
08f929b520 Back out b9597187a3d6 (bug 985212) for xpcshell bustage
CLOSED TREE
2014-03-22 21:30:46 -07:00
Mark Hammond
b52785af62 Bug 985212 - check if the username looks like an email address to determine what sync to use. r=rnewman 2014-03-23 14:20:38 +11:00
Marco Bonardo
163196f903 Bug 818584 - Discard consecutive duplicate bookmark backups by comparing hashes r=mano
Original patch by Raymond Lee <raymond@appcoast.com> f=mak
2014-03-19 14:33:02 +01:00
Carsten "Tomcat" Book
12e249d1fa merge fx-team to mozilla-central 2014-03-21 15:16:06 +01:00
Henrik Skupin
32625620a9 Bug 982591 - Update TPS to retrieve keys from server instead of hard-coding them. r=warner
--HG--
extra : rebase_source : 2a9449aeca2f28a2bce648971619635b19a4d670
2014-03-21 10:23:15 +01:00
Phil Ringnalda
44d24e0d0d Back out 61454adff1d6 (bug 985212) for xpcshell bustage 2014-03-20 21:50:21 -07:00
Mark Hammond
0ebee1740a Bug 985212 - check if the username looks like an email address to determine what sync to use. r=rnewman 2014-03-21 14:39:35 +11:00
Mark Hammond
f65bef3293 Bug 970167 - Disable passwords engine when a master password is set. r=rnewman 2014-03-21 14:22:02 +11:00
Mozilla Release Engineering
198567e0a0 Merging in version bump NO BUG CLOSED TREE DONTBUILD 2014-03-17 13:48:08 -07:00
Mark Hammond
0196af6a9c Bug 983270 (part 2) - _findCluster() should return null on authentication errors. r=ckarlof 2014-03-17 09:39:31 +11:00
Mark Hammond
e50a273cff Bug 983270 (part 1) - testonly refactor of FxA tests to make cluster testing easier. r=ckarlof 2014-03-17 09:39:31 +11:00
Wes Kocher
b031e3117f Merge m-c to fx-team 2014-03-14 23:19:44 -07:00
Mark Hammond
a6375e2baf Bug 983913 - ensure failure to reject a promise is actually reported. r=ttaubert 2014-03-14 18:02:01 -07:00
Henrik Skupin
5684142d7a Bug 966434 - Refactor tps for fxaccounts and old sync authentication support. r=jgriffin 2014-03-14 21:13:38 +01:00
Richard Newman
bb5c6a7aa9 Bug 978876 - Part 3: mark engines as declined after making a datatype election. r=markh 2014-03-13 16:37:26 -07:00
Richard Newman
89604f48c0 Bug 978876 - Part 2: refactor out datatype choice. r=markh 2014-03-13 16:37:26 -07:00
Richard Newman
2bf76553bf Bug 978876 - Part 1: handle declined engines in desktop Sync meta/global. r=gps
* * *
Bug 978876 - Part 2: refactor out meta/global upload.
2014-03-13 16:37:25 -07:00
Mark Hammond
923842642f Bug 982965 - ensure we fail if getKeys can't get kA or kB. r=ckarlof 2014-03-14 15:22:32 -07:00
Mark Hammond
dbd111e61c Bug 958447 - respect Retry-After header from token server. r=rnewman 2014-03-12 19:27:22 -07:00
Chris Karlof
f69e659748 Bug 982848: Don't clear syncKeyBundle in BrowserID Identity manager during failures to fetch token. r=markh
--HG--
extra : rebase_source : 42bccbef9e86cbc2f9e6113656acdddd04844f67
2014-03-12 14:31:18 -07:00
Tim Taubert
fbfe856453 Bug 969555 - Follow-up to fix test_syncscheduler.js failures on a CLOSED TREE r=bustage 2014-03-12 13:06:01 -07:00
Tim Taubert
c0680383b8 Bug 969555 - Reduce single device sync interval for FxAccounts r=rnewman 2014-03-11 14:46:36 -07:00
Marco Bonardo
edaa060572 Bug 969318 - Mute "A promise chain failed to handle a rejection" error from the livemarks service. r=mano 2014-03-12 16:24:23 +01:00
Chris Karlof
9e95cbfb16 Bug 981140 - Make the FxA signup uri pref and path explicitly reference signup. r=markh 2014-03-11 15:58:27 -07:00
Mark Hammond
07cbf14768 Bug 981957 - make browserid_identity's logs consistent with other sync logs. r=rnewman 2014-03-11 13:24:51 -07:00
Mark Hammond
f3aab980bb Bug 981172 - have bid_identity fire a notification on login error. r=ckarlof
--HG--
extra : rebase_source : f7413e58d2913b008142b7b70a9455995edffa82
2014-03-10 11:54:46 -07:00
Henrik Skupin
31fdbed8b1 Bug 966434 - Update TPS to use FxA. r=jgriffin 2014-03-07 15:54:19 -08:00
Mark Hammond
b3b28ee9ca Bug 967015 - Have bid_identity call Service.startOver on logout. r=rnewman,ckarlof 2014-03-07 15:41:33 +11:00
Mark Hammond
bce6e55f5d Bug 977502 (part 2) - add tests with mock http responses simulating errors. r=ckarlof 2014-03-07 15:41:32 +11:00
Mark Hammond
d9dcb4b987 Bug 977502 (part 1) - better management of login failure states and allow sync to force a login. r=ckarlof,rnewman 2014-03-07 15:41:32 +11:00
Phil Ringnalda
80b78db673 Back out 8b98e1dc7ef3 (bug 972100) for xpcshell bustage 2014-03-03 21:41:35 -08:00
Mark Hammond
8425e489a6 Bug 972100 - have _remoteSetup() use the existing info response when logging in. r=rnewman 2014-03-04 15:16:06 +11:00
Mark Hammond
6286168567 Bug 972070 - improve FxAccounts.jsm state management. r=jedp 2014-03-03 10:20:56 +11:00
Mark Hammond
56e312c5de Bug 976393 - ensure authentication errors log as much detail as possible. r=jedp 2014-03-03 09:55:30 +11:00
Jed Parsons
d103f216bf Bug 974990 - hawk request to access lang prefs as infrequently as possible. r=rnewman
--HG--
rename : services/common/hawk.js => services/common/hawkclient.js
rename : services/common/tests/unit/test_hawk.js => services/common/tests/unit/test_hawkclient.js
2014-02-25 09:19:47 -08:00
Mark Hammond
a1c0a70f11 Bug 932759 (part 2) - Have form sync work correctly if FormHistory is disabled. r=rnewman 2014-02-26 17:12:16 +11:00
Wes Kocher
fa9c928be9 Backed out changeset 96fd88a4d311 (bug 974990) for WinXP PGO xpcshell orange
--HG--
rename : services/common/hawkclient.js => services/common/hawk.js
rename : services/common/tests/unit/test_hawkclient.js => services/common/tests/unit/test_hawk.js
2014-02-24 17:21:29 -08:00
Jed Parsons
82cc60e970 Bug 974990 - hawk request to access lang prefs as infrequently as possible. r=rnewman
--HG--
rename : services/common/hawk.js => services/common/hawkclient.js
rename : services/common/tests/unit/test_hawk.js => services/common/tests/unit/test_hawkclient.js
2014-02-20 18:04:44 -08:00
Alexander J. Vincent
59e70883e7 Bug 952307 - Move some addon-private JSM's to a subdirectory. r=Unfocused
--HG--
rename : toolkit/mozapps/extensions/AddonLogging.jsm => toolkit/mozapps/extensions/internal/AddonLogging.jsm
rename : toolkit/mozapps/extensions/AddonRepository.jsm => toolkit/mozapps/extensions/internal/AddonRepository.jsm
rename : toolkit/mozapps/extensions/AddonRepository_SQLiteMigrator.jsm => toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
rename : toolkit/mozapps/extensions/AddonUpdateChecker.jsm => toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
rename : toolkit/mozapps/extensions/LightweightThemeImageOptimizer.jsm => toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
rename : toolkit/mozapps/extensions/PluginProvider.jsm => toolkit/mozapps/extensions/internal/PluginProvider.jsm
rename : toolkit/mozapps/extensions/SpellCheckDictionaryBootstrap.js => toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js
rename : toolkit/mozapps/extensions/XPIProvider.jsm => toolkit/mozapps/extensions/internal/XPIProvider.jsm
rename : toolkit/mozapps/extensions/XPIProviderUtils.js => toolkit/mozapps/extensions/internal/XPIProviderUtils.js
2014-01-07 20:14:08 -08:00
Masayuki Nakano
b3b19a9e2f Bug 969247 part.1 Remove or replace DOM_VK_ENTER and NS_VK_ENTER users r=smaug 2014-02-15 09:57:39 +09:00
Mark Hammond
225c7f7993 Bug 972129 - introduce a custom backoff schedule if failure is due to identity manager not being ready. r=rnewman 2014-02-13 17:07:53 +11:00
Gregory Szorc
94e5fda7a5 Bug 958561 - Measure Sync with Firefox Health Report; r=rnewman
Metrics for Sync have been added to Firefox Health Report. If Sync is
not configured, we'll report that fact and the supported and preferred
Sync protocols (1.1 or 1.5).

If Sync is configured, we report the daily counts of sync attempts and
how many are successful vs errored. We also report daily counts of the
device types attached to the account.

--HG--
extra : rebase_source : 77170b323706a85cbe1542ac993ebdc1dba3b505
extra : amend_source : 7802e80b4fc94937fbe3f67505b447bfb048732d
2014-02-05 08:08:14 -08:00
Mark Hammond
53290815f0 Bug 967047 - give FxA credentials the same special treatment the legacy sync host credentials get. r=rnewman 2014-02-12 18:57:16 +11:00
Mark Hammond
49015f9bf8 Bug 965896 - allow a sync startOver to re-enable Firefox Accounts. r=rnewman 2014-02-12 17:25:41 +11:00
Richard Newman
4a066f87d1 Bug 968436 - Add 1.5 to client records. r=trivial 2014-02-10 18:36:02 -08:00
Tim Taubert
61bf3e55b8 Bug 967120 - Follow-up to fix broken xpcshell and mochitests r=markh 2014-02-04 12:03:18 +01:00
Tim Taubert
5367c1eab8 Bug 735868 - Fix tests r=rnewman 2014-02-07 05:12:26 +01:00
Tim Taubert
ed494e6d16 Bug 735868 - Stop tracking last selected timestamp in tabs engine r=rnewman 2014-02-07 03:43:22 +01:00
Mark Hammond
e3b1052733 Bug 969169 - ensure logging is only initialized once. r=ttaubert 2014-02-07 11:53:52 +11:00
Phil Ringnalda
f95558444a Back out e78a7c6d9601 (bug 965896) for xpcshell orange 2014-02-04 21:19:19 -08:00
Mark Hammond
688b772266 Bug 967313 - ensure Sync is initialized before we set the fxAccounts user. r=ttaubert. 2014-02-05 16:09:54 +11:00
Mark Hammond
8858a7121a Bug 965896 - allow a legacy sync reset to re-enable fxa accounts. r=rnewman 2014-02-05 14:59:19 +11:00
Lukas Blakk
bb6781d1b1 Merging in version bump NO BUG CLOSED TREE 2014-02-03 15:03:10 -08:00
Mark Hammond
03a140db51 Bug 966842 - initialize log.level instead of log.Level. r=ttaubert 2014-02-03 12:38:52 +11:00
Tim Taubert
8204a4c5b7 Bug 964922 - Enable FxA Sync on Nightly r=markh 2014-01-30 12:09:12 -08:00
Chris Karlof
71b8861505 Bug 966560 - fix bugs with time skew fix in bug 957863; r=jedp 2014-01-31 16:43:36 -08:00
Chris Karlof
94b4fa6474 Bug 965116: Add basic error handling to browserid_identity to respond to various authentication errors, r=markh 2014-01-31 15:26:20 -08:00
Ryan VanderMeulen
a70bcc0e9f Backed out changeset cc1bac015920 (bug 966560) for xpcshell failures. 2014-01-31 21:00:47 -05:00
Chris Karlof
baef89768e Bug 966560: fix bugs with time skew fix in bug 957863, r=jedp 2014-01-31 16:43:36 -08:00
Jed Parsons
556c2f110c Bug 957863 - Use FxA auth clock skew in hawk, jwcrypto, and sync. r=warner, r=rnewman 2014-01-23 18:04:38 -08:00
Chris Karlof
bacff53c7c Bug 966131 - On first sync set firstSync pref to resetClient instead of calling resetClient directly. r=markh 2014-01-30 20:19:48 -08:00
Mark Hammond
98d4c9b8e8 Bug 965474 - allow for an initial sync on new user signin. r=ckarlof
--HG--
extra : rebase_source : f5fd22db384606112900b2caef11cc7bdc262f98
2014-01-30 19:02:46 -08:00
Gavin Sharp
9380c7d80a Backed out changeset 00cead8f21d4 (bug 965464, should have been bug 965474)
--HG--
extra : rebase_source : 43997ecb392c716aa147407985b6f823ac087db8
2014-01-30 19:08:08 -08:00
Mark Hammond
9a83695045 Bug 965464 - allow for an initial sync on new user signin. r=ckarlof 2014-01-30 19:02:46 -08:00
Chris Karlof
346d43692c Bug 960887 - Handle storage endpoints returned by 1.5 token server. r=rnewman
--HG--
extra : rebase_source : a78f079a22f4e196de21b7b15d63ecdc4d475a04
2014-01-29 19:26:01 -08:00
Mark Hammond
8a50b148fc Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert 2014-01-30 14:50:31 -08:00
Tim Taubert
867f7f9e57 Bug 965544 - Show "now syncing" doorhanger when sync actually starts, once per login r=markh 2014-01-29 12:41:07 -08:00
Jed Parsons
ac30be6052 Bug 959919 - Send X-Client-State header to token server. r=rnewman 2014-01-29 15:02:09 -08:00
Carsten "Tomcat" Book
0c86807f34 Backed out changeset 6f10f2e4ef13 (bug 960887) for XPC Bustage on a CLOSED TREE 2014-01-30 10:39:59 +01:00
Carsten "Tomcat" Book
bddabadbe2 Backed out changeset 2b4f723f6c60 (bug 965461) for XPC Bustage on a CLOSED TREE 2014-01-30 10:39:40 +01:00
Mark Hammond
701d4b0045 Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert 2014-01-30 00:22:55 -08:00
Chris Karlof
45ee5f07ba Bug 960887 - Handle storage endpoints returned by 1.5 token server. r=rnewman 2014-01-30 00:22:55 -08:00
Wes Kocher
5a00a2520f Backed out changeset a76b3c746743 (bug 960887) for xpcshell bustage 2014-01-29 21:04:47 -08:00
Wes Kocher
9f96220b89 Backed out changeset 2bfa24370b7c (bug 965461) 2014-01-29 21:04:08 -08:00
Mark Hammond
b107d4328f Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert 2014-01-29 19:26:01 -08:00
Chris Karlof
8905ac86a3 Bug 960887 - Handle storage endpoints returned by 1.5 token server. r=rnewman 2014-01-29 19:26:01 -08:00
Mark Hammond
dd2d27d27b Bug 965334 - Have browserid_identity create a DumpAppender to help debugging. r=ttaubert 2014-01-29 18:39:59 -08:00
Chris Karlof
058e833036 Bug 963251 - Update pref to use final production token server. r=markh 2014-01-29 18:39:59 -08:00
Tim Taubert
2fd6d7c401 Bug 963384 - Implement modal "Choose What To Sync" dialog r=markh 2014-01-28 18:57:19 -08:00
Mark Hammond
3e0d8dd577 Bug 959222 (part 1) - Make browserid_identity a first-class identity module. r=rnewman 2014-01-28 17:51:09 -08:00
Mark Hammond
bce353b88e Bug 959990 - Add Firefox Accounts specific TOS and PP prefs and have utils functions open them if appropriate. r=rnewman. 2014-01-28 17:51:08 -08:00
Mark Hammond
ea92f5114b Bug 959548 - Determine what identity manager to use as sync is initialized. r=ckarlof,rnewman 2014-01-14 13:13:08 +01:00
Fernando Jiménez
ffeddc93ad Bug 952063 - Trigger FxAccountsIACHelper 'onlogin', 'onlogout' and 'onverified' events when required. Part 1: Add onverified/onlogin. r=markh 2014-01-22 14:22:59 +01:00
Fernando Jiménez
aee07b46ab Bug 958546 - s/isVerified/verified in all FxAccounts related code. r=markh 2014-01-14 17:00:36 +01:00
Richard Newman
1e084ce847 Bug 956936 - Include supported Sync protocol versions in desktop client records. r=gps 2014-01-06 21:45:26 -08:00
Nick Alexander
41530762ce Merge m-c to s-c 2014-01-07 15:22:58 -08:00
Richard Newman
4b428980e6 Bug 956442 - Include version in desktop Sync client records. r=gps 2014-01-06 18:41:12 -08:00
Tim Taubert
ae60773121 Bug 956724 - Fix broken onload handler for DOMWindows r=rnewman
From fdb5e3aab7479a9cf0ff7b78dcd373e296707e56 Mon Sep 17 00:00:00 2001
2014-01-06 16:23:40 +01:00
Richard Newman
be3a852b60 Bug 953282 - Fix idle observer notification, after Bug 715041 broke in-tree consumers. r=gps 2013-12-27 21:12:50 -08:00
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
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
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
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
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
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
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
Nick Alexander
b2ece0addd Merge m-c to elm 2013-10-29 13:13:49 -07:00
Mike Hommey
bb6779efe3 Bug 939044 - Remove most definitions of MODULE. r=mshal 2013-11-19 11:47:39 +09:00
Alex Keybl
b260957292 Merging in version bump NO BUG 2013-12-09 13:38:06 -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
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
Lukas Blakk
b28a096524 Merging in version bump NO BUG 2013-10-28 13:37:48 -07: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
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
Alex Keybl
9312d29ec1 Merging in version bump NO BUG 2013-09-17 09:38:37 -04: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
f42f8416d0 Merge m-c to s-c. 2013-09-05 09:07:12 -07:00