mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
6217 commits 9 branches 364 tags 296 MiB
Commit graph

6217 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Stillman
1089856622 Closes #397, Support authenticated PAC setups in Standalone 
Trigger a proxy authentication prompt at startup if a PAC file is
installed and one of a few randomly chosen big sites requires a proxy.

This also improves general proxy detection by not making a request
to S3 unless it would actually be proxied.
 2013-10-17 20:03:06 -04:00
aurimasv
3ad2b4924d Fix cleanISSN 2013-10-14 23:51:08 -05:00
Dan Stillman
db43af33ac Fix "req is not defined" error message (which indicates a WebDAV error) 2013-10-12 02:54:28 -04:00
Dan Stillman
e457e5bdfe Show patents by issue date in timeline view 2013-10-06 23:57:40 -04:00
Dan Stillman
df9439f9a2 Don't fail during file upload if file doesn't yet exist 2013-10-06 23:48:49 -04:00
Simon Kornblith
c4158a5339 Fix name on abbreviations list 2013-09-19 23:48:20 -04:00
Simon Kornblith
55fd7edfaf Update abbreviations.json 
Remove overrides for titles we now abbreviate correctly, and don't
delete potential prepositions that are rarely used as such in journal
titles ("hyphen", "midst", "minus", "modulo", outside", "pace", "past",
"plus", "round", "save", "til", "till", "times", "vice", "worth")
 2013-09-19 23:33:38 -04:00
Simon Kornblith
94b50ca697 Abbreviate word pairs (e.g. New York -> N. Y.) 2013-09-19 23:33:07 -04:00
Dan Stillman
5d1efea137 Update maxVersion 2013-09-19 21:54:44 -04:00
Simon Kornblith
28034a5ddc Merge pull request #392 from aurimasv/abbreviations 
Fix abbreviation algorithm
 2013-09-19 18:50:51 -07:00
Aurimas Vinckevicius
84b6d8c5ee If abbreviation is same as key, it's still valid 
See http://forums.zotero.org/discussion/32000/overriding-automatic-abbreviations/
 2013-09-19 14:06:44 -05:00
Aurimas Vinckevicius
b680bcf375 Abbreviate plural forms of words same as singular 2013-09-18 00:47:28 -05:00
Aurimas Vinckevicius
7f7d78603a Use the longest abbreviation possible. 
E.g. Fictional journal "Journal of Annunc Materials" (obviously annunc is not a real word)
Use "annunc-":"annunc." substitution instead of "annu-":"annu." resulting in "J. Annunc Mater." instead of "J. Annu. Mater."
 2013-09-17 22:57:28 -05:00
Aurimas Vinckevicius
a55f9b624e Don't drop last word when abbreviating journal names 2013-09-17 21:52:10 -05:00
Aurimas Vinckevicius
6393c3bfe2 Look for abbreviations for longest possible match first 2013-09-17 21:41:34 -05:00
Florian Martin-Bariteau
38580e2366 Update renamed-styles.json 
Updates from https://github.com/citation-style-language/styles/blob/master/renamed-styles.json
 2013-09-16 20:26:30 -04:00
Dan Stillman
3c653903c5 Merge pull request #390 from f-mb/patch-1 
Update renamed-styles.json
 2013-09-16 17:25:20 -07:00
Florian Martin-Bariteau
cb62bdbb86 Update renamed-styles.json 
Updates from https://github.com/citation-style-language/styles/blob/master/renamed-styles.json
 2013-09-16 20:15:23 +02:00
Dan Stillman
f510bd9d64 Debugging for failed file downloads 2013-09-09 16:47:15 -04:00
Dan Stillman
261c17ff51 Lock cursor on 'move' for collection drag on Windows 2013-09-06 16:02:52 -04:00
Dan Stillman
48a94c6716 Force 'move' action for collection drag 2013-09-06 15:52:59 -04:00
Dan Stillman
d318bca7a4 Allow items to be moved (not copied) between collections w/modifier key 
Cmd on OS X, Shift on Windows/Linux

How do I not get to close a ticket for this?

Unfortunately on Windows it doesn't seem possible to set the cursor
effect to arbitrary states (see note in libraryTreeView.js::
_setDropEffect() for the gory details), so this just uses the default
cursor there. On OS X and Linux the cursor reflects the requested
action.
 2013-09-06 15:30:37 -04:00
Dan Stillman
ea97c3d956 Get rid of Task.spawn in checkForUpdatedFiles(), since no yields are left 2013-09-06 15:23:22 -04:00
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