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

324 commits

Author SHA1 Message Date
Simon Kornblith
73f775950d Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/cite.js
 2012-11-08 09:40:18 -05:00
Dan Stillman
698e70fb79 Fix Edit menu label in fr-FR locale 2012-11-06 13:09:37 -05:00
Dan Stillman
6220bc39f5 "Citations"/"Notes" instead of "Citation"/"Note" in right-click dialog 2012-11-06 01:16:03 -05:00
Simon Kornblith
b3237ae5e5 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/http.js
	chrome/content/zotero/xpcom/translation/translate_firefox.js
 2012-11-06 00:50:11 -05:00
Dan Stillman
00e30dea71 Merge non-English locales from Transifex 2012-11-05 22:21:13 -05:00
Dan Stillman
dfd0a7ad83 Add option to skip tags when copying items between libraries 2012-11-02 05:45:26 -04:00
Dan Stillman
3a9483070e Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js
	chrome/content/zotero/xpcom/translation/translate_firefox.js
	chrome/content/zotero/zoteroPane.js
	install.rdf
	update.rdf
 2012-11-01 22:14:08 -04:00
Dan Stillman
079b767974 Closes #44, Allow generating citations via right-click 
Currently generates multi-source citations for multiple items for note
styles, but a list of note citations might be better.

Also, context menu option is unchanged, since it becomes very long if
you add "Citation/Bibliography".
 2012-11-01 21:47:10 -04:00
Simon Kornblith
9ea12d5561 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/translation/translate_item.js
 2012-10-10 17:25:21 -04:00
Dan Stillman
bd75d95da9 Fix "(null)" in Firefox login manager corruption message 
(It turns out this also displays if the user clicks Cancel on a master
password prompt, though.)
 2012-09-26 21:57:40 -04:00
Dan Stillman
c2e116a49a Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/locale/csl
	chrome/content/zotero/xpcom/server_connector.js
	chrome/content/zotero/xpcom/storage.js
 2012-09-10 17:18:08 -04:00
Sebastian Karcher
2f7fb532c8 Update chrome/locale/en-US/zotero/zotero.dtd 
Change label for "Create New Item" button - as per mutual agreement here: http://forums.zotero.org/discussion/17909/create-new-item-from-current-page-should-use-translator/#Item_17
 2012-09-09 12:34:37 -06:00
Simon Kornblith
d9ea6d3647 Add useJournalAbbreviation export option for BibTeX (see https://github.com/zotero/translators/pull/436) 2012-08-16 21:11:21 -04:00
Simon Kornblith
ab4c2f247d Merge branch '3.0' 2012-08-05 19:44:57 -04:00
Simon Kornblith
cd6e78899b Fix "Use profile directory" option to use correct app name 2012-08-01 10:52:00 -04:00
Simon Kornblith
349c19fe4d Merge branch '3.0' 2012-07-21 18:29:04 -04:00
Simon Kornblith
4fd978905c Clarify wording of missing item message as suggested by @adam3smith 2012-07-19 10:53:01 -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
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
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
e682ab729c Merge branch '3.0' 
Conflicts:
	chrome/locale/da-DK/zotero/zotero.dtd
	chrome/locale/ko-KR/zotero/zotero.dtd
	translators
 2012-07-01 11:41:31 -04:00
Dan Stillman
a8a8bc6af0 Merge latest strings from Transifex 2012-06-29 16:25:17 -04:00
gracile-fr
7ee1b1e491 Frank's patch https://github.com/zotero/zotero/issues/132 
Menu item to swap creator first/last names (#132)
 2012-06-14 17:19:30 +02:00
Simon Kornblith
ac19b0490a Merge branch 'no-new-collection-on-import' 2012-06-10 22:39:41 -04:00
Simon Kornblith
d26bb24849 Merge branch 'attachment-progress' 2012-06-10 21:56:15 -04:00
Dan Stillman
f1f4044018 Merge branch '3.0' 2012-06-10 21:50:14 -04:00
Simon Kornblith
3a6669c66f Closes #23, "Saving item..." notification should show the name of the library where item is imported 2012-06-10 16:50:06 -04:00
Simon Kornblith
68365e2297 Allow user to control whether files are imported into a new collection. 
Adds three new preferences controlling whether a new collection is created upon import:
- extensions.zotero.import.createNewCollection.fromFile
	Controls whether a new collection is created by import from cog menu
- extensions.zotero.import.createNewCollection.fromClipboard
	Controls whether a new collection is created by import from clipboard
- extensions.zotero.import.createNewCollection.fromFileOpenHandler
	Controls whether a new collection is created when import is initiated by
	double-clicking a file or by dragging it over Zotero. This preference applies only to
	Zotero Standalone, and is configurable in the dialog that appears asking the user
	to confirm the import.

Closes #19, [papercuts] (26) Clipboard import into an open collection
 2012-06-10 11:05:39 -04:00
Simon Kornblith
4e5d4281f1 Merge branch '3.0' 2012-05-26 18:24:52 -04:00
Dan Stillman
1a76318538 Just focus libraries pane on shortcut key 
Closes #133
 2012-05-25 14:24:08 -04:00
gracile-fr
12a45882fe Localize editorWarning 
(cherry picked from commits f1be6125...f84e6b12)
 2012-05-04 15:33:43 -04:00
Dan Stillman
3132a09966 Merge new English strings 2012-05-03 23:10:47 -04:00
Dan Stillman
d456117ebe Merge branch '3.0' 2012-05-03 17:56:32 -04:00
Dan Stillman
2bbd2be4e7 Use "%S more..." instead of hard-coding space, and make general string 
(cherry picked from commit 49b9c14b8d)
 2012-05-03 17:46:49 -04:00
gracile-fr
4ba9b6a4c0 Localization of strings previously hardcoded. All these strings are related to duplicate detection. 
(cherry picked from commit d6ae1c544d)
 2012-05-03 17:45:15 -04:00
gracile-fr
12fc2eadc0 Localization of strings previously hardcoded in itembox.xml (Move up/down) 
(cherry picked from commit acb7c22f75)
 2012-05-03 17:42:25 -04:00
gracile-fr
0ece4145cd Fixes #111: "Search subcollections" instead of "Search subfolders" in Advanced search. 2012-05-03 17:35:49 -04:00
Dan Stillman
49b9c14b8d Use "%S more..." instead of hard-coding space, and make general string 2012-05-03 17:33:19 -04:00
gracile-fr
7b5c176f8e Fixes #111: "Search subcollections" instead of "Search subfolders" in Advanced search. 2012-05-03 23:06:27 +02:00
gracile-fr
d6ae1c544d Localization of strings previously hardcoded. All these strings are related to duplicate detection. 2012-05-03 22:38:14 +02:00
gracile-fr
acb7c22f75 Localization of strings previously hardcoded in itembox.xml (Move up/down) 2012-05-03 22:16:24 +02:00
Dan Stillman
03072e363d Fix preferences in Thai locale 2012-05-01 03:03:39 -04:00
Dan Stillman
8e5c82a718 Latest translations from Transifex and merged English strings 2012-04-26 19:48:54 -04:00
Simon Kornblith
18d9c6be8c Add print and save options to reports, part 1 2012-04-19 00:12:43 -04:00
gracile-fr
18111dd15d Make additional fields available as columns with a submenu (fixes #84) 2012-03-24 19:39:14 +01:00
Simon Kornblith
947be813ec Merge branch '3.0' 2012-03-20 02:16:43 -04:00
gracile-fr
192162c567 Update chrome/locale/en-US/zotero/zotero.properties 2012-03-13 20:03:42 +01:00
Dan Stillman
daf1899c72 Remove unnecessary ellipsis 2012-03-12 01:43:56 -04:00
gracile-fr
ed0741959d Localize editorWarning 2012-03-08 14:06:01 +01:00
Simon Kornblith
b3f9f5102b Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/overlay.js
	chrome/content/zotero/xpcom/schema.js
 2012-02-28 17:22:34 -05:00
Dan Stillman
fbef301fe0 Add citation/footnote instructions to Quick Copy prefs 2012-02-28 15:28:14 -05:00
Dan Stillman
edd2f99ec9 Correct schema errors without pointing users to DB repair tool 
We can't do anything about actual database corruption, but we can fix
all the other things that the repair tool fixes.
 2012-02-24 12:05:06 -05:00
Simon Kornblith
394ad64091 Address Rintze's comments per http://forums.zotero.org/discussion/21934/ 2012-02-19 23:13:49 -05:00
Simon Kornblith
07028650f0 Closes #48, Additional field in QuickFormat dialog showing the name of the library and providing a link to the item with the following modifications 
- Open in current window if one is already open
- Use a button instead of a label
- Don't show button if citation item is not linked to a Zotero item

This doesn't currently work if the Zotero pane has never been opened in the given window, because ZoteroPane.selectItem() appears to fail in that circumstance. This needs to be fixed.
 2012-02-19 18:37:42 -05:00
Dan Stillman
17e9c466d0 Merge branch '3.0' 2012-02-17 04:26:58 -05:00
Dan Stillman
0ce556d48c Remove extra backslashes 2012-02-16 21:09:52 -05:00
Dan Stillman
cf89e9d23f Update locales from Transifex (and add Khmer) 2012-02-16 21:04:49 -05:00
Simon Kornblith
09813b145d Merge branch '3.0' 2012-02-14 15:00:07 -05:00
Dan Stillman
7629f8b10d Fix a couple backwards '%S' 2012-02-13 22:02:04 -05:00
Dan Stillman
b3fe7b822a Merge locales from Transifex 2012-02-13 21:50:44 -05:00
Dan Stillman
de7467a62c Merge branch '3.0' 2012-02-10 14:10:07 -05:00
Dan Stillman
5c5967166f Fix broken en-US locale file 2012-02-10 04:53:18 -05:00
Dan Stillman
1ce06aae79 Add line about editing citations to QuickFormat guidance panel 2012-02-10 04:47:41 -05:00
Dan Stillman
3a4401a995 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/integration.js
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/content/zotero/xpcom/storage/zfs.js
	install.rdf
	update.rdf
 2012-02-09 02:13:02 -05:00
Dan Stillman
c9476bbd5d Merge locales 2012-02-01 20:11:54 -05:00
Dan Stillman
7ce3bd7060 "Zotero Migration Notification" -> "Existing Zotero Library Found" 2012-02-01 19:28:58 -05:00
Dan Stillman
d3f4bc6d7e Tweak QuickFormat first-run text 2012-02-01 19:17:38 -05:00
Dan Stillman
ebfae117fd Remove "classic" part of QuickFormat first-run guidance 2012-02-01 18:18:38 -05:00
Simon Kornblith
48f90cb8b4 Merge remote-tracking branch 'origin/3.0' into 3.0 2012-02-01 17:25:26 -05:00
Simon Kornblith
46f64523a4 Add first-run guidance to QuickFormat dialog 2012-02-01 17:23:25 -05:00
Dan Stillman
e725eb88b4 "Firefox" -> "Firefox"/"Zotero" as appropriate 2012-02-01 02:35:22 -05:00
Dan Stillman
f4804b66b5 Merge branch '3.0' 2012-01-27 00:24:50 -05:00
Dan Stillman
a4afb67d91 Point directly to 3.0 plugins page from preferences 
Not sure why this is localized, though
 2012-01-25 16:44:48 -05:00
Dan Stillman
ed6666c4d7 Merge locales 2012-01-20 17:52:51 -05:00
Dan Stillman
f272fc6861 Tweak read-only save error message 2012-01-20 17:51:00 -05:00
Dan Stillman
b1cd48a863 Avoid a third "this" in save icon first-run guidance 2012-01-19 21:06:28 -05:00
Dan Stillman
5e2cd44cc8 Remove trailing period 2012-01-18 03:41:29 -05:00
Dan Stillman
eddaa672ef Provide link to cert override docs in Standalone Verify Server 
The button wasn't opening the WebDAV URL within Standalone, and
XULRunner doesn't provide the whitelist interface anyway.

Documentation page still needed
 2012-01-18 03:37:54 -05:00
Dan Stillman
7c4a69b9e1 Merge branch '3.0' 2012-01-17 01:16:47 -05:00
Dan Stillman
d63d24c636 Show access error for translator save attempt to read-only library 
Not sure how this works for connector saves
 2012-01-11 18:12:21 -05:00
Dan Stillman
4767cad19e Merge branch '3.0' 2012-01-10 19:54:09 -05:00
Dan Stillman
7e5ec21781 Fix misspelling in Danish locale 2012-01-05 16:25:20 -05:00
Dan Stillman
9d16cb2fe6 "Use Firefox profile directory" -> "Use profile directory" 2012-01-05 14:58:11 -05:00
Dan Stillman
3ac5a6db09 Merge branch '3.0' 2011-12-22 12:21:32 -05:00
Dan Stillman
4bc5406d34 Merge new English strings 2011-12-20 02:27:34 -05:00
Simon Kornblith
878f70998f Show most recently cited items at the top of QuickFormat. Also, typing "ibid" into QuickFormat now shows a list of the most recently cited items. 2011-12-19 01:36:33 -05:00
Dan Stillman
059460a5d2 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/content/zotero/zoteroPane.js
	chrome/skin/default/zotero/preferences.css
 2011-12-17 16:25:58 -05:00
Dan Stillman
fe97d33e38 Display "Load WebDAV URL" button in Verify Server error 
Allows for easier Standalone cert override (I hope -- not yet tested)
 2011-12-17 16:13:37 -05:00
Dan Stillman
0456e5d3be About pane updates 2011-12-14 17:52:10 -05:00
Simon Kornblith
eeedc49274 Fix quotation marks 2011-12-07 02:31:40 -05:00
Simon Kornblith
3349acc747 Fix description of how to add a locate engine 2011-12-04 14:17:51 -05:00
Dan Stillman
309579719a Remove numChildren localization 2011-11-26 03:45:56 -05:00
Dan Stillman
758216638f On-demand download support 
Can choose to download files "at sync time" or "as needed"

On-demand defaults to on, but remains off for existing users

To-do:

- Handling of local and remote file changes on on-demand download
  (currently if a file exists it isn't downloaded, which means a
  remotely modified file won't be redownloaded in on-demand mode)
- Additional control over file downloading and retention

Other changes:

- Overhauled entire file syncing architecture
- Replaced numAttachments column with Note and Attachment columns with
  dynamic icons to indicate status
- Double-clicking a parent with a missing best attachment and on-demand
  downloading off no longer loads the parent URL
- Bugs
 2011-11-26 03:45:55 -05:00
Dan Stillman
81b6974053 Add more reasonable "Medium" font setting, and shift M/L to L/XL 
Also adjust spacing of radio buttons in General pref pane
 2011-11-17 02:10:10 -05:00
Dan Stillman
edd4fabf2e Move de-DE directory to de (already registered as 'de' in chrome.manifest) 2011-10-31 14:14:29 -04:00
Simon Kornblith
a259a6b8cd First run guidance for creator menu 2011-10-03 06:04:37 +00:00
Simon Kornblith
27b5505661 First run guidance for save icon 2011-10-03 04:44:40 +00:00
Simon Kornblith
3364a533c5 Add "Restore to Library" context menu option 2011-10-02 15:50:54 +00:00
Dan Stillman
e1cc377162 Show Zotero pane progress bar during sync processing 
TODO: limit to large syncs?

This needs a lot of testing.

Also:
- Tweak pumpGenerator() wait level behavior to match Zotero.wait()
- If Zotero is closed in the top-most window, show a popup instead of the pane-covering progress meter, and take an optional icon in Zotero.showZoteroPaneProgressMeter() for use in the popup
- Restore protection against opening Zotero pane when Zotero.locked is set
- Display a nicer error if Zotero.DB.commitTransaction() is called without an active transaction
- Allow text with icons to extend to multiple lines in progressWindow popup
- Automatically use current window if one isn't specified in Zotero.repaint()
 2011-09-21 23:00:20 +00:00
Simon Kornblith
08c8c4dfbd Use asynchronous APIs for collecting fields. This currently has the side effect of breaking the editor. 2011-09-15 07:57:06 +00:00