Commit Graph

2894 Commits

Author SHA1 Message Date
Mark Hammond
a7be140967 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
174b2f262e Bug 960887 - Handle storage endpoints returned by 1.5 token server. r=rnewman 2014-01-29 19:26:01 -08:00
Mark Hammond
b843c6dc1c Bug 965334 - Have browserid_identity create a DumpAppender to help debugging. r=ttaubert 2014-01-29 18:39:59 -08:00
Chris Karlof
84589dbdf0 Bug 963251 - Update pref to use final production token server. r=markh 2014-01-29 18:39:59 -08:00
Tim Taubert
53f8947200 Bug 963384 - Implement modal "Choose What To Sync" dialog r=markh 2014-01-28 18:57:19 -08:00
Mark Hammond
e17c388ae1 Bug 959222 (part 1) - Make browserid_identity a first-class identity module. r=rnewman 2014-01-28 17:51:09 -08:00
Mark Hammond
95863c958a 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
6be7ab5dfb 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
0570d258e3 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
89d86a159e Bug 958546 - s/isVerified/verified in all FxAccounts related code. r=markh 2014-01-14 17:00:36 +01:00
Richard Newman
993e55b82e Bug 956936 - Include supported Sync protocol versions in desktop client records. r=gps 2014-01-06 21:45:26 -08:00
Nick Alexander
00a971da6b Merge m-c to s-c 2014-01-07 15:22:58 -08:00
Richard Newman
5e15d1adc9 Bug 956442 - Include version in desktop Sync client records. r=gps 2014-01-06 18:41:12 -08:00
Tim Taubert
a481c0db46 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
dea8254c1b 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
d041e15611 merge m-c to elm 2013-12-20 15:05:28 +01:00
Mark Hammond
d1658ac407 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
bd3b67b4ff Bug 949695 tests followup - convert more tests to run with both identity managers. 2013-12-20 15:57:26 +11:00
Mark Hammond
6d992cc467 Bug 949695 tests followup - convert test_service_wipeServer to identity_test infrastructure 2013-12-20 15:57:26 +11:00
Mark Hammond
d2933b41f3 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
a1683f8a40 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
ac310565e0 Bug 949695 followup - add resetCredentials/resetSyncKey to avoid BrowserID setters from being called. 2013-12-20 15:57:25 +11:00
Wes Kocher
3f7a546e4f Merge inbound to m-c 2013-12-19 18:58:45 -08:00
Richard Newman
d180512a8d Bug 947772 - Follow-up: fix sneaky test (disabled on some platforms). r=me 2013-12-19 11:48:23 -08:00
Richard Newman
96916f8947 Merge m-c to s-c. 2013-12-18 21:47:50 -08:00
Richard Newman
ea1673f1c8 Bug 947772 - Sync adds tracker observers regardless of engine enabled state. r=gps 2013-12-18 21:42:17 -08:00
Mark Hammond
0a534a950a put sync identity initialization behind a pref 2013-12-19 16:38:35 +11:00
Tim Taubert
c53a7066fe merge m-c to elm 2013-12-18 17:54:23 +01:00
Chris Karlof
3b1dfebedf Bug 949695 - integrate weave with browserid_identity on elm. 2013-12-17 15:45:03 +11:00
Brian Warner
286a2e0658 Bug 949259 (elm) - bring elm up-to-date with patch in bug 949259. 2013-12-17 15:45:03 +11:00
Jeff Walden
680994ff16 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
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
e396fc159d 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
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
Nick Alexander
85101095c8 Merge m-c to elm 2013-10-29 13:13:49 -07:00
Mike Hommey
e80e877ab7 Bug 939044 - Remove most definitions of MODULE. r=mshal 2013-11-19 11:47:39 +09:00
Alex Keybl
e149dacf53 Merging in version bump NO BUG 2013-12-09 13:38:06 -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
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
Lukas Blakk
1fcd935dd9 Merging in version bump NO BUG 2013-10-28 13:37:48 -07: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
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
Alex Keybl
78cc8a9f85 Merging in version bump NO BUG 2013-09-17 09:38:37 -04: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
1579cd537d Merge m-c to s-c. 2013-09-05 09:07:12 -07:00
Richard Newman
be2550d749 Bug 908461 - Protocol deprecation indicators for Sync: client support. r=gps 2013-09-03 16:11:46 -07:00
Mike Hommey
f8bc7fa754 Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
Marco Castelluccio
ff20759d88 Bug 836547 - Remove apps sync engine. r=fabrice 2013-08-27 23:41:16 -04:00
Mihnea Dobrescu-Balaur
429bfa59e2 Bug 906126 - Adapt remaining sync xpcshell test for parallel runs. r=gps 2013-08-16 11:51:19 -07:00
Mike Hommey
881a7c1554 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
8e8fb1c2eb Bug 610346 - Remove nsIFormSubmitObserver interface from FormTracker. r=rnewman 2010-11-08 13:23:39 +01:00
Bhavana Bajaj
26604ce559 Merging in version bump NO BUG 2013-08-05 11:06:54 -07:00
Joey Armstrong
56ab717da3 Bug 870370 - Move EXTRA_COMPONENTS to mozbuild (file batch #3); r=mshal 2013-06-11 16:38:22 -04:00
Mihnea Dobrescu-Balaur
5396546754 Bug 898820 - test_resource_header.js should use a dynamic port. r=gps 2013-07-27 23:34:21 -07:00
Gregory Szorc
da7deab3e1 Bug 884421 - Automatically select network ports for /services tests; r=rnewman 2013-07-23 13:53:05 -07:00
Gregory Szorc
95806b4b2f Backout b817406485f8 (bug 884421) for intermittent WinXP failures (bug 896093)
CLOSED TREE
2013-07-22 13:24:45 -07:00
Gregory Szorc
22709b6535 Bug 884421 - Automatic network port selection for /services tests; r=rnewman 2013-07-16 17:14:21 -07:00
Ryan VanderMeulen
62e8d6d2c3 Backed out 3 changesets (bug 884421) for intermittent xpcshell failures on a CLOSED TREE.
Backed out changeset 75b7cf367efb (bug 884421)
Backed out changeset 2264c04671c4 (bug 884421)
Backed out changeset 45c529ffbe90 (bug 884421)
2013-07-18 14:08:18 -04:00
Gregory Szorc
9085b40c14 Bug 884421 - Part 3: Fix test_service_wipeServer; r=bustage 2013-07-17 14:51:13 -07:00
Gregory Szorc
31e82adf05 Bug 884421 - Automatic network port selection for /services tests; r=rnewman 2013-07-16 17:14:21 -07:00
Richard Newman
8dd0b9e58b Bug 889413 - FormWrapper._finalize is not a function. r=markh 2013-07-02 15:09:17 -07:00
Richard Newman
2db1a46c83 Bug 888692 - Missing trackChanges call in forms.js. r=markh 2013-07-02 12:30:10 -07:00
Alex Keybl
821f644108 Merging in version bump NO BUG 2013-06-24 11:37:32 -07:00
Richard Newman
4183555b92 Merge m-c to s-c. 2013-06-22 11:58:51 -07:00
Richard Newman
c961278321 Bug 878677 - Follow-up: remove unused import. r=trivial 2013-06-20 10:39:53 -07:00
Richard Newman
19cdbfce63 Bug 878677 - Part 2: Sync changes to support FormHistory.jsm. r=rnewman 2013-06-20 09:56:49 -07:00
Nick Alexander
492a680813 Merge m-c to s-c 2013-06-19 16:12:15 -07:00
Richard Newman
e38ab8c62c Bug 883595 - Extend Sync error bar duration. r=gps 2013-06-18 10:50:39 -07:00
Richard Newman
d3068e6c99 Backed out changeset 31f1458c6a0b (bug 878677) 2013-06-18 09:16:19 -07:00
Mark Hammond
651c99c4da Bug 878677 - Part 2: Sync changes to support FormHistory.jsm. r=rnewman 2013-06-17 16:58:54 -07:00
Richard Newman
8de35dcc15 Bug 873861 - Intermittent test_addons_store.js | Test timed out. r=gps 2013-06-13 15:44:28 -07:00
Stefan Mirea
773620d4d8 Bug 852411 - Migrating from promise.js to Promise.jsm; r=gps 2013-06-13 18:36:21 -07:00
Gregory Szorc
4639ab1d14 Backout 9080f6701733 (bug 852411) for hitting weird xpcshell test harness behavior in multiple local builds 2013-06-14 14:38:29 -07:00
Stefan Mirea
fd534fc41a Bug 852411 - Migrating from promise.js to Promise.jsm; r=gps
--HG--
extra : rebase_source : d03cdae978479605df0a7ea728916ba78a272ffb
2013-06-13 18:36:21 -07:00
Raymond Lee
76600d1535 Bug 854761 - Part 2: Remove previous bookmark calls from PlacesUtils - Sync. r=rnewman 2013-06-04 00:21:41 +08:00
Raymond Lee
803415a725 Bug 884571 - TPS tests: Cu not defined: bookmarks.jsm: line 20. r=rnewman 2013-06-19 12:22:53 +08:00
Richard Newman
8b107da744 Bug 877057 - Add a download limit to Sync Engine fetches. r=mconnor 2013-05-29 11:11:38 -07:00
Garrett Robinson
ce928e90ee Bug 791284 - Add debugging code to nsDocument::StartDocumentLoad and fix and re-enable test. r=sicking 2013-05-21 14:50:26 -04:00
Gregory Szorc
1b12175ba0 Bug 873629 - Remove 129 empty Makefile.in files; r=ted 2013-05-17 16:20:11 -07:00
Joey Armstrong
26736a0ee2 bug 869143: phase2 cleanup for XPCSHELL_TEST conversion. r=mshal 2013-05-13 16:24:07 -04:00
Lukas Blakk
7e9b4bbff1 Merging in version bump NO BUG 2013-05-13 09:09:39 -07:00
Jim Mathies
654cc2feb2 Bug 868094 - Sync service should notify when the startOver process completes. r=rnewman 2013-05-07 15:55:51 -05:00
Jim Mathies
561c9eed72 Bug 826357 - Generate Metro-aware Sync client name. r=rnewman 2013-05-07 15:55:49 -05:00
Andrea Marchesini
3e4e0d931a Bug 841442 - Rename nsHTMLFormElement to HTMLFormElement
--HG--
rename : content/html/content/src/nsHTMLFormElement.cpp => content/html/content/src/HTMLFormElement.cpp
rename : content/html/content/src/nsHTMLFormElement.h => content/html/content/src/HTMLFormElement.h
2013-06-19 10:24:37 -04:00
Joey Armstrong
321d063783 bug 844655: Port XPCSHELL_TESTS to moz.build as XPCSHELL_TESTS_MANIFESTS 2013-04-29 14:49:00 -04:00
Raymond Lee
beec825b40 Bug 865643 - Fix DEPRECATION WARNING: archiveBookmarksFile is deprecated error. r=rnewman 2013-04-26 10:09:52 +08:00
Gregory Szorc
78563e19ec Merge mozilla-central into services 2013-04-22 12:33:04 -07:00
Richard Newman
575a3d14ca Bug 859920 - Some TPS tests failed when running using mozilla-central build. r=trivial 2013-04-18 21:30:28 -07:00
Gregory Szorc
c9c21b22f4 Merge mozilla-central into services-central 2013-04-15 16:55:11 -07:00
Richard Newman
ef5fbc29f7 Bug 859920 - Some TPS tests failed due to removed autoHide pref. r=trivial, a=test-only 2013-04-09 12:26:11 -07:00
Raymond Lee
cbfeb4cc13 Bug 852034 - Replace restoreBookmarksFromJSONFile with importFromFile. r=mano 2013-04-17 13:36:02 +08:00
Kyle Machulis
72a717a860 Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 2013-04-01 11:36:59 -07:00
Bhavana Bajaj
c68f877f73 Merging in version bump NO BUG 2013-04-01 11:28:13 -07:00
Raymond Lee
de3be8a99d Bug 852041 - Part 2: Use BookmarkJSONUtils.exportToFile in services/sync. r=rnewman 2013-04-09 17:15:34 +08:00
Ryan VanderMeulen
95bf443385 Merge the last PGO-green inbound changeset to m-c. 2013-04-15 21:49:22 -04:00
Nick Alexander
0481627d39 Bug 848519 - Part 3: Replace services-common/preferences.js with gre/modules/Preferences.jsm in imports. r=gavin 2013-04-15 12:45:37 -07:00
Mike Shal
7ecea60097 Bug 844654 - Part 2: Move MODULE to moz.build; rs=gps 2013-03-19 11:47:00 -07:00
Gregory Szorc
7755733a85 Bug 784841 - Part 18ε: Convert /services; f=Ms2ger rs=ted 2013-02-25 12:47:24 -08:00
Gavin Sharp
6a0bfaa745 Remove some unnecessary preprocessing, no bug
--HG--
extra : rebase_source : b8bfed7a5b55652fd8a9b3bf3c601accb8b2022f
2013-02-17 17:49:25 -08:00
Lukas Blakk
96a4d23df2 Merging in version bump NO BUG CLOSED TREE 2013-02-19 09:35:19 -08:00
Mike Hommey
26e3714874 Bug 755724 - Move browser application in a subdirectory. r=jimm 2013-02-11 14:10:16 +01:00
Richard Newman
a9430d6624 Merge m-c to s-c. 2013-02-06 19:26:09 -08:00
Marco Bonardo
4f925597b9 Bug 826409 - Remove onBeforeDeleteURI and onBeforeItemRemoved notifications.
r=Mano sr=gavin
2013-02-06 20:48:56 +01:00
Gregory Szorc
ccc4e1c4a4 Bug 838717 - Import main.js before accessing Weave; r=rnewman 2013-02-06 10:32:00 -08:00
Phil Ringnalda
2b3d881d7c Merge m-c to s-c 2013-02-04 18:12:00 -08:00
Richard Newman
08095b1df2 Bug 836206 - Split out or rewrite CommonUtils.jsonLoad/jsonSave. r=gps
--HG--
rename : services/common/tests/unit/test_utils_json.js => services/sync/tests/unit/test_utils_json.js
2013-02-03 00:51:26 -08:00
Ehsan Akhgari
395197733f Merge mozilla-cental into mozilla-inbound 2013-01-31 11:10:40 -05:00
Gregory Szorc
c47eb8f3a2 Bug 836120 - Reduce memory overhead of Sync when it's not configured; r=rnewman
If Sync is (likely) not configured, the only loaded JS is for the XPCOM
service itself.

The UI code is now smart enough to initialize the Sync service if it
isn't yet loaded. This addresses bug 825728.
2013-01-30 07:05:12 -08:00
Gregory Szorc
c1ef78d2ba Bug 836086 - Lazy load Sync's keys.js; r=rnewman 2013-01-29 16:46:22 -08:00
Ehsan Akhgari
565d0479c3 Bug 817477 - Remove support for global private browsing mode; r=jdm,glandium
--HG--
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
2013-01-29 13:12:13 -05:00
Richard Newman
b78783892f Bug 836369 - Intermittent test_history_tracker.js | test failed | true == false. r=trivial,test-only 2013-01-30 15:30:53 -08:00
Andres Hernandez
3f91b9e564 Bug 739217 - Part 3: services replacement of codebase usage of synchronous isVisited with asynchronous isURIVisited. r=rnewman 2013-01-18 12:01:40 -06:00
Gregory Szorc
6ddc34b300 Merge mozilla-central into services-central 2013-01-11 11:07:05 -08:00
Richard Newman
e1dccc7a9b Bug 829656 - TEST-UNEXPECTED-FAIL | /builds/slave/talos-slave/test/build/xpcshell/tests/services/common/tests/unit/head_helpers.js | 2 == 1. r=trivial 2013-01-11 10:03:15 -08:00
Mark Banner
4d31a85097 Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
extra : transplant_source : k%8A%F7%25%F3%22h%E5%CEQ%AB%9Ds%CA%B6/%962%86N
2013-01-10 22:02:38 +00:00
Mark Banner
b786539327 Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
2013-01-10 22:02:38 +00:00
Richard Newman
103245d3f4 Bug 811490 - Follow-up: convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode. r=trivial 2013-01-09 14:30:09 -08:00
Ed Morley
408ac4c83c Bug 804479 - Disable test_password_tracker.js, test_history_tracker.js, test_bookmark_store.js, test_forms_tracker.js on debug runs for too many intermittent failures 2013-01-10 14:59:27 +00:00
Richard Newman
b1b58dd41f Bug 811490 - Follow-up: convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode. r=trivial, TPS only so DONTBUILD 2013-01-09 14:30:09 -08:00
Ed Morley
48ca903ef9 Backout a38692ea87ae (bug 827303) for xpcshell failures on a CLOSED TREE 2013-01-09 23:45:36 +00:00
Mark Banner
146bf64467 Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
2013-01-09 22:38:34 +00:00
David Rajchenbach-Teller
bf032a32a6 Bug 772211 - Get rid of some uses of addVisit. r=mak77, r=rnewman 2013-01-08 19:40:06 -05:00
Alex Keybl
9fc46ad72d Merging in version bump NO BUG 2013-01-07 12:31:33 -08:00
Gregory Szorc
2a5ae000e2 Merge mozilla-central into services-central
--HG--
rename : content/html/content/public/nsHTMLCanvasElement.h => content/html/content/public/HTMLCanvasElement.h
rename : content/html/content/src/nsHTMLCanvasElement.cpp => content/html/content/src/HTMLCanvasElement.cpp
2013-01-06 10:06:07 -08:00
Richard Newman
b709251bb2 Bug 826421 - Follow-up: remove unnecessary method. r=trivial 2013-01-04 20:03:46 -08:00
Richard Newman
58affe4efc Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak 2013-01-04 09:45:12 -08:00
Richard Newman
555f8728ab Bug 826086 - Handle errors in asyncOpen. r=gps 2013-01-02 15:40:03 -08:00
Richard Newman
537115a725 Bug 806494 - Fix resource header copying on internal redirect. r=gps 2013-01-04 22:23:50 -08:00
Richard Newman
3c3dcb655a Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak 2013-01-04 09:45:12 -08:00
Richard Newman
9326b3d9c6 Bug 696974 - Bookmarks engine: "invalid 'in' operand this._modified" in reconcile. r=gps 2012-12-22 12:44:05 -08:00
Richard Newman
98503a2e1b Bug 699546 - Log more backoff information: X-Weave-Backoff, Retry-After. r=gps 2012-12-22 11:43:56 -08:00
Richard Newman
2e84f032e2 Bug 698087 - Remove Service.updatedURL and associated consts. r=gps 2012-12-22 11:43:50 -08:00
Richard Newman
f181d0acd8 Merge m-c to s-c. 2012-12-22 11:32:28 -08:00
Richard Newman
b74691db4f Bug 650941 - Use run_next_test in test_resource_ua.js. r=mechanical 2012-12-21 23:22:00 -08:00
Richard Newman
90daf700c2 Bug 806494 - Part 1: additional logging and safety for header copying. r=gps 2012-12-18 11:43:58 -08:00
Richard Newman
b8f7251de3 Merge m-c to s-c (including fixed conflict in Android Sync manifest).
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml
rename : mobile/android/base/resources/drawable/tabs_button.xml.in => mobile/android/base/resources/drawable/tabs_button.xml
rename : mobile/android/base/resources/drawable/tabs_level.xml.in => mobile/android/base/resources/drawable/tabs_level.xml
2012-12-15 17:08:14 -08:00
Richard Newman
aa45233a91 Bug 819262 - Additional tests for bookmark application in Sync. r=gps 2012-12-14 14:00:40 -08:00
Richard Newman
ceeb64c2e7 Merge m-c to s-c. 2012-12-10 13:01:43 -08:00
Richard Newman
80a3f4f3ee Merge m-c to s-c. 2012-12-05 23:59:56 -08:00
Richard Newman
311ea9597c Merge m-c to s-c. 2012-11-27 21:24:41 -08:00
Richard Newman
9f33dc8380 Merge m-c to s-c. 2012-11-21 09:37:58 -08:00
Richard Newman
da2eaf1742 Merge m-c to s-c. 2012-11-19 18:10:54 -08:00
Alex Keybl
d1de145dd7 Merging in version bump NO BUG 2012-11-19 12:03:27 -08:00
Richard Newman
d47fc2f956 Bug 817232 - Don't apply incoming deletions for special folders. r=gps 2012-12-04 16:49:55 -08:00
Michal Jaskurzynski
fc42a78b29 Bug 424712 - Server location needs a slash at the end. r=rnewman 2012-11-12 09:48:26 -08:00
Richard Newman
85cab35d85 Bug 804479 - Intermittent test_password_tracker.js, test_history_tracker.js, test_bookmark_store.js, test_forms_tracker.js | test failed (with xpcshell return code: -2147483645), "ASSERTION: thread pool wasn't shutdown… " r=gps 2012-12-05 16:46:25 -08:00