mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5994 commits 9 branches 362 tags 278 MiB
Commit graph

5994 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Stillman
992f08b8b3 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/xpcom/storage.js
 2013-09-06 14:29:17 -04:00
Dan Stillman
6c0be3426b Use async storage mtime checking in Fx24 on Windows 
https://bugzilla.mozilla.org/show_bug.cgi?id=899436 was backported to 24
 2013-09-05 16:36:15 -04:00
Dan Stillman
840790926b Fix merging of tags during sync conflict 
If an item was added to a tag on one computer and another item was added
to the tag on a different computer, and then they both synced one of the
tags could be removed on the second computer to sync.
 2013-09-04 17:53:11 -04:00
Dan Stillman
6eb354bf36 Fix cursor feedback for file drag-in on Linux, where we can set it 2013-09-03 04:49:02 -04:00
Dan Stillman
82769f0b9c Allow moving (instead of copying) files into Zotero 
Cmd-drag on OS X, Shift on Windows and Linux

As requested in
https://forums.zotero.org/discussion/31717/delete-source-file-on-import/

Unfortunately due to https://bugzilla.mozilla.org/show_bug.cgi?id=911918
(and another issue on Windows) we can't show proper cursor feedback for
external file drags.
 2013-09-03 04:25:35 -04:00
Simon Kornblith
011414933f Merge pull request #381 from f-mb/patch-2 
z's bill session mapped to csl's chapter-number
 2013-08-31 18:59:53 -07:00
FMB
e262cfa0d5 z's bill session mapped to csl's chapter-number 
Following : 59e31879fa (commitcomment-3989222)
 2013-08-31 21:59:19 +02:00
Simon Kornblith
59e31879fa Merge pull request #380 from f-mb/patch-1 
Update Zotero-to-CSL mapping for legal entries (statute and bill)
 2013-08-31 11:32:27 -07:00
FMB
0876d52b2c Update Zotero-to-CSL mapping for legal entries (statute and bill) 2013-08-31 20:17:47 +02:00
Dan Stillman
4d4d074ad9 Fix saving advanced search with no name 
Addresses #379
 2013-08-31 04:58:16 -04:00
Dan Stillman
94233108ae Fix saving advanced search 
Fixes #379
 2013-08-31 04:47:39 -04:00
Simon Kornblith
2f275a187c Fix path for translators/styles directories in symlinked dev Standalone build 2013-08-29 11:46:30 -04:00
Simon Kornblith
a5bc68bc17 Fix updating translators and styles from unpacked build 2013-08-28 22:06:28 -04:00
Dan Stillman
5a6e8cb65b Fix secondary function name 2013-08-27 17:13:50 -04:00
Simon Kornblith
ba32544c87 Don't call done handler multiple times on import 
Broken by ff0f649a4d
 2013-08-27 16:01:40 -04:00
Dan Stillman
ce62e7f29b Fix "Invalid sync state '4'" error 2013-08-27 14:26:29 -04:00
Dan Stillman
976696772d Use SQLite.jsm from Fx24 to fix hang in Fx25+ 2013-08-22 13:08:35 -04:00
Dan Stillman
5d42f06707 Add Zotero.File.deleteIfExists(path) and iterateDirectory(path, gen) 2013-08-21 01:05:04 -04:00
Dan Stillman
fae742c94e Remove errant letter 2013-08-21 01:03:10 -04:00
Dan Stillman
b13b46c641 Use consistent style for promises 2013-08-20 16:55:01 -04:00
Dan Stillman
93411a3dac Fix incorrect variables 2013-08-20 16:52:53 -04:00
Dan Stillman
74c679e6d2 Remove non-OS.File storage code, now that last mtime works on Win in Fx24 2013-08-20 12:54:36 -04:00
Dan Stillman
ccc18dd41e Return the promise in Zotero.Translators.loadFromDisk() 2013-08-20 12:43:39 -04:00
Dan Stillman
c1211b0357 Correct variable name 2013-08-20 12:43:09 -04:00
Dan Stillman
8fe02d8b71 Handle input streams and other sources in Zotero.File.getContentsAsync() 2013-08-20 12:42:07 -04:00
Dan Stillman
1be8cf743e Merge pull request #375 from gracile-fr/4.0 
4.0 - Localization
 2013-08-18 00:54:52 -07:00
Dan Stillman
89c5690899 Revert q.js change that broke Q.async(function() { var x = yield y }); 2013-08-18 03:29:39 -04:00
Simon Kornblith
0c431e07ef Fix unnecessary reloading of session data 
See https://forums.zotero.org/discussion/30740?page=1#Item_16
 2013-08-17 17:43:39 -04:00
Simon Kornblith
0490886f28 Merge branch 'async-translators' 2013-08-17 03:47:20 -04:00
Simon Kornblith
526441c3ca Make translator loading asynchronous 
Other changes:
- Factored out Zotero.Translators from Zotero.Translator. The latter
  should be usable in the bookmarklet and connectors without changes.
- configOptions, displayOptions, and hiddenPrefs no longer copy on
  read. I don't think this actually affects any existing code.
- Zotero.Translate._loadTranslator() now returns a promise
 2013-08-17 03:15:43 -04:00
Simon Kornblith
efc4455476 Fix connector server changes for async getTranslators() 2013-08-17 01:23:50 -04:00
Simon Kornblith
f397b0e3d1 Fix Zotero.Translator.save() 2013-08-17 01:18:48 -04:00
Simon Kornblith
8b13d473c7 Import OS.File into Zotero global scope 2013-08-17 01:17:39 -04:00
Simon Kornblith
67e5388598 Fix getTranslatorObject() 2013-08-17 01:11:10 -04:00
Simon Kornblith
b16bfc80e1 Update mimeTypeHandler for asynchronous getTranslators 2013-08-17 00:32:50 -04:00
Simon Kornblith
f58a5ed298 Fix returning translators from Zotero.Translate.getTranslators() 2013-08-17 00:32:29 -04:00
Dan Stillman
4384a8ecc2 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/xpcom/schema.js
 2013-08-16 18:16:59 -04:00
Dan Stillman
2d7d72fb2a Upgrade Q, and change allResolved() to allSettled() 
Not fully tested
 2013-08-16 18:15:00 -04:00
Simon Kornblith
ba0c33545f More typos 2013-08-16 17:56:10 -04:00
Simon Kornblith
70f04c3d8b Fix typos (thanks @aurimasv) 2013-08-16 17:53:36 -04:00
Dan Stillman
8e2de92ca8 Fix the Quick Copy site editor window 2013-08-16 16:28:23 -04:00
Dan Stillman
e85eaf218a Update quickCopy.js and preferences_export.js for async getTranslators() 2013-08-16 16:27:17 -04:00
Simon Kornblith
540a54515e Async Zotero.Translators.get* and Zotero.Translate.getTranslators 
This mostly works, but there is still much to be done:

- getTranslators() calls in preferences_export.js and quickCopy.js need
  to be made asynchronous
- getTranslators() calls in mimeTypeHandler.js need to be made
  asynchronous. This looks hard, since there is a synchronous Mozilla
  API involved
- I need to test lookup, the connector server, and export more to make
  sure that they actually work
- This API needs to be implemented for the connector and bookmarklet
- Translators should be read off the disk using async IO
 2013-08-16 13:48:59 -04:00
Dan Stillman
81e94b4475 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/xpcom/schema.js
 2013-08-15 23:32:32 -04:00
Dan Stillman
5040fba8bb Use async DB for Zotero.Translators.init() 
Zotero.Translators.init() now returns a promise. This will temporarily break
all the Zotero.Translators.get* calls.
 2013-08-15 23:21:57 -04:00
Dan Stillman
a901b47d87 Use async file access for saving translators and styles 2013-08-15 22:30:33 -04:00
Dan Stillman
28ca0a3599 Fix DB initialization with async DB access 
Also fix the initial repository check to trigger after initialization is
complete instead of waiting
 2013-08-15 17:35:16 -04:00
gracile-fr
f3137099bc Localize et al. in the middle pane 
(Heromyth's PR #358, #360, #361)
 2013-08-15 23:15:02 +02:00
gracile-fr
723e8a4e30 Localize Ctrl/Cmd-Shift in Prefs 2013-08-15 22:53:56 +02:00
gracile-fr
355b1fbc57 Localize Ctrl/Cmd-Shift in Prefs 2013-08-15 22:45:04 +02:00