mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
zotero/test/tests
History
Dan Stillman 0aecaad761 Update conflict resolution for API syncing 
This will appear much less frequently, since non-conflicting field changes on
both sides can be resolved automatically, but genuine field conflicts still
require manual conflict resolution.

The merge pane is no longer editable, since the itembox code to do that is
async and can't run in a modal window, but it's not really necessary,
particularly with conflicts happening less frequently.

TODO:

- Remote item deletions
- File conflicts
- Maybe handle some edge cases where the conflicted items fail to save
2015-08-06 04:14:49 -04:00
..
data Merge branch '4.0' 2015-07-18 07:09:53 -04:00
attachmentsTest.js Clean up initialization of attachments tests 2015-06-01 20:23:21 -04:00
cachedTypesTest.js Add toCanonical and toLabel for Zotero.CharacterSets 2015-06-11 17:17:28 -05:00
collectionsTest.js Sort descendant collections alphabetically in advanced search window 2015-07-21 00:45:30 -04:00
collectionTest.js Fix updating of cached child collections/items, and make more efficient 2015-05-30 19:03:42 -04:00
collectionTreeViewTest.js Don't select new groups in collections pane 2015-07-20 02:12:01 -04:00
dataObjectsTest.js Clean up DataObject erasing, and fix search unloading 2015-06-16 19:51:21 -04:00
dataObjectTest.js Fix hasChanged() bug related to 'synced' 2015-08-02 05:26:02 -04:00
dataObjectUtilitiesTest.js Support for automatically merging collections and searches 2015-07-20 02:12:14 -04:00
dateTest.js Add Zotero.Date.isISODate() and Zotero.Date.isoToSQL() 2015-05-04 02:41:14 -04:00
dbTest.js Remove stray this.timeout() call 2015-05-29 01:38:47 -04:00
fileInterfaceTest.js Extend timeout for import test 2015-06-12 17:08:30 -04:00
fileTest.js Update character set handling 2015-06-12 02:46:02 -04:00
fulltextTest.js Update PDF tool handling in tests 2015-05-31 23:50:26 -04:00
groupsTest.js Move editable and filesEditable props to libraries table [DB reupgrade] 2015-06-07 15:50:07 -04:00
groupTest.js Fix group.fromJSON() with no 'admins' or 'members' arrays 2015-06-16 19:51:21 -04:00
itemFieldsTest.js Fix Zotero.ItemFields.getBaseIDFromTypeAndField() 2015-05-27 05:01:48 -04:00
itemPaneTest.js More data layer changes 2015-05-21 23:39:00 -04:00
itemsTest.js Disable emptyTrash() test again 2015-06-07 17:16:41 -04:00
itemTest.js Update conflict resolution for API syncing 2015-08-06 04:14:49 -04:00
itemTreeViewTest.js Don't change selection unnecessarily when creating trashed item 2015-06-23 16:56:10 -04:00
lookupTest.js Rename remaining files to *Test.js 2015-05-19 14:46:17 -04:00
preferences_searchTest.js Add waitForDialog(onOpen, button) support function 2015-06-04 20:31:48 -04:00
quickCopyTest.js Ignore trailing period in domain for Quick Copy 2015-07-03 23:46:39 -04:00
recognizePDFTest.js Return a Zotero.Item from all Zotero.Attachments methods 2015-05-29 05:33:54 -04:00
relatedboxTest.js Relations overhaul (requires new DB upgrade from 4.0) 2015-06-01 20:28:30 -04:00
relationsTest.js Update Zotero.Relations.updateUser() for new relations schema 2015-06-04 20:38:49 -04:00
searchTest.js Add basic tests for full-text search 2015-05-31 14:39:37 -07:00
supportTest.js Don't create Quick Start Guide item for new libraries 2015-07-20 02:12:13 -04:00
syncEngineTest.js Update conflict resolution for API syncing 2015-08-06 04:14:49 -04:00
syncLocalTest.js Update conflict resolution for API syncing 2015-08-06 04:14:49 -04:00
syncRunnerTest.js API syncing megacommit 2015-07-20 18:16:57 -04:00
tagsboxTest.js Tags overhaul [DB reupgrade] 2015-06-23 05:21:58 -04:00
tagSelectorTest.js Tags overhaul [DB reupgrade] 2015-06-23 05:21:58 -04:00
tagsTest.js Tags overhaul [DB reupgrade] 2015-06-23 05:21:58 -04:00
translateTest.js Fix timeout on Travis loading 'allTypesAndFields' data 2015-06-11 02:19:49 -04:00
utilitiesTest.js Merge branch '4.0' into sjk/659 2015-06-01 00:03:20 -04:00
zoteroPaneTest.js Fix selection of new items 2015-05-25 21:48:47 -04:00