Dan Mills
|
9f77422143
|
merge upstream changes
|
2008-06-26 16:38:00 -07:00 |
|
Dan Mills
|
6f246308bc
|
don't even try to sync when the local lock is taken
|
2008-06-26 16:37:38 -07:00 |
|
Atul Varma
|
b31c786d84
|
Automated merge with http://hg.mozilla.org/labs/weave
|
2008-06-26 16:28:55 -07:00 |
|
Atul Varma
|
e0f26c39a3
|
Added a bookmark sync test that exercises the commandLike() method by adding two identical bookmarks with different GUIDs to different profiles and then syncing.
|
2008-06-26 16:28:44 -07:00 |
|
Atul Varma
|
aa4a046d61
|
Added an additional check in stores.js to prevent a strict warning from appearing.
|
2008-06-26 16:27:54 -07:00 |
|
Dan Mills
|
8bc8c1abbb
|
when we abort a lock request because we already hold a token, reset _lockAllowed to allow further requests for locks
|
2008-06-26 16:26:14 -07:00 |
|
Dan Mills
|
c3a7956e61
|
fix unit test makefile so it works on windows (no symlinks on windows, boo)
|
2008-06-26 16:09:22 -07:00 |
|
Dan Mills
|
6d7c4f1bbd
|
merge upstream changes
|
2008-06-26 15:37:55 -07:00 |
|
Dan Mills
|
47dd0daafe
|
disabling password sync by default due to bug 438356
|
2008-06-26 15:37:30 -07:00 |
|
Chris Beard
|
e4bd9df954
|
adding EULA that will be displayed and must be agreed to on first run
|
2008-06-26 18:37:05 -04:00 |
|
Justin Dolske
|
1b2e7b297b
|
Use statically-sized stack buffers to fix building on Windows.
|
2008-06-26 15:22:48 -07:00 |
|
Atul Varma
|
e9e88705ce
|
Automated merge with http://hg.mozilla.org/labs/weave
|
2008-06-26 15:02:08 -07:00 |
|
Atul Varma
|
2bd0a8ac17
|
Refactored some things in the test framework to make tests easier to write, and to make certain things possible to write.
|
2008-06-26 15:01:34 -07:00 |
|
Anant Narayanan
|
62a0ebb31e
|
Add license headers to all files which didn't have them.
|
2008-06-26 14:49:01 -07:00 |
|
Dan Mills
|
277753d21a
|
tone down tab engine debugging output a bit
|
2008-06-26 14:34:32 -07:00 |
|
Dan Mills
|
703829a510
|
fix comment in verifyLogin
|
2008-06-26 14:30:38 -07:00 |
|
Dan Mills
|
5c7f8c6a40
|
check login status code in service's verifyLogin; attempt to create user directory when it's a 404
|
2008-06-26 12:27:54 -07:00 |
|
Dan Mills
|
6badbcac4d
|
merge upstream changes
|
2008-06-26 12:23:07 -07:00 |
|
Dan Mills
|
2d3216c74e
|
return http status code from dav's checkLogin
|
2008-06-26 12:22:19 -07:00 |
|
Dan Mills
|
e021d9ade1
|
disable bookmarks sharing & xmpp for developer release
|
2008-06-26 12:21:25 -07:00 |
|
Maria Emerson
|
8d963abd80
|
added text (not final), changed background, some code clean-up, todo: more code clean-up, fix large buttons (they are ugly)
|
2008-06-26 12:09:28 -07:00 |
|
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
|
437cac3a82
|
For developer release, made bookmark sharing and xmpp preferences default to false
|
2008-06-26 12:07:38 -07:00 |
|
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 |
|