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

583 Коммитов

Автор SHA1 Сообщение Дата
Dan Mills 0c712a5965 merge upstream changes 2008-06-26 17:28:46 -07:00
Dan Mills 78b08a1f36 bump version to 0.1.32, storage format version (global & engine) to 3 2008-06-26 17:28:30 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local e8b81ae67e Merged 2008-06-26 17:26:31 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 696a7ad0f6 Removed unneeded atob() and btoa() definitions from authenticationLayer. 2008-06-26 17:26:21 -07:00
Maria Emerson f33e9a20d5 branch merge 2008-06-26 17:11:30 -07:00
Maria Emerson c9a7cc7a97 fixed captcha screen 2008-06-26 17:08:44 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 7d605a4378 Merged 2008-06-26 17:01:12 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 4f1720a6fc Fixed several minor bugs with bookmark sharing 2008-06-26 17:00:55 -07:00
Atul Varma eb46716053 Oops, forgot to revalidate logs in my last commit. 2008-06-26 17:00:01 -07:00
Atul Varma 2789cef3c6 Fixed a typo, added an explicit check in test_bookmark_syncing. 2008-06-26 16:59:25 -07:00
Dan Mills b476ed0a18 merge upstream changes 2008-06-26 16:38:00 -07:00
Dan Mills 07ebed63a8 don't even try to sync when the local lock is taken 2008-06-26 16:37:38 -07:00
Atul Varma 361206ff0d Automated merge with http://hg.mozilla.org/labs/weave 2008-06-26 16:28:55 -07:00
Atul Varma d80752f41a 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 f8137c67c5 Added an additional check in stores.js to prevent a strict warning from appearing. 2008-06-26 16:27:54 -07:00
Dan Mills f07cb3970d 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 69080714d8 fix unit test makefile so it works on windows (no symlinks on windows, boo) 2008-06-26 16:09:22 -07:00
Dan Mills 155392214f merge upstream changes 2008-06-26 15:37:55 -07:00
Dan Mills a70940d45f disabling password sync by default due to bug 438356 2008-06-26 15:37:30 -07:00
Chris Beard 90e662ce43 adding EULA that will be displayed and must be agreed to on first run 2008-06-26 18:37:05 -04:00
Justin Dolske 1b1d0f308a Use statically-sized stack buffers to fix building on Windows. 2008-06-26 15:22:48 -07:00
Atul Varma 773399e36a Automated merge with http://hg.mozilla.org/labs/weave 2008-06-26 15:02:08 -07:00
Atul Varma 6cb9821bbd 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 981d2f0a46 Add license headers to all files which didn't have them. 2008-06-26 14:49:01 -07:00
Dan Mills 333d044200 tone down tab engine debugging output a bit 2008-06-26 14:34:32 -07:00
Dan Mills 909d679020 fix comment in verifyLogin 2008-06-26 14:30:38 -07:00
Dan Mills 2873c5b700 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 434f582257 merge upstream changes 2008-06-26 12:23:07 -07:00
Dan Mills 76c7dbd4f1 return http status code from dav's checkLogin 2008-06-26 12:22:19 -07:00
Dan Mills c3a7096c74 disable bookmarks sharing & xmpp for developer release 2008-06-26 12:21:25 -07:00
Maria Emerson b07cfbf417 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 8bcf41653e For developer release, made bookmark sharing and xmpp preferences default to false 2008-06-26 12:07:38 -07:00
Atul Varma 0dfa48971f Automated merge with http://hg.mozilla.org/labs/weave 2008-06-26 11:40:24 -07:00
Atul Varma 24bfe869f6 Refactored password sync test to use newly-added functionality in the sync testing infrastructure. 2008-06-26 11:40:14 -07:00
Atul Varma 49ad3beeab 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 22d4f11f65 Automated merge 2008-06-26 11:16:02 -07:00
Anant Narayanan b580a586dc Prevent multiple lock requests from being executed (bug 441922, r=thunder) 2008-06-26 11:15:02 -07:00
Atul Varma f041c5a9a5 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 7464b11b4c bustage fix: call this.foo(), not foo(). 2008-06-25 18:32:59 -07:00
Anant Narayanan 19b2afb2b9 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 5d79a9825c Handle removeCommand in FormEngine correctly. (bug 441874, r=thunder) 2008-06-25 17:09:18 -07:00
Atul Varma 6c35a6610e Automated merge with http://hg.mozilla.org/labs/weave 2008-06-25 17:05:25 -07:00
Atul Varma afa9d50b44 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 bcb6631187 Branch merge 2008-06-25 16:34:50 -07:00
Anant Narayanan 040f3d1db5 Change default server URL to services.mozilla.com 2008-06-25 16:34:28 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 10287a32be Merged 2008-06-25 15:55:13 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 465dd3b407 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 bd10f4a9dd 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 93d091cbd9 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 d187376a75 bug 436636: a system for showing various kinds of notifications in one consolidated location 2008-06-25 13:51:39 -07:00