Граф коммитов

393 Коммитов

Автор SHA1 Сообщение Дата
jonathandicarlo@jonathan-dicarlos-macbook-pro.local b35a6930b7 Merged 2008-06-09 12:13:03 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 512d95591b The folder annotation for outgoing shared folders is now a string containing the username of the person the folder is being shared with. Also moved to using const strings in bookmark-menu-overlay.js. 2008-06-09 12:12:51 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 8829030b84 Merged 2008-06-09 11:49:04 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local ea75f4df3a Fixed my code so that BookmarkEngine._sync() now works correctly to call Engine._sync() and BookmarkEngine.syncMounts(), asynchronously. Added in some TODO comments about what's going to happen in the next round of refactoring. 2008-06-09 11:48:52 -07:00
Atul Varma e63f4ac16e Just added a few semicolons that js2-mode warned me about. 2008-06-09 09:45:55 -07:00
Atul Varma 49aee667f5 Added more tests to test_async.js and documented them a bit. 2008-06-07 00:34:33 -07:00
Atul Varma 948613950d Fixed an inaccuracy in the async.js test suite. 2008-06-07 00:22:57 -07:00
Atul Varma 0c65b8b3d6 Added a unit test suite for modules/async.js. 2008-06-06 21:40:30 -07:00
jonathandicarlo@localhost 5bb48d8dfa Added license block and explanatory comments to bookmarks.js 2008-06-06 19:28:01 -07:00
jonathandicarlo@localhost a59f8a133c 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 d5a40e3690 merging branches 2008-06-06 17:58:02 -07:00
chris@h-194.office.mozilla.org 31e59001d5 - 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 3e159040cb Merged changes. 2008-06-06 17:46:46 -07:00
Atul Varma cdffb0e77e 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 e09c7116a8 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 11f8af5431 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 32b49e6b82 - 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 f500b95f11 - 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 8697d54544 Fix linux builds (bug 433922, r=thunder) 2008-06-05 17:21:53 -07:00
Myk Melez 3fd6e2ee70 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 0ecee8a817 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 a2659cdec7 merge upstream changes 2008-06-05 23:11:20 +09:00
Dan Mills 510669d414 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 13f2fbd215 Merged 2008-06-04 20:30:56 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 06dabdbad5 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 58d219c0e7 imported patch xmpp-transport-fault-tolerance-and-test 2008-06-04 18:34:37 -07:00
Dietrich Ayala db02ef8937 xmpp-stream-error-handling 2008-06-04 17:36:37 -07:00
Dietrich Ayala 8ec3277ff2 [mq]: xmpp-reconnect 2008-06-04 17:00:02 -07:00
Dietrich Ayala 49101addf2 [mq]: xmpp-disconnect 2008-06-04 14:02:47 -07:00
Myk Melez 4041662e5a 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 7b5ca70bb5 [mq]: xmpp-cleanup 2008-06-04 12:14:28 -07:00
Dan Mills 6e0ff36f60 Bug 436303: Fix misspelling 2008-06-04 23:07:07 +09:00
Atul Varma fabc5bcb17 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 f4000cc8bc In passwords.js, turned _hashLoginInfo() into a module-level function. 2008-06-03 16:56:58 -07:00
Atul Varma 53a37dc1fd Minor js2-mode warning fixes. 2008-06-03 15:14:27 -07:00
Atul Varma e9e278d370 Removed unused code from cookies.js, fixed a few js2-mode warnings. 2008-06-03 14:49:22 -07:00
Atul Varma 26b0341c5c Moved all tab-syncing code to modules/engines/tabsjs. 2008-06-03 14:45:53 -07:00
Atul Varma 5608238392 Moved all form-syncing code into modules/engines/forms.js. 2008-06-03 14:20:51 -07:00
Atul Varma 8ea237d262 Moved all password-syncing code into modules/engines/passwords.js. 2008-06-03 14:08:53 -07:00
Atul Varma b20c630abe Moved all history-related functionality into modules/engines/history.js. 2008-06-03 13:56:16 -07:00
Atul Varma 0e8b9eb9af 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 6b9c06e8ed remove unused _json property from TabSyncCore 2008-06-03 11:50:08 -07:00
Myk Melez 07924b2c43 merge 2008-06-03 11:43:07 -07:00
Myk Melez 92b3748833 bug 434817: sync tabs 2008-06-03 11:32:59 -07:00
Atul Varma 7a7a041ace 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 1f7fb7752b Merged changes 2008-06-02 20:14:00 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local fd84f76ff6 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 826fa1d7f3 minor typo fixes 2008-06-02 15:24:52 -07:00
Dan Mills 6444cadd99 log stack traces from sync exceptions 2008-06-02 13:02:04 +09:00
Dan Mills ab858fed15 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