Commit Graph

2666 Commits

Author SHA1 Message Date
Gregory Szorc
264b8977fc 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
561a42877c Bug 826421 - Follow-up: remove unnecessary method. r=trivial 2013-01-04 20:03:46 -08:00
Richard Newman
b14322d490 Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak 2013-01-04 09:45:12 -08:00
Richard Newman
aa05400136 Bug 826086 - Handle errors in asyncOpen. r=gps 2013-01-02 15:40:03 -08:00
Richard Newman
741f571ca6 Bug 806494 - Fix resource header copying on internal redirect. r=gps 2013-01-04 22:23:50 -08:00
Richard Newman
9a059d9753 Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak 2013-01-04 09:45:12 -08:00
Richard Newman
e5fa5a748b Bug 696974 - Bookmarks engine: "invalid 'in' operand this._modified" in reconcile. r=gps 2012-12-22 12:44:05 -08:00
Richard Newman
efd6fc5f1a Bug 699546 - Log more backoff information: X-Weave-Backoff, Retry-After. r=gps 2012-12-22 11:43:56 -08:00
Richard Newman
812848ded0 Bug 698087 - Remove Service.updatedURL and associated consts. r=gps 2012-12-22 11:43:50 -08:00
Richard Newman
cfdbb9db00 Merge m-c to s-c. 2012-12-22 11:32:28 -08:00
Richard Newman
5eed3b909b Bug 650941 - Use run_next_test in test_resource_ua.js. r=mechanical 2012-12-21 23:22:00 -08:00
Richard Newman
b76d63e705 Bug 806494 - Part 1: additional logging and safety for header copying. r=gps 2012-12-18 11:43:58 -08:00
Richard Newman
ab9b34d533 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
5ec57d6793 Bug 819262 - Additional tests for bookmark application in Sync. r=gps 2012-12-14 14:00:40 -08:00
Richard Newman
ab14f18666 Merge m-c to s-c. 2012-12-10 13:01:43 -08:00
Richard Newman
b4da9b8cbd Merge m-c to s-c. 2012-12-05 23:59:56 -08:00
Richard Newman
262aa85bc2 Merge m-c to s-c. 2012-11-27 21:24:41 -08:00
Richard Newman
cf8be64b6d Merge m-c to s-c. 2012-11-21 09:37:58 -08:00
Richard Newman
98e4f59aad Merge m-c to s-c. 2012-11-19 18:10:54 -08:00
Alex Keybl
98c4160eda Merging in version bump NO BUG 2012-11-19 12:03:27 -08:00
Richard Newman
eebdc7852b Bug 817232 - Don't apply incoming deletions for special folders. r=gps 2012-12-04 16:49:55 -08:00
Michal Jaskurzynski
578f9f3af9 Bug 424712 - Server location needs a slash at the end. r=rnewman 2012-11-12 09:48:26 -08:00
Richard Newman
16263370bd 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
Ed Morley
c10213c220 Backout 545cb0d6b5c6 (bug 811490), 4fd6fc029bbe (bug 722977) for xpcshell failures 2012-11-16 19:15:18 +00:00
Andres Hernandez
f70d2b1ca6 Bug 811490 - Convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode; r=ehsan,rnewman
--HG--
extra : rebase_source : 84ba6b5df17aecc78569596fbc02d19fec312b00
2012-11-15 18:33:31 -06:00
Andres Hernandez
ac3ba82dab Bug 722977 - Tabs engine uses global Svc.Private to make decisions based on private browsing state; r=ehsan,gps,rnewman
--HG--
extra : rebase_source : 49f920e3a961a6c103bae28d62e2a322a5f9fad1
2012-11-09 10:48:23 -06:00
Kyle Huey
a5a9edd332 Bug 813766: Set EXPORTED_SYMBOLS on this instead of the global. r=gps 2012-11-26 08:54:17 -08:00
Ehsan Akhgari
33ffdf787e Bug 823725 - Remove the Svc.Private getter since it is no longer used; r=rnewman 2012-12-20 17:43:13 -05:00
Richard Newman
36327a146e Bug 806494 - Part 1: additional logging and safety for header copying. r=gps 2012-12-18 11:42:22 -08:00
Richard Newman
023d6bc402 Bug 819262 - Additional tests for bookmark application in Sync. r=gps 2012-12-14 14:00:40 -08:00
Richard Newman
ec2c8986d2 Bug 808750 - More logging and safety in resource callbacks. r=gps 2012-11-05 17:31:12 -08:00
Richard Newman
2f4e50d10f Bug 693427 - More logging and fixes for filelog cleanup. r=gps 2012-11-05 16:05:06 -08:00
Richard Newman
db8f2a8104 Merge m-c to s-c. 2012-11-01 12:28:15 -07:00
Richard Newman
66a60c4906 Bug 693427 - Intermittent TEST-UNEXPECTED-FAIL | xpcshell/tests/services/sync/tests/unit/test_errorhandler_filelog.js | test failed (with xpcshell return code: 0) | false == true. r=trivial 2012-10-31 17:07:16 -07:00
Richard Newman
c728d84af7 Bug 806460 - Part 2: more nuanced rejection of malformed records. r=me (fix bustage). 2012-10-29 17:47:04 -07:00
Richard Newman
8f9d0d0717 Bug 806460 - Part 1: NS_ERROR_ILLEGAL_VALUE in nsINavBookmarksService.insertBookmark while inserting query. r=gps 2012-10-29 15:24:52 -07:00
Richard Newman
ac6f98f61c Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps 2012-10-29 15:22:31 -07:00
Richard Newman
904755bb11 Bug 795800 - Rework test_addons_store to be more robust. r=gps
* * *
Bug 804480 - Intermittent test_addons_store.js test_addons_store.js | test failed (with xpcshell return code: 0), | Error: 1 or more add-ons failed to install. r=gps
2012-10-25 16:51:32 -07:00
Kyle Huey
1482122303 Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon
--HG--
extra : rebase_source : 98337b6a8c07d05e8c961a452dd05a7d75c3c60b
2012-10-31 09:13:28 -07:00
Richard Newman
2acecce0b0 Bug 804480 - Intermittent test_addons_store.js test_addons_store.js | test failed (with xpcshell return code: 0), | Error: 1 or more add-ons failed to install. r=gps 2012-10-23 17:44:33 -07:00
Vicamo Yang
8297cdabd6 Backout 67cb43bb8865: Breaks B2G Marionette 2012-10-31 16:35:11 +08:00
Kyle Huey
bdf47895bb Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon 2012-10-30 12:28:11 -07:00
Ed Morley
777eed8444 Backout a145ded68994, e0cf397089ec & 1545e91c658e (bug 798491) for bustage on a CLOSED TREE 2012-10-30 17:02:31 +00:00
Kyle Huey
aa1997a51a Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon 2012-10-30 08:26:12 -07:00
Richard Newman
1a5b4a0eb1 Bug 806460 - Part 1: NS_ERROR_ILLEGAL_VALUE in nsINavBookmarksService.insertBookmark while inserting query. r=gps
* * *
Bug 806460 - Part 2: more nuanced rejection of malformed records. r=me (fix bustage).
2012-10-29 15:24:52 -07:00
Richard Newman
10488462a7 Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps 2012-10-29 15:22:31 -07:00
Richard Newman
fdaca42889 Bug 798430 - Copy our set HTTP headers across channel redirects. r=gps 2012-10-10 11:48:16 -07:00
Richard Newman
09b53f128a Merge m-c to s-c. 2012-10-08 17:08:01 -07:00
Alex Keybl
35ba52d414 Merging in version bump NO BUG 2012-10-08 11:01:15 -07:00
Gregory Szorc
db53397d30 Merge mozilla-central into services-central 2012-09-25 11:00:01 -07:00