Atul Varma
|
f33b85dc5d
|
Automated merge with http://hg.mozilla.org/labs/weave
|
2008-06-26 11:40:24 -07:00 |
|
Atul Varma
|
792f0f7e87
|
Refactored password sync test to use newly-added functionality in the sync testing infrastructure.
|
2008-06-26 11:40:14 -07:00 |
|
Atul Varma
|
0e87611a56
|
Revalidated log for password sync test, which changed due to Thunder's changes that put deltas for individual versions into their own files on WebDAV.
|
2008-06-26 11:38:40 -07:00 |
|
Anant Narayanan
|
dcb7a1ada2
|
Automated merge
|
2008-06-26 11:16:02 -07:00 |
|
Anant Narayanan
|
2339871cf6
|
Prevent multiple lock requests from being executed (bug 441922, r=thunder)
|
2008-06-26 11:15:02 -07:00 |
|
Atul Varma
|
6e8d38ac08
|
Refactored client state-changing functions out of test_bookmark_syncing.js and into head.js, as part of the SyncTestingInfrastructure class, so that other test suites can use them.
|
2008-06-26 11:07:13 -07:00 |
|
Justin Dolske
|
4abaf0f90c
|
bustage fix: call this.foo(), not foo().
|
2008-06-25 18:32:59 -07:00 |
|
Anant Narayanan
|
ee51a31ea5
|
Remove runCmd and other openssl related stuff we no longer need. (bug 441898, r=thunder)
|
2008-06-25 17:10:24 -07:00 |
|
Anant Narayanan
|
b53674f5dc
|
Handle removeCommand in FormEngine correctly. (bug 441874, r=thunder)
|
2008-06-25 17:09:18 -07:00 |
|
Atul Varma
|
4740979f77
|
Automated merge with http://hg.mozilla.org/labs/weave
|
2008-06-25 17:05:25 -07:00 |
|
Atul Varma
|
cd2f7cdb93
|
Bookmark sync test now attempts to add a bookmark on the second computer, then re-sync on the first computer and ensure that the bookmark is copied over.
|
2008-06-25 17:05:20 -07:00 |
|
Anant Narayanan
|
710665c8e2
|
Branch merge
|
2008-06-25 16:34:50 -07:00 |
|
Anant Narayanan
|
c8b970ae19
|
Change default server URL to services.mozilla.com
|
2008-06-25 16:34:28 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
a2dede213a
|
Merged
|
2008-06-25 15:55:13 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
3f37543011
|
Set up bookmarkEngine._incomingShareOffer to use Myk's new Notification stuff to offer a notification to the user, asking them to accept or reject the incoming share.
|
2008-06-25 15:54:33 -07:00 |
|
Maria Emerson
|
946084c271
|
fixed interaction details, all login/verify cases work correctly, final screen creates account and syncs correctly
|
2008-06-25 15:44:35 -07:00 |
|
Atul Varma
|
9beba70275
|
Added a number of "real" bookmark sync tests; see test_bookmark_syncing.js for information.
|
2008-06-25 14:30:53 -07:00 |
|
Myk Melez
|
cab1d95570
|
bug 436636: a system for showing various kinds of notifications in one consolidated location
|
2008-06-25 13:51:39 -07:00 |
|
Myk Melez
|
b379fdece8
|
the tabs engine needs a constant
|
2008-06-25 13:51:32 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
6f37a50f99
|
The share/stop sharing menu item is now added only to normal bookmark folders: Not to the main bookmark menu or to magic folders like 'recently tagged' or whatever.
|
2008-06-25 11:58:04 -07:00 |
|
Atul Varma
|
92f85d952e
|
Another automated merge. I'm kind of confused at this point, so I hope I'm not breaking anything by mis-merging.
|
2008-06-25 04:45:22 -07:00 |
|
Atul Varma
|
c747b0559e
|
Automatic merge.
|
2008-06-25 04:44:25 -07:00 |
|
Maria Emerson
|
e1e6f79037
|
fix login calls, do login and sync on final screen, add try again link to server errors throughout
|
2008-06-25 04:43:13 -07:00 |
|
Atul Varma
|
37225f431c
|
Changed AsyncException so that it dynamically subclasses the exception it's wrapping, and adds an 'asyncStack' property to allow access to the asynchronous call stack. This, along with my previous few commits, makes the processing of stack traces in our code much more streamlined, and also allows our debugging output to be more informative, as stack information is now logged from the point at which an exception was thrown, rather than the point at which it was caught.
Also renamed some things in async.js to be more descriptive and easier-to-understand, albeit a bit more verbose.
|
2008-06-25 04:43:07 -07:00 |
|
Myk Melez
|
be2bf638be
|
bug 441446: set mozBackgroundRequest on XMPP request object when created rather than when used, since it only needs to be set once
|
2008-06-25 01:56:17 -07:00 |
|
Justin Dolske
|
b015539e7a
|
Split account verification out from login(), make wizard work for using an existing account, related code cleanup/simplification
|
2008-06-25 00:22:53 -07:00 |
|
Atul Varma
|
9d7f1afc80
|
Made exception logging routines more informative and added logtests for them.
|
2008-06-25 00:13:36 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
1d19d1357f
|
Merged
|
2008-06-24 21:15:23 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
b24d0c7180
|
Moved all of the bookmark-share stuff out of the bookmarkEngine class into a new BookmarksSharingManager class.
|
2008-06-24 21:15:14 -07:00 |
|
Atul Varma
|
7b4737aed7
|
Fixed something that I should've changed in my last commit; also removed a call to Utils.stackTrace() that shouldn't have been made.
|
2008-06-24 19:58:50 -07:00 |
|
Justin Dolske
|
e25d17c184
|
Bustage fix: frame.filename can be null, and the async stack dump can then fail (which causes other problems)
|
2008-06-24 19:39:58 -07:00 |
|
Atul Varma
|
7327a55d0d
|
Renamed AsyncException.trace and Generator.trace to AsyncException.traceback and Generator.traceback, respectively, to distinguish them from Logger.trace() and also explicitly indicate their noun-like nature (since they're properties).
|
2008-06-24 19:15:54 -07:00 |
|
Atul Varma
|
caa3295271
|
Renamed the global trace() function in async.js to traceAsyncFrame(), to avoid confusing it with Logger.trace(), AsyncException.trace, and Generator.trace, all of which are also used in that file.
|
2008-06-24 19:08:35 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
bc4d891c3a
|
Moved the folder name and annotation for the incoming shares root folder to string constants.
|
2008-06-24 18:38:29 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
8cc67dd324
|
Merged
|
2008-06-24 18:28:26 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
fcd94e31e2
|
Fixed all the places where I was accidentally calling it incomingShareAnno instead of incomingSharedAnno (note the missing letter d). Same for outgoingSharedAnno.
|
2008-06-24 18:28:01 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
4cba1fd51c
|
Removed all uses of the 'weave/mounted-shares-id' annotation, since it's been made obsolete by INCOMING_SHARED_ANNO.
|
2008-06-24 18:23:43 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
0edbf9998f
|
Changes in the annotations relevant to incoming/outgoing share folders are now handled by editCommands in the syncCore.
|
2008-06-24 18:15:17 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
4bc77b8e05
|
Annotations on incoming and outgoing share folders are now wrapped for sync, and handled on incoming createCommands.
|
2008-06-24 18:09:41 -07:00 |
|
Myk Melez
|
8dcf0279c4
|
bug 441446: set mozBackgroundRequest on XMPP request object when created rather than when used, since it only needs to be set once
|
2008-06-24 17:45:37 -07:00 |
|
Atul Varma
|
b5dc3b878a
|
Added a really, really basic sync test for bookmarks.
|
2008-06-24 16:55:56 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
2158cdf9c4
|
Merged
|
2008-06-24 13:41:25 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
c4fa84f683
|
Merged
|
2008-06-24 13:41:12 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
03d94018af
|
Added todo about exception handling
|
2008-06-24 13:41:01 -07:00 |
|
chris@h-194.office.mozilla.org
|
95d87d63e0
|
merging
|
2008-06-24 12:44:26 -07:00 |
|
chris@h-194.office.mozilla.org
|
32d06ac143
|
added embedded verification method to login (this wants to be it's own object method, but should work well enough for now.)
some formatted cleanup for wizard.js
|
2008-06-24 12:42:52 -07:00 |
|
Dan Mills
|
e2fc25dbfa
|
Store each delta as a separate file on the server
|
2008-06-24 12:33:27 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
286e670fb2
|
Finished the bridge between UI code and bookmark engine so that stopSharing gets called when you pick the menu itme.
|
2008-06-24 12:22:32 -07:00 |
|
chris@chris-beards-macbook-pro-2.local
|
b969583294
|
another pass at polishing the first run experience, work in progress
|
2008-06-24 08:51:40 -07:00 |
|
Maria Emerson
|
c968d59fe3
|
consolidated error reporting, formatting tbd
|
2008-06-23 22:48:44 -07:00 |
|