Gregory Szorc
9b60fbd493
Merge mozilla-central into services-central
2012-08-27 12:56:17 -07:00
Alex Keybl
6458cc3fa4
Merging in version bump NO BUG
2012-08-27 12:21:46 -07:00
Ally Naaktgeboren
358a9a5f7a
Bug 589468 - Part 2/2: Change "computer" to "device" in all strings regarding desktop Firefox Sync. r=mconnor
...
--HG--
extra : rebase_source : 1041808123507a278b6bbddf7d387d6ef18ccfcd
2012-08-29 17:09:32 -07:00
Jim Mathies
7923c64e21
Bug 784165 - Metrofx should use a new appid. r=gavin
2012-09-13 12:29:08 -05:00
Allison Naaktgeboren
394e2f4fdf
Bug 644734; r=gps
2012-09-12 15:08:07 -07:00
Gregory Szorc
d2da80f519
Merge mozilla-central into services-central
2012-08-20 09:34:02 -07:00
Gregory Szorc
b4b821ecc7
Merge mozilla-central into services-central
2012-08-15 16:24:21 -07:00
Gregory Szorc
4aef374315
Bug 781952 - Part 3: Remove unused Service._updateCluster; r=rnewman
2012-08-14 11:34:28 -07:00
Gregory Szorc
766a2d965e
Bug 781952 - Part 2: Move cluster management out of service.js; r=rnewman
2012-08-14 11:34:20 -07:00
Gregory Szorc
2b7e5b1f01
Bug 781952 - Part 1: Refactor engine syncing logic out of service.js; r=rnewman
2012-08-14 11:34:14 -07:00
Gregory Szorc
226eb66194
Bug 781946 - Clean up notifications usage; r=rnewman
2012-08-13 16:51:58 -07:00
Gregory Szorc
c7e1b56f08
Bug 618233 - Re-disable test_jpakeclient.js on Windows for oranges; r=rnewman
2012-08-13 10:29:28 -07:00
Gregory Szorc
96de8c216c
Bug 781307 - Remove rules from services/ Makefile.in's; r=glandium
2012-08-09 13:12:29 -07:00
Gregory Szorc
e1e423c49a
Bug 759487 - Refactor services/sync/Makefile.in; r=glandium
2012-08-09 13:12:26 -07:00
Gregory Szorc
cca4531b41
Bug 618233 - Enable test_jpakeclient.js on Windows; r=rnewman
...
May trigger intermittent oranges. Trying to reproduce so we can triage.
2012-08-08 16:43:05 -07:00
Gregory Szorc
54b5597244
Bug 781348 - Style improvements to service.js; r=rnewman
2012-08-08 16:35:37 -07:00
Gavin Sharp
3d2b804549
Bug 781323: fix about:sync-log, r=gps
...
--HG--
extra : rebase_source : 168339ad89dd0263b83deb7d9b028d59562cffe0
2012-08-14 15:37:04 -04:00
Mike Hommey
6173fa297f
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 20:26:44 +02:00
Gregory Szorc
b2e6e4bdd5
Bug 779589 - Move services/common testing-only JS modules into own directory; r=rnewman
...
--HG--
rename : services/common/aitcserver.js => services/common/modules-testing/aitcserver.js
rename : services/common/storageserver.js => services/common/modules-testing/storageserver.js
2012-08-01 13:50:55 -07:00
Gregory Szorc
bf3e935a56
Bug 779391 - Move deepCopy into CommonUtils; r=rnewman
2012-08-01 12:05:29 -07:00
Gregory Szorc
c675bfe933
Bug 777989 - Make Add-on sync TPS tests work again; r=rnewman
2012-08-01 12:02:48 -07:00
Gregory Szorc
1250f9ad59
Bug 777989 - Update TPS to use new AddonUtils module; r=rnewman
2012-07-31 18:12:12 -07:00
Gregory Szorc
ec9dee356d
Bug 777989 - Move add-on helper functions out of add-ons engine; r=rnewman
2012-07-30 17:05:33 -07:00
Sankha Narayan Guria
573ed47658
Bug 579604 - Save prefs file after setting up Sync; r=gps
2012-07-30 16:05:20 -07:00
Richard Newman
8ca1b6d9e0
Merge m-c to s-c.
2012-07-30 13:04:40 -07:00
Aryeh Gregor
e806eeab4f
Bug 777292 part 2 - Change all nsnull to nullptr
2012-07-30 17:20:58 +03:00
Richard Newman
09061b2d8c
Bug 762606 - Another attempt at stopping tests finishing too soon. r=orange
2012-07-28 18:19:27 -07:00
Richard Newman
bcf9be992b
Bug 762606 - Intermittent test_resource_async.js | test failed (again). r=gps
2012-07-26 14:01:43 -07:00
Gregory Szorc
008d42709b
Merge mozilla-central into services-central
2012-07-25 11:20:58 -07:00
Gregory Szorc
f3c4e9e2a7
Bug 769500 - Followup to fix timing-related intermittent orange; r=bustage
2012-07-24 22:15:16 -07:00
Gregory Szorc
5687fff973
Bug 776778 - Followup to fix intermittent orange; r=bustage
2012-07-24 22:06:59 -07:00
Gregory Szorc
d2b7848baf
Bug 776778 - Implement X-If-Unmodified-Since on GET method; r=rnewman
...
This reflects changes to the spec in bug 776768.
2012-07-24 16:51:48 -07:00
Gregory Szorc
45b260eb46
Bug 776771 - Remove index_above and index_below from storage service; r=rnewman
...
Removed from spec in bug 775395.
2012-07-24 11:44:04 -07:00
Gregory Szorc
709479226d
Bug 776770 - Remove newline encoding from storage service server; r=rnewman
...
Functionality removed from spec in bug 775798.
2012-07-24 11:43:57 -07:00
Gregory Szorc
eae5fbe31d
Merge mozilla-central into services-central
2012-07-24 10:08:45 -07:00
Gregory Szorc
c581a3d944
Bug 769500 - Add batching APIs to storage service client; r=rnewman
2012-07-23 16:46:38 -07:00
Gregory Szorc
4953042a6b
Bug 775216 - Percent decode query string members; r=rnewman
2012-07-23 16:39:28 -07:00
Richard Newman
616d8ab6ee
Bug 763973 - Intermittent test_resource_async.js | test failed (with xpcshell return code: 0) | false == true. r=gps
2012-07-24 19:55:48 -07:00
Mounir Lamouri
9ce52af9b9
Bug 775829 - Use the new Permission Manager API in Browser ID. r=sicking
2012-07-20 18:09:12 -07:00
Joshua Cranmer
4b8f318e78
Bug 773637 - Kill NS_SCRIPTABLE annotations, Part 1: Remove NS_*PARAM annotations. r=ehsan
...
--HG--
extra : rebase_source : a0b4bc50fece36d9a90fed61431635948bfa33b5
2012-07-06 15:14:07 -05:00
Gregory Szorc
d57f45b27e
Bug 775287 - Track request count in storage server; r=rnewman
2012-07-20 12:00:39 -07:00
Patrick McManus
4c858109e4
bug 770331 - always try and negotiate HTTP Keep-Alive r=biesi
...
--HG--
extra : rebase_source : d348e3ec56faa48fbed5c4f0f697dee6658e21b2
2012-07-20 08:40:13 -04:00
Jonas Sicking
b5d168a6b4
Bug 774585: Make about: redirectors reset channel owner to null rather than set an explicit principal so that we'll go through the normal code paths in GetChannelPrincipal. r=bz
2012-07-17 22:22:19 -07:00
Gregory Szorc
d9e533d54d
Bug 774736 - Move Sync's version to Makefile.in; general cleanup; r=glandium
2012-07-17 10:45:13 -07:00
Tim Taubert
988348b086
merge m-c to fx-team
2012-08-16 11:10:41 -07:00
Dave Townsend
a47d2f37ce
Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused
...
Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused
2012-05-10 11:33:02 -07:00
Blair McBride
7ca24186f5
Backout 42bc5a310a29 (bug 782881) due to multi-orange.
2012-08-15 23:07:45 +12:00
Dave Townsend
4da8c0b7f4
Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused
2012-05-10 11:33:02 -07:00
Gregory Szorc
8774681ad7
Bug 783437 - Add conditions acceptance to token server client; r=rnewman
2012-08-28 13:34:33 -07:00
Gregory Szorc
83779ff1b5
Backout 66a9982a4bc9 (bug 760902) for frequent orange
2012-07-13 23:15:21 -07:00
Anant Narayanan
99c9479e29
Bug 760902: Add test for AITC manager GET timer; r=gps
2012-07-13 20:00:09 -07:00
Anant Narayanan
bbe38a194a
Bug 761045: Upload locally installed apps on first run; r=gps
2012-07-13 19:52:30 -07:00
Nick Desaulniers
c3eb05da83
Bug 760910: Handle 401 responses correctly in AITC; r=gps
2012-07-05 09:32:07 -07:00
Anant Narayanan
a504456eb3
Bug 772191 - Change default stream encoding of RESTRequest to utf-8; r=philikon
2012-07-13 16:52:31 -07:00
Gregory Szorc
4a60ecefc1
Bug 760895 - Rewrite reconciling algorithm for AITC; r=mconnor
2012-07-13 16:25:08 -07:00
Nick Desaulniers
e5e2576891
Bug 760909: Implement client driven backoff for AITC; r=gps
2012-07-02 14:57:16 -07:00
Anant Narayanan
8b5058a0cd
Bug 773717: browserid.org now redirects to login.persona.org; r=gps
2012-07-13 14:03:42 -07:00
Nick Desaulniers
0c9118bc4d
Bug 760909 - Add onRequest and mock response handling to AITC server; r=gps
2012-07-12 16:52:58 -07:00
Harald Kirschner
341cc8e70d
Bug 750948 - Implement unit tests for AitC client against mock server; r=gps
2012-06-25 16:39:39 -07:00
Benjamin Peterson
885e5a7519
Bug 722956: clear async io timer, so it doesn't run after shutdown has started. r=philkon
2012-07-12 16:36:41 -07:00
Gregory Szorc
0d1f8b0da7
Merge mozilla-central into services-central
2012-07-12 12:10:52 -07:00
Gregory Szorc
ec94cb2ff9
Bug 772569 - Remove do_load_httpd_js from services test code; r=rnewman
2012-07-10 11:54:12 -07:00
Gregory Szorc
ab057c40d3
Merge mozilla-central into services-central
2012-07-10 10:22:21 -07:00
Ryan VanderMeulen
99f4efb3c0
Merge the last PGO-green inbound changeset to m-c.
2012-07-09 20:59:12 -04:00
Gregory Szorc
3b0a029bb4
Bug 769816 - Send newline-delimited requests instead of JSON; r=rnewman
2012-07-09 15:24:46 -07:00
Anant Narayanan
c41fca6594
Bug 760896: Use CommonUtils.json* in AitC Storage module; r=gps
2012-07-05 17:34:03 -07:00
Gregory Szorc
99a8ff9dbe
Bug 769864 - Fix intermittent test failure due to timing inconsistency; r=rnewman
2012-07-02 16:44:23 -07:00
Nathan Froyd
a7eb97f896
Bug 370750 - consolidate mochitest files installation; r=glandium
...
With assistance on the patch from Ms2ger, Waldo, and Mossop.
2012-07-03 16:49:02 -04:00
Gregory Szorc
e637d5439f
Bug 732152 - Implement standalone client for Storage Service 2.0; r=rnewman
2012-06-29 13:30:05 -07:00
Gregory Szorc
6484d9695f
Bug 760466 - Make JS Storage Server pass Python functional tests; r=rnewman
2012-06-29 13:29:53 -07:00
Gregory Szorc
85cbbb42b0
Bug 757860 - Load JS HTTP server as a module; r=rnewman
...
--HG--
rename : services/common/tests/unit/aitcserver.js => services/common/aitcserver.js
rename : services/common/tests/unit/storageserver.js => services/common/storageserver.js
2012-06-29 13:28:17 -07:00
Richard Newman
1ef0bda54b
Merge m-c to s-c.
2012-06-28 16:55:10 -07:00
Anant Narayanan
34b466738c
Bug 744985: Redirect about:apps to apps dashboard; r=gps
2012-06-27 17:39:18 -07:00
Anant Narayanan
630d1ebde3
Bug 760898: Merge with s-c
2012-06-26 13:21:36 -07:00
Anant Narayanan
bfbd56d624
Bug 760898: Only enable AITC if the Apps DOM API is used; r=gps
2012-06-26 13:14:32 -07:00
Gregory Szorc
3d0ac8bd98
Backed out changeset dd0d02c1ee7c (bug 766325) for xpcshell bustage
2012-06-23 18:38:41 -07:00
Gregory Szorc
91b6cd65d3
Bug 767023 - Change "deleted" to "hidden" per spec change; r=rnewman
2012-06-23 10:22:53 -07:00
Gregory Szorc
b0c4b4209a
Bug 766325 - Change "deleted" to "hidden" per spec change; r=rnewman
2012-06-23 10:22:53 -07:00
Gregory Szorc
994a211bd6
Bug 765294 - Fix packaging of services components; r=ted
2012-06-22 09:27:01 -07:00
Gregory Szorc
0190f2644c
Bug 754062 - Add skeleton for browser notifications service; r=gps
...
This is a reland. The original commit was c53f474c502b and was backed
out in 591fd1c696f0. The next commit is required to make xpcshell tests
not fail.
2012-06-22 09:24:39 -07:00
Gregory Szorc
42f9aa1b99
Backout bug 754062 (c53f474c502b) for xpcshell breakage
2012-06-20 11:51:49 -07:00
Gregory Szorc
260a1e774e
Bug 760905 - Change bounds of test_storage_queue.js to address orange; r=rnewman
2012-07-11 12:06:44 -07:00
Anant Narayanan
7cfe413023
Bug 761877: Add correct UTF-8 handling to RESTRequest; r=gps
2012-06-15 14:49:11 -07:00
Anant Narayanan
1da7f275af
Bug 760906: Enable logging for AITC; r=gps
2012-06-15 14:47:33 -07:00
Jeff Balogh
f8804b8499
Bug 754062 - Add skeleton for browser notifications service; r=gps
2012-06-14 14:58:19 -07:00
Ehsan Akhgari
45fe6d3ae2
Bug 722872 - Part 1: Add nsITransferable::Init(nsILoadContext*), enforce that it's called in debug builds, and add nsIDOMDocument* arguments to nsIClipboardHelper methods; r=roc
...
This patch does the following:
* It adds nsITransferable::Init(nsILoadContext*). The load context
might be null, which means that the transferable is non-private, but
if it's non-null, we extract the boolean value for the privacy mode
and store it in the transferable.
* It adds checks in debug builds to make sure that Init is always
called, in form of fatal assertions.
* It adds nsIDOMDocument* agruments to nsIClipboardHelper methods which
represent the document that the string is coming from.
nsIClipboardHelper implementation internally gets the nsILoadContext
from that and passes it on to the transferable upon creation. The
reason that I did this was that nsIClipboardHelper is supposed to be a
high-level helper, and in most of its call sites, we have easy access
to a document object.
* It modifies all of the call sites of the above interfaces according to
this change.
* It adds a GetLoadContext helper to nsIDocument to help with changing
the call sites.
2012-04-16 22:14:01 -04:00
Ryan VanderMeulen
959e0d6234
Merge m-c to inbound.
2012-07-09 20:53:11 -04:00
Jens Hatlak
3dd78fef84
Bug 758530 - Sync does not initialize automatically anymore. r=bsmedberg
...
Add SeaMonkey AppID to Weave component whitelist
2012-06-05 21:27:54 +02:00
Gregory Szorc
238e7be9a2
Bug 700000 - Bump Sync version to 1.18.0
2012-06-04 22:29:52 +02:00
Gregory Szorc
4f005b374e
Bug 760905 - Disable problematic test for AITC; r=I
...
AITC is not enabled by default, so this test would just add overhead for
people tracking the tree.
2012-06-04 10:14:30 +02:00
Anant Narayanan
2a3d499076
Bug 757261: Apps in the Cloud Manager and Service; r=mconnor
2012-06-02 23:32:37 -07:00
Anant Narayanan
8e0c38bec9
Bug 745345: BrowserID support for Apps in the Cloud; r=khuey, r=gps
2012-06-02 22:08:54 -07:00
Anant Narayanan
4607dba17b
Bug 755375: Implement Apps in the Cloud storage layer; r=gps
2012-06-02 21:58:46 -07:00
Anant Narayanan
cc516fdf58
Bug 754538 - Implement Apps in the Cloud REST client; r=gps, r=mconnor
2012-06-02 20:35:34 -07:00
Gregory Szorc
f59d37ae51
Bug 760448 - Send result to CommonUtils.jsonSave's callback; r=rnewman
2012-06-01 18:35:38 +02:00
Gregory Szorc
6fbcd6f49f
Bug 749336 - JS implementation of AITC 1.0 server; r=rnewman
2012-06-01 15:12:43 +02:00
Gregory Szorc
7989a944e5
Bug 744323 - JS implementation of storage service 2.0 server; r=rnewman
2012-06-01 15:12:40 +02:00
Gregory Szorc
dd9fa06556
Bug 760105 - Add argument to CommonUtils.encodeBase64URL for padding; r=rnewman
2012-06-01 15:12:37 +02:00
Gervase Markham
d4eb7d5782
Bug 759095 - upgrade license to MPL 2, and other licensing cleanups.
...
--HG--
extra : rebase_source : da55a4937383eda2baf7c9a362501da8ee664146
2012-05-29 16:52:43 +01:00
Gregory Szorc
ae61901042
Bug 756366 - Preserve Sync credentials during client wipe; r=rnewman
2012-05-22 10:17:53 +02:00