Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 8, 2015
  1. @dstillman

    Fix various collection-dragging UI bugs

    dstillman authored
    Fixes #823, hopefully
  2. @dstillman
Commits on Aug 7, 2015
  1. @dstillman

    Don't try to select unselectable row on library tree row removal

    dstillman authored
    (If deleting a group, don't select the header or separator before it.)
  2. @dstillman

    Fix attachment renaming

    dstillman authored
    Fixes #822
  3. @dstillman

    Fix note loading

    dstillman authored
Commits on Aug 6, 2015
  1. @dstillman
  2. @dstillman
  3. @dstillman

    Make CR wizard button assertions Mac-only for now

    dstillman authored
    Wizard buttons are handled differently on Linux/Windows
  4. @dstillman
  5. @dstillman
  6. @dstillman

    Update conflict resolution for API syncing

    dstillman authored
    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
Commits on Aug 2, 2015
  1. @dstillman
  2. @dstillman

    Check remote delete log during full sync

    dstillman authored
    If an object is marked as synced locally and doesn't exist remotely but
    is in the remote delete log, delete it locally
  3. @dstillman
Commits on Aug 1, 2015
  1. @dstillman

    Support 'successful' property in upload response

    dstillman authored
    Save uploaded data to cache, and update local object if necessary (which
    it mostly shouldn't be except for invalid characters and HTML filtering
    in notes)
    
    Also add some upload and JSON tests
Commits on Jul 31, 2015
  1. @dstillman

    Fix a few small data layer bugs, and tidy up a little

    dstillman authored
    I don't think these were triggered by any client code, but I found them while
    porting code to the server.
Commits on Jul 23, 2015
  1. @dstillman

    Merge pull request #807 from adunning/patch-1

    dstillman authored
    Supply missing Œ/œ in diacriticsRemovalMap.
Commits on Jul 21, 2015
  1. @adunning
  2. @dstillman
Commits on Jul 20, 2015
  1. @dstillman

    API syncing megacommit

    dstillman authored
    There's a lot more to do, and this isn't ready for actual usage, but the
    basic functionality is mostly in place and has decent test coverage. It
    can successfully upgrade a library last used with classic syncing and
    pull down changes via the API. Uploading mostly works but is currently
    disabled for safety until it has better test coverage.
    
    Downloaded JSON is first saved to a cache table, which is then used to
    populate other tables and later for generating PATCH requests and
    automatically resolving conflicts (since it shows what was changed
    locally and what was changed remotely). Objects with unmet dependencies
    or unknown fields are skipped for now but don't block the rest of the
    sync.
    
    Some of the bigger remaining to-dos:
    
    - Tests for uploading
    - Re-do the preferences to get an API key
    - File sync integration
    - Full-text syncing integration
    - Manual conflict resolution (though this already includes much smarter
      conflict handling that automatically resolves many conflicts)
  2. @dstillman

    Throw specific errors for missing objects or unknown fields

    dstillman authored
    And add a bit more debugging info to other messages
  3. @dstillman
  4. @dstillman
  5. @dstillman

    Allow overriding startup options in Zotero.reinit()

    dstillman authored
    And use it in resetDB() test support function, mainly to allow
    skipBundledFiles for resetDB calls. Translator installation and
    initialization can take a long time, but tests that need a clean DB
    don't necessarily rely on translators. Without this, running resetDB()
    in beforeEach() for many tests is prohibitively slow.
  6. @dstillman

    Take a promise-returning function in Utilities.Internal.forEachChunkA…

    dstillman authored
    …sync()
    
    Instead of a promise-yielding generator
  7. @dstillman

    Honor .synced on data objects in all cases

    dstillman authored
    Previously, if .synced was already true, setting it to true and saving
    would result in .synced == false unless skipSyncedUpdate was passed. Now
    the value assigned to .synced is always used on the next save. If the
    value hasn't changed and no other values have changed, a save will be a
    no-op.
  8. @dstillman
  9. @dstillman

    Don't create Quick Start Guide item for new libraries

    dstillman authored
    The default items cause problems with conflict resolution for existing
    users (and not syncing them or ignoring conflicts for them is kind of
    weird), and they require remote changes for new databases. I do like
    there not being a completely empty library, but I think it's probably
    better just to display a virtual welcome message with a link to the
    Quick Start Guide somewhere else, such as in the right-hand pane. (A new
    installation also opens the start page on zotero.org.)
  10. @dstillman
Commits on Jul 18, 2015
  1. @dstillman

    Merge branch '4.0'

    dstillman authored
  2. @dstillman

    Fix excessive file sync mtime updates/checks?

    dstillman authored
    Same as 1c2b257, but this time in code we actually still run
Commits on Jul 17, 2015
  1. @dstillman
  2. @dstillman

    Fix CSS in snapshots of Reader View

    dstillman authored
    Allow saving of CSS links over chrome://. We can scope this to
    chrome://global/skin/aboutReader.css if anyone thinks of a reason why
    this was disabled to begin with, but I'm not sure in what other
    situations CSS it would apply.
Commits on Jul 16, 2015
  1. @dstillman

    Merge pull request #800 from rmzelle/select-single-item

    dstillman authored
    Check single items in selection window
  2. @rmzelle
Something went wrong with that request. Please try again.