jonathandicarlo@localhost
f26ddc5f76
Added license block and explanatory comments to bookmarks.js
2008-06-06 19:28:01 -07:00
jonathandicarlo@localhost
98d1bf05f4
Made BookmarkEngine.sync() responsible for calling BookmarkEngine.syncMounts (to get the incoming shared bookmark folder contents), eliminating the FIXME that previously had this being called from special-case code in WeaveSvc.sync().
2008-06-06 19:22:23 -07:00
chris@h-194.office.mozilla.org
30795b78b9
merging branches
2008-06-06 17:58:02 -07:00
chris@h-194.office.mozilla.org
062c813474
- Adding temporary button to load account creation form for sm-labs01 while work continues on the first run process.
...
- Minor reorganization of preferences, namely, moving the advanced debugging tools into a sub-dialog and ensure each have a descriptive confirmation prompt.
2008-06-06 17:57:16 -07:00
Atul Varma
29434b62a4
Merged changes.
2008-06-06 17:46:46 -07:00
Atul Varma
49ad148d83
In async.js, renamed 'object' to 'thisArg', which makes the code clearer and easier to understand.
2008-06-06 17:46:34 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
473352178e
Resolved conflicts with Chris's changes (to use the username, unhashed, as the name of the server-side sharing directory)
2008-06-06 17:43:15 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
3db8dcb84c
Moved _createShare and _share() from engines.js to BookmarkEngine class in engines/bookmarks.js. The identity of the folder to be shared is now passed from the share dialog box (share.xul) into BookmarkEngine._share().
2008-06-06 17:33:44 -07:00
chris@h-194.office.mozilla.org
a800ba8d31
- turning in the bookmarks sharing UI, although it's still not fully functional.
2008-06-06 14:40:35 -07:00
chris@h-194.office.mozilla.org
d7c750f0f9
- this check in will break everyone temporarily, as it involves the changes necessary to shift us from sha1(email) to usernames, and to enable sharing on the server.
...
- we are also changing the default preferences on the trunk to point to the new staging server at https://sm-labs01.mozilla.org:81 that has been modified to support usernames
- everyone will need to create a new account and this will be streamlined within the startup function, which will now kick off on first run (we'll check in the updated setup wizard shortly)
- this checkin also cleans up a number of strings
2008-06-06 14:18:50 -07:00
Anant Narayanan
4298abcb95
Fix linux builds (bug 433922, r=thunder)
2008-06-05 17:21:53 -07:00
Myk Melez
f096ecbbf4
bug 437523: fix NS_ERROR_FAILURE on nsIJSON.decode in JsonFilter_afterGET
2008-06-05 16:25:55 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
12ae1f3d1c
Re-disabled test_xmpp_simple.js; it shouldn't be run without a local jabber server (and it wasn't, until I accidentally comitted my local change enabling the test.
2008-06-05 12:18:16 -07:00
Dan Mills
b32b7d3549
merge upstream changes
2008-06-05 23:11:20 +09:00
Dan Mills
c2081e7fb9
create objects for the various server resources (these will later abstract away the actual resources); fix a bug where we were reversing the order of resource filters on every GET request
2008-06-05 16:17:32 +09:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
a8012cad1d
Merged
2008-06-04 20:30:56 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
e578f11c10
The menu icon of a bookmark folder now changes when that folder is being shared out with others.
2008-06-04 20:30:37 -07:00
Dietrich Ayala
406a97aee2
imported patch xmpp-transport-fault-tolerance-and-test
2008-06-04 18:34:37 -07:00
Dietrich Ayala
ecbfb93933
xmpp-stream-error-handling
2008-06-04 17:36:37 -07:00
Dietrich Ayala
3d3869c8a5
[mq]: xmpp-reconnect
2008-06-04 17:00:02 -07:00
Dietrich Ayala
3e4256b313
[mq]: xmpp-disconnect
2008-06-04 14:02:47 -07:00
Myk Melez
b3bf939ec2
bug 436696: make sure we pass a valid URI to nsITaggingService::getTagsForURI when the bookmark record doesn't include a URI so the method doesn't throw and hork bookmarks sync
2008-06-04 13:40:53 -07:00
Dietrich Ayala
6805970f17
[mq]: xmpp-cleanup
2008-06-04 12:14:28 -07:00
Dan Mills
f7003493a7
Bug 436303: Fix misspelling
2008-06-04 23:07:07 +09:00
Atul Varma
d3d41cc696
Added a basic testing suite for engines/passwords.js. It currently only tests _hashLoginInfo() and PasswordSyncCore._itemExists().
2008-06-03 18:37:36 -07:00
Atul Varma
3a9ddcad85
In passwords.js, turned _hashLoginInfo() into a module-level function.
2008-06-03 16:56:58 -07:00
Atul Varma
d8420aaf50
Minor js2-mode warning fixes.
2008-06-03 15:14:27 -07:00
Atul Varma
e5bb509e17
Removed unused code from cookies.js, fixed a few js2-mode warnings.
2008-06-03 14:49:22 -07:00
Atul Varma
b74958a214
Moved all tab-syncing code to modules/engines/tabsjs.
2008-06-03 14:45:53 -07:00
Atul Varma
daf3be7564
Moved all form-syncing code into modules/engines/forms.js.
2008-06-03 14:20:51 -07:00
Atul Varma
1e0a1d1e06
Moved all password-syncing code into modules/engines/passwords.js.
2008-06-03 14:08:53 -07:00
Atul Varma
e2ce660c53
Moved all history-related functionality into modules/engines/history.js.
2008-06-03 13:56:16 -07:00
Atul Varma
f365f924cf
Re-removed cookie-related changes that were accidentally re-added by c1a58b24679c and/or 5a49daf87c94.
...
Also moved all bookmark syncing logic into modules/engines/bookmarks.js.
2008-06-03 12:38:48 -07:00
Myk Melez
d635f80fdc
remove unused _json property from TabSyncCore
2008-06-03 11:50:08 -07:00
Myk Melez
690e2b800c
merge
2008-06-03 11:43:07 -07:00
Myk Melez
07ba8ea83e
bug 434817: sync tabs
2008-06-03 11:32:59 -07:00
Atul Varma
ada0204cac
Moved all code related to the syncing of cookies--e.g. CookieStore, CookieTracker, CookieEngine, CookieSyncCore--into their own file at modules/engines/cookies.js. I'll be doing the same to the other engines shortly.
...
This helps with code organization--all the logic for dealing with a particular data type is now in one place--and should also make it easier to write unit/regression tests.
2008-06-03 11:11:44 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
c3c783a630
Merged changes
2008-06-02 20:14:00 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
8dd60a75cb
Bookmark share now leaves an annotation ('weave/share/sahred_outgoing' = true or false) on a bookmark folder to note whether it's being shared or not; when a folder is being shared, the menu item in the folder submenu changes to 'Stop sharing this folder'.
2008-06-02 20:13:46 -07:00
Myk Melez
2d0bcb7a9b
minor typo fixes
2008-06-02 15:24:52 -07:00
Dan Mills
d526a56d57
log stack traces from sync exceptions
2008-06-02 13:02:04 +09:00
Dan Mills
5eac28e81c
change remote store to keep track of identity names/aliases and fetch the objects from the id manager
2008-06-02 11:10:11 +09:00
Dan Mills
2daecc268e
move json and crypto into remote resource 'filters', so the engine doesn't have to explicitly encode/decode anything. note--known regression: filters will not use the encryption algorithm in the status file
2008-05-30 20:43:55 -07:00
Dan Mills
5ac797d47a
branch merge
2008-05-30 18:54:57 -07:00
Dan Mills
f36b66b136
only require the .rc file on windows
2008-05-30 18:53:07 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
f9c2868a77
Merged changes.
2008-05-30 18:20:02 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
5ed074f466
Made the bookmark-share dialog box display the name of the folder you selected; also, the 'Share This Folder' menu text is now pulled from share.properties for easier i18n.
2008-05-30 18:19:47 -07:00
Dan Mills
0640f244d6
format exception correctly when an engine throws during sync
2008-05-30 17:40:08 -07:00
Dan Mills
edff2a32aa
make some async generator errors clearer
2008-05-30 17:38:27 -07:00
Atul Varma
2271e34077
Added a simple test to test_fault_tolerance.js that wasn't working before, but now is, and I don't know why...
2008-05-30 17:02:25 -07:00
