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

251 commits

Author SHA1 Message Date
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