Commit graph

4632 commits

Author SHA1 Message Date
Simon Kornblith
dc4a448780 Merge branch '3.0' 2012-02-12 18:10:19 -05:00
Simon Kornblith
0a25cdad96 Fix typo 2012-02-12 17:22:25 -05:00
Dan Stillman
9a3f3b7026 Fix for large Z pane min-height 2012-02-12 04:42:02 -05:00
Frank
34e62cad87 Update citeproc-js to version 1.0.279 2012-02-12 13:38:03 +08:00
Simon Kornblith
018f8e3e4e Merge branch '3.0' 2012-02-11 20:49:45 -05:00
Simon Kornblith
959905a061 Use a single load event for scrollbar hack 2012-02-11 20:49:23 -05:00
Simon Kornblith
7a95185b34 Fix scrolling in basicViewer 2012-02-11 20:49:23 -05:00
Simon Kornblith
146d281bfb Use a single load event for scrollbar hack 2012-02-11 18:30:24 -05:00
Simon Kornblith
5470d4bf89 Fix scrolling in basicViewer 2012-02-11 18:23:43 -05:00
Mikko Rönkkö
c7b4c41aee Added a library link to QuickFormat dialog, fix url 2012-02-11 13:19:36 +02:00
Mikko Rönkkö
0d0a6f38b2 Added a library link to QuickFormat dialog 2012-02-11 13:04:14 +02:00
Simon Kornblith
e29c87c77b Merge branch '3.0' 2012-02-11 00:41:24 -05:00
Simon Kornblith
703d18ecb9 Remove antiquated code 2012-02-11 00:39:58 -05:00
Simon Kornblith
ef9040c46d Revert "Remove antiquated code"
This reverts commit d5fc04485b.
2012-02-11 00:38:21 -05:00
Simon Kornblith
d5fc04485b Remove antiquated code 2012-02-11 00:34:05 -05:00
Simon Kornblith
5619555866 Improve our chances of getting attachments from the connector. We attach cookies sent from the connector to attachment downloads, which should get most proxies working, provided that the user is logged in. We also use WeakMaps to keep track of active CookieSandboxes, rather than manually removing them from a list. 2012-02-10 19:14:46 -05:00
Dan Stillman
6a4bcc683e Update repotime 2012-02-10 18:25:50 -05:00
Simon Kornblith
97ed9ccbfe Serialize RDF to string on export 2012-02-10 16:10:10 -05:00
Dan Stillman
6592124ef2 Merge branch '3.0' 2012-02-10 14:11:14 -05:00
Dan Stillman
de7467a62c Merge branch '3.0' 2012-02-10 14:10:07 -05:00
Simon Kornblith
61f9b49ddc Fix getBaseIDFromTypeAndField 2012-02-10 14:08:47 -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
860a1617ea Decrease height of icon when no other add-on bar buttons 2012-02-10 03:32:43 -05:00
Simon Kornblith
db89c65596 More antiquated code cleanup 2012-02-10 01:46:47 -05:00
Simon Kornblith
9d7509ae13 Fix breakage 2012-02-10 01:44:35 -05:00
Simon Kornblith
fd8d0c1e48 Requires Firefox 5 2012-02-10 01:38:42 -05:00
Simon Kornblith
ac5d833117 Remove antiquated code 2012-02-10 01:38:01 -05:00
Dan Stillman
c6d2d823f0 Update version 2012-02-10 01:31:11 -05:00
Dan Stillman
e1532c6837 Restore proper error if datadir is inaccessible 2012-02-10 01:29:34 -05:00
Dan Stillman
4ef7c94374 Switch to regular add-on bar button
Can be moved/removed via Customize as well as via Zotero prefs. The icon
can be in the toolbar or in the add-on bar, but not both, because
it's now the same button with different styling depending on where it is.

If the icon does not exist in the UI and the pref is set to show (as it
is by default), the icon is added to the add-on bar and the add-on bar is
persisted open. This has the effect of showing the icon/bar on
first run. If the icon is removed or the bar is hidden, they remain that
way.
2012-02-10 01:20:00 -05:00
Dan Stillman
fe29fb7985 Fix newlines in preferences file 2012-02-10 00:49:03 -05:00
Simon Kornblith
1feb5c5fc2 Translators that specify an error handler for a child translator shouldn't throw on error 2012-02-09 14:01:31 -05:00
Dan Stillman
8fd6f7efb2 Lines that mention "pre-1.0b2 installs" can probably be removed 2012-02-09 04:03:05 -05:00
Simon Kornblith
9d0e8c258e Remove debug code 2012-02-09 04:01:01 -05:00
Simon Kornblith
8d48b1de54 Drop a lot of Fx 3.6-specific code 2012-02-09 03:56:30 -05:00
Simon Kornblith
0f6b151ea4 Remove Fx 3.6 and 4.0-specific code 2012-02-09 03:45:36 -05:00
Simon Kornblith
4fc7600387 Drop http server that did nothing but show an error for Zotero 1.0 users who had upgraded Zotero without upgrading the Word plugin 2012-02-09 03:45:36 -05:00
Frank
f74df0f7fd Upgrade citeproc-js to version 1.0.278 2012-02-09 15:27:05 +08:00
Dan Stillman
65cfb905de Update styles 2012-02-09 02:18:36 -05:00
Dan Stillman
6c5e155ba7 Merge branch '3.0' 2012-02-09 02:18:15 -05:00
Dan Stillman
c30ddf63cc Update translators submodule 2012-02-09 02:15:42 -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
Simon Kornblith
564d27f51c Allow add-ons to be updated via addons.mozilla.org in Zotero Standalone, part 1 2012-02-08 23:06:50 -05:00
Dan Stillman
5f5bc9568c Update versions 2012-02-08 17:22:23 -05:00
Dan Stillman
66f51db3c8 Don't use "application/vnd.oasis.opendocument.text" for all ZIP files
This bug dates to 2008. We'll correct existing files in a client update
and on the server.
2012-02-08 17:13:31 -05:00
Simon Kornblith
6a3ce4292e Don't display an error if adding a citation is cancelled 2012-02-08 16:40:02 -05:00
Simon Kornblith
0daf51e05c Warn before letting the user change a citation that has been edited 2012-02-07 18:27:58 -05:00
Simon Kornblith
fc5e8be8c0 Don't break citation ID regeneration 2012-02-07 18:22:42 -05:00
Simon Kornblith
6fe3ef27d4 Screw with the way we handle citation IDs instead of indices, since that's closer to the root of the problem 2012-02-07 18:15:28 -05:00