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

5476 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Stillman
cc39ee8144 Show the startup error in the alert 2013-02-27 04:50:51 -05:00
Simon Kornblith
41e32647c7 Merge pull request #258 from gracile-fr/3.0-access-key 
Fix strange accesskeys in Standalone ("Print" & "Support and Documentation")
 2013-02-26 17:37:42 -08:00
Dan Stillman
25563d2e04 Merge branch '3.0' into 3.1 2013-02-25 12:49:26 -05:00
Dan Stillman
f92ed125b6 Merge branch '3.0' into 3.1 
Conflicts:
	chrome/content/zotero/tinymce/note.html
	chrome/content/zotero/tinymce/noteview.html
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
 2013-02-25 12:46:43 -05:00
Dan Stillman
07d94f0fd0 Merge pull request #254 from aurimasv/duplicates 
Duplicate detection tweaks (take 2)
 2013-02-24 16:58:44 -08:00
aurimasv
53322e6ea0 Duplicate detection tweaks (take 2) 2013-02-24 05:48:11 -06:00
Simon Kornblith
fdf1c35114 Merge pull request #253 from simonster/abbreviations 
Support journal abbreviations
 2013-02-24 02:58:47 -08:00
Simon Kornblith
4d2cee7824 Support journal abbreviations 
Currently disabled by default
 2013-02-24 05:57:28 -05:00
Dan Stillman
475b290600 Revert "Merge pull request #252 from aurimasv/patch-1" 
This reverts commit d2e42bda29, reversing
changes made to 8f263d0fd9.
 2013-02-24 03:39:14 -05:00
Dan Stillman
d2e42bda29 Merge pull request #252 from aurimasv/patch-1 
Tweaks to duplicate detection
 2013-02-24 00:28:43 -08:00
Aurimas Vinckevicius
42f9aaa8a1 Tweaks to duplicate detection 2013-02-24 02:17:49 -06:00
Dan Stillman
e4afbbfcea Unprefix some CSS properties 2013-02-22 18:48:59 -05:00
Dan Stillman
937c0a3a3a Fix error in in Error Conosle when clicking on some items 2013-02-22 18:41:49 -05:00
Dan Stillman
ab1d7a0f25 Merge branch 'relative_paths' into 3.1 
Closes #51
 2013-02-21 06:25:46 -05:00
Dan Stillman
d68d510547 Move relative paths pref code into its own object 2013-02-21 06:24:46 -05:00
Dan Stillman
ed94d84a93 Code style/consistency updates for relative path changes 2013-02-21 06:24:46 -05:00
Dan Stillman
27a2a9c1f7 More relative path changes 
- If attachment exists at same relative path in new base directory,
  leave it alone so that it continues to work.
- If attachment doesn't exist in new base directory, revert it to an
  absolute path.
- If new base directory is an ancestor or descendant of the previous
  base directory, adjust relative paths below the new directory so that
  they keep working.
- More dialog changes
- Select current base directory in file picker when changing directory
- Always use .persistentDescriptor instead of initWithPath(), though it
  probably doesn't matter, and wrap in try/catch in case the old setting
  is broken in some way.
- New function Zotero.File.directoryContains(dir, file), since
  nsIFile.contains() isn't recursive
- Don't use a private Zotero.Item property from outside to force path changes.
 2013-02-21 06:24:46 -05:00
Dan Stillman
f1eb356c19 Relative path support changes 
- Changed placeholder to just "attachments:" for consistency with "storage:"
- Reworked dialog text
- Use a fancier (and undocumented) filefield XUL element for path
- A few small code tweaks
 2013-02-21 06:24:46 -05:00
Dan Stillman
69cb928d6c Move zotero.org version header pref to Advanced 
Translator updates and broken translator reporting both make automatic
requests to zotero.org, but the version pref is just adding a header
with the Zotero version on existing requests.
 2013-02-21 06:24:46 -05:00
Dan Stillman
7bc19c0cd3 Separate "Advanced" prefpane into "General" and "Files and Folders" 2013-02-21 06:24:46 -05:00
Will S
b224c5cf66 Relative path support for linked files 2013-02-21 06:24:46 -05:00
Dan Stillman
d4771c5f0d Focus preferences window if already showing 
Previously, if the prefwindow was behind another window, nothing would
happen when opening the preferences.
 2013-02-19 16:27:16 -05:00
Dan Stillman
6e9167aef1 Fix cancel button in WebDAV verification 2013-02-19 06:10:57 -05:00
Dan Stillman
6c28e61032 More file sync fixes 2013-02-19 05:55:42 -05:00
Dan Stillman
918cb2ef1b Fix focusing of WebDAV password field on verification auth failure 2013-02-19 05:01:37 -05:00
Dan Stillman
8f263d0fd9 Update submodules and repotime 2013-02-18 23:53:40 -05:00
Dan Stillman
dba00c7cea Don't Base64-encode filenames in ZIP files 
Existing encoded filenames will still be read correctly
 2013-02-18 23:47:49 -05:00
Dan Stillman
80e7f1c6c1 Various file sync fixes 2013-02-18 22:41:44 -05:00
Dan Stillman
bc800ddc30 Fix WebDAV verification feedback 2013-02-18 22:41:44 -05:00
Simon Kornblith
d14c3fcc92 Avoid importing Q into page scope 2013-02-18 21:40:36 -05:00
Simon Kornblith
ab2cbb0808 Avoid some unnecessary citation updates 2013-02-18 17:21:06 -05:00
Simon Kornblith
6d095b5025 Revert "Load as JS 1.8, to avoid throwing on "for each" for now" 
This reverts commit b938ce5fdd.

Not necessary since Mozilla bug 830665 is fixed
 2013-02-18 16:16:18 -05:00
Simon Kornblith
d1225c44f7 Revert "Add type="application/javascript;version=1.8" to all JS script tags (for now)" 
This reverts commit 35b1c16858.

Not necessary since Mozilla bug 830665 is fixed
 2013-02-18 16:15:44 -05:00
Simon Kornblith
6b2bbf80e1 Fix things so that they (hopefully) don't break under latest Q 2013-02-18 16:06:31 -05:00
Dan Stillman
ee0a20acf8 Change minVersion to Firefox 17 
We need at least Firefox 12, and no one should really be using anything
below Fx17 ESR.
 2013-02-18 16:04:31 -05:00
Dan Stillman
8f5145f555 Version bump 2013-02-18 05:02:25 -05:00
Dan Stillman
82a8d9e2ae Fix items list freezing in some situations 2013-02-18 04:59:16 -05:00
Dan Stillman
81f67d0ef9 Fix Firefox charset warning displaying note editor 2013-02-18 03:50:24 -05:00
aurimasv
63b9c9fd36 And also don't leave behind unnecessary properties. 2013-02-18 01:47:45 -06:00
aurimasv
db8b8a9662 Do not overwrite set translators 2013-02-18 01:42:08 -06:00
Dan Stillman
ccbccef597 Update versions 2013-02-18 02:37:03 -05:00
Dan Stillman
51365924a3 Accept HTTP headers in Zotero.HTTP.promise() 'options' object 2013-02-18 02:33:13 -05:00
Dan Stillman
1575cfa84a Update Q library 2013-02-18 02:33:12 -05:00
aurimasv
72d3b8b711 Set this.translator for "detect" calls so that parentTranslator is set correctly 2013-02-18 00:16:44 -06:00
Simon Kornblith
e63364c788 Merge branch '3.0' 2013-02-18 01:03:15 -05:00
Simon Kornblith
376db8d9f0 Ensure that we treat 403 as a failure code 2013-02-18 01:02:54 -05:00
Simon Kornblith
755f2bf6f9 Set reasonable min-width and min-height for Standalone 2013-02-17 16:44:56 -05:00
gracile-fr
f110e3fba2 Fix strange accesskeys in Standalone "(Print" & "Support and Documentation") 2013-02-16 22:33:22 +01:00
Dan Stillman
ee16d96f92 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/preferences/preferences.xul
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/locale/gl-ES/zotero/zotero.dtd
	chrome/locale/gl-ES/zotero/zotero.properties
	chrome/locale/zh-CN/zotero/zotero.dtd
	chrome/locale/zh-CN/zotero/zotero.properties
	install.rdf
	update.rdf
 2013-02-16 05:07:59 -05:00
Dan Stillman
eb93c421e5 Merge pull request #246 from aurimasv/webdav-pref 
Store username and url inside correct preference keys
 2013-02-10 01:56:09 -08:00