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

5018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Kornblith
cc1ab112f6 Don't show an error when canceling integration preferences dialog 2012-07-20 15:31:32 -04:00
Simon Kornblith
c39a489ca9 Fix deleting citations if dialog is cancelled 2012-07-20 13:37:03 -04:00
Simon Kornblith
7ebc59ee2e Switch csl checkout back to master 2012-07-19 13:34:45 -04:00
Simon Kornblith
9159e1c635 Merge branch '3.0' 2012-07-18 15:04:22 -04:00
Simon Kornblith
afef6bc5a7 Fix or strings in IE 2012-07-18 15:03:52 -04:00
Simon Kornblith
54fd18cce3 Fix for strings in IE 2012-07-18 14:56:37 -04:00
Simon Kornblith
263c54d09b Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/locale/csl
 2012-07-17 18:40:46 -04:00
Simon Kornblith
ad4eccc54d Don't error on translation via server 2012-07-17 18:39:23 -04:00
Simon Kornblith
004e6bbd0a Restore CSL locales checkout to 1.0.1 branch (switched to master by ec391d9346) 2012-07-17 14:01:01 -04:00
Simon Kornblith
06a7b1438f Fix operations that remove field codes 2012-07-16 21:56:31 -04:00
Simon Kornblith
d550ac92b4 Q-ize integration.js 
Adds a new function, Zotero.promiseGenerator, that returns a promise that is fulfilled by the last thing yielded by a generator, or rejected with an error.
 2012-07-16 21:50:14 -04:00
Simon Kornblith
8bc56fdeb1 Fix typo 2012-07-16 14:44:30 -04:00
Simon Kornblith
755db116cc Fix typo 2012-07-16 14:43:33 -04:00
Simon Kornblith
910f698ea2 Alter semantics of Zotero.Exception.Alert() so that toString() returns the cause if there is one 2012-07-15 04:14:24 -04:00
Simon Kornblith
de2d1669fe Restructure and comment cite.js 2012-07-14 22:26:29 -04:00
Simon Kornblith
0deb2573cc Kill translate.js code that was only necessary because of E4X limitations 2012-07-14 19:00:35 -04:00
Simon Kornblith
136e7879c8 Kill E4X in QuickCopy 2012-07-14 18:56:36 -04:00
Simon Kornblith
14d669c00a Kill zoteroconf remnants that used E4X 2012-07-14 18:28:12 -04:00
Simon Kornblith
ed49b867ac Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/locale/csl
 2012-07-14 16:43:28 -04:00
Simon Kornblith
d27b0654e8 Fix Zotero.ItemFields.getFieldIDFromTypeAndBase in connector 2012-07-14 16:42:14 -04:00
Simon Kornblith
0766588241 Closes https://www.zotero.org/trac/ticket/1867, remove Zotero.Hash 2012-07-13 00:06:49 -04:00
Simon Kornblith
ec391d9346 Fix CSL checkout 2012-07-12 12:09:19 -04:00
Simon Kornblith
28c19b54fb Actually fix spacing 2012-07-12 12:09:03 -04:00
Simon Kornblith
e0995a8032 Fix spacing 2012-07-12 12:03:06 -04:00
Simon Kornblith
8c4e2f0d49 Fix data mismatch false positives 2012-07-12 10:01:59 -04:00
Simon Kornblith
b5e4334df5 Ignore whitespace differences in test results, and provide more readable output upon data mismatch 2012-07-11 21:49:46 -04:00
Simon Kornblith
f3ca563f9b Add license to csl-validator.js 2012-07-10 20:00:16 -04:00
Simon Kornblith
dae3672318 Add RNV to about box 2012-07-10 19:48:37 -04:00
Simon Kornblith
a35461e2fc Rename q.jsm to q.js, and use a version of q that's closer to the original and allows use in script tags as well 2012-07-10 15:27:38 -04:00
Simon Kornblith
06825c4767 Validate CSL styles on installation, and restructure Zotero.Styles.install() to use Q. 
Closes https://www.zotero.org/trac/ticket/1681, automatic CSL validation
 2012-07-10 02:46:57 -04:00
Simon Kornblith
bf4c5c1158 Zotero.Exception.Alert when an alert title is specified 2012-07-10 02:46:24 -04:00
Simon Kornblith
de6a776e88 Modify integration.js to use Zotero.Exception.UserCancelled 2012-07-10 02:36:56 -04:00
Simon Kornblith
53bcccd9e7 Add Zotero.HTTP.promise(), a replacement for Zotero.HTTP.doGet/doPost/doHead/doOptions that returns a promise. 
Zotero.HTTP.promise() can potentially reject its promise with two new exceptions. Zotero.HTTP.UnexpectedStatusException is thrown if the status code is not 2XX, and Zotero.HTTP.BrowserOfflineException is thrown if the browser is offline.
 2012-07-10 02:35:00 -04:00
Simon Kornblith
ede39740c7 Add Zotero.File.getContentsAsync() and Zotero.File.putContentsAsync(), asynchronous versions of Zotero.File.getContents() and Zotero.File.putContents() that return Q promises. 
Also make Zotero.File.getContents() slightly more efficient by increasing the blockSize.
 2012-07-10 02:29:16 -04:00
Simon Kornblith
418a170f2b Add Zotero.Exception.Alert and Zotero.Exception.UserCancelled 
Zotero.Exception.Alert is intended for situations in which an error has an associated string that should be displayed in a dialog when the error takes place.

Zotero.Exception.UserCancelled is intended for situations where the user cancelled an action, and the cancellation should propagate.
 2012-07-10 02:26:55 -04:00
Simon Kornblith
34a2239fa1 Update q from upstream 2012-07-09 21:01:29 -04:00
Simon Kornblith
8ad7367cff CSL JSON improvements: 
- Fix export of literal names
- Fix import of dates specified with date-parts
 2012-07-08 22:01:52 -04:00
Simon Kornblith
48a8fa352b Use "Zotero-Bookmarklet" header instead of "X-Zotero-Bookmarklet" 2012-07-08 18:33:50 -04:00
Simon Kornblith
471af0c8ab Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/translation/translate_firefox.js
	chrome/content/zotero/xpcom/translation/translate_item.js
 2012-07-08 13:15:27 -04:00
Simon Kornblith
b13d066062 Fix "TypeError: invalid 'in' operand arg" error introduced by d02fe6d9ab (thanks @adam3smith) 2012-07-08 13:04:09 -04:00
Simon Kornblith
f07a42a7ec If document data is corrupted, just show a new Document Preferences window 2012-07-08 11:19:41 -04:00
Simon Kornblith
d2dcf2bbc7 LibreOffice does not support saving custom properties to docx, and corrupts properties read from docx, so change message 2012-07-08 11:00:11 -04:00
Simon Kornblith
325c78d1d2 Merge pull request #142 from sss/handle-malformed-uri-sequence-in-getFileNameFromURL 
Use hex-encoded MD5 of fileBaseName if it is in malformed URI sequence.
 2012-07-05 16:49:21 -07:00
Simon Kornblith
ef25740510 Use the same rules for creating links and snapshots, regardless of whether attachments can be saved to the current library 2012-07-05 18:12:00 -04:00
Simon Kornblith
2d475522ad Fix saving to collections 2012-07-05 17:54:38 -04:00
Simon Kornblith
723213f11f Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/translation/translate_firefox.js
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
 2012-07-04 18:24:17 -04:00
Simon Kornblith
d02fe6d9ab Include speed of Fx5DOMWrapper 2012-07-04 18:22:45 -04:00
SASAKI Suguru
37b65d70f8 Use hex-encoded MD5 of fileBaseName if it is in malformed URI sequence. 
If the final component of URI can't be decoded with
decodeURIComponent(), Zotero fails to capture a web page,
because Zotero.Attachments._getFileNameFromURL() fails
with 'malformed URI sequence' error.

If we got 'malformed URI sequence' error,
try hex-encoded MD5 of URI's basename instead.

Signed-off-by: SASAKI Suguru <sss.sonik@gmail.com>
 2012-07-04 19:50:48 +09:00
Dan Stillman
6586d30944 Fix repotime, once more 2012-07-03 23:13:06 -04:00
Dan Stillman
4226f8e1dd Update repotime and submodules 2012-07-03 23:09:24 -04:00