Commit graph

4542 commits

Author SHA1 Message Date
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
Simon Kornblith
7b8d8023f2 Don't clear newIndices. This might fix some errors? But I don't see how they would occur anyway unless another error had already occurred 2012-02-07 18:09:49 -05:00
Dan Stillman
dd46e267ee Fix "libraryID, name, type are not unique" tag sync error
Ported from server
2012-02-07 05:51:33 -05:00
Simon Kornblith
438e0e3128 Defer missing item warning until after QuickFormat closes 2012-02-06 22:46:20 -05:00
Simon Kornblith
1c28a23aa6 Wait to load all citations out of document before showing QuickFormat dialog if storeReferences is disabled. Otherwise people with missing references apparently get confused. 2012-02-06 19:28:49 -05:00
Dan Stillman
3d58ef557d Remove snapshot/link-from-page options in Standalone 2012-02-06 14:21:56 -05:00
Simon Kornblith
67e6cbfede Fix repaint 2012-02-06 12:44:38 -05:00
Dan Stillman
84fe2728da Replace setAttribute("oncommand", ...) with addEventListener()
For AMO validator
2012-02-06 02:38:53 -05:00
Dan Stillman
c987130323 Tag debugging that actually works 2012-02-06 02:30:31 -05:00
Simon Kornblith
1257b17ef6 Use JS proxies for exposing DOM to sandbox 2012-02-06 01:20:52 -05:00
Simon Kornblith
2ae1b75d62 Update to citeproc-js 1.0.277 and switch to DOM XML, because Firefox's E4X support gets more unstable as time goes on 2012-02-05 19:37:24 -05:00
Simon Kornblith
a78cd2cf18 Fix WPD leak by loading into a local scope 2012-02-05 18:58:15 -05:00
Simon Kornblith
39c86a791e Use Zotero.debug() instead of dump() in WPD 2012-02-05 18:46:49 -05:00
Simon Kornblith
ff692392c9 Merge branch '3.0' of github.com:zotero/zotero into 3.0 2012-02-05 18:01:24 -05:00
Simon Kornblith
df58d390aa Handle image/vnd.microsoft.icon MIME type for ico 2012-02-05 18:01:05 -05:00
Dan Stillman
dca22a012c Debugging for tag issue 2012-02-05 01:49:08 -05:00
Dan Stillman
ee51b49377 Center save icon guidance panel 2012-02-04 15:20:46 -05:00
Dan Stillman
deeb1b2247 Add MIME type for locate icon 2012-02-03 22:41:20 -05:00
Dan Stillman
8d96cf35bb Fix global assignment 2012-02-03 22:10:58 -05:00
Simon Kornblith
3d002674f1 Avoid wrapping DOMParser when possible 2012-02-03 19:58:11 -05:00
Dan Stillman
f5044ab179 Update download URL 2012-02-02 03:09:26 -05:00
Simon Kornblith
5b8b515b06 Fix potential crash activating integration dialog on Linux 2012-02-02 03:07:26 -05:00
Simon Kornblith
c98570ca4b Fix typo 2012-02-02 02:18:56 -05:00
Dan Stillman
48a09eaf37 Remove styles update script (included accidentally in 3.0) 2012-02-02 02:14:24 -05:00
Simon Kornblith
2624dcaa1e Merge branch '3.0' of github.com:zotero/zotero into 3.0 2012-02-02 01:08:49 -05:00
Simon Kornblith
d4552a8c6c Tweak toolbar UI 2012-02-01 22:23:07 -05:00
Simon Kornblith
9e50234368 Use white tag selector background 2012-02-01 20:47:01 -05:00
Simon Kornblith
774f91f092 Fix ugly groupbox 2012-02-01 20:45:55 -05:00
Dan Stillman
c9476bbd5d Merge locales 2012-02-01 20:11:54 -05:00
Simon Kornblith
d082d074ee Don't use Win 7 theme on Win XP 2012-02-01 20:05:28 -05:00
Simon Kornblith
ddad4a6acd Undo win-specific style tweak 2012-02-01 19:42:46 -05:00
Simon Kornblith
8452deb300 Make QuickFormat page number handling more reliable 2012-02-01 19:39:34 -05:00
Dan Stillman
fb140c3ff4 Update zotero.js version 2012-02-01 19:33:25 -05:00
Dan Stillman
5b021a8a12 Update versions 2012-02-01 19:32:34 -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
Simon Kornblith
ff406ba827 Merge branch '3.0' of github.com:zotero/zotero into 3.0 2012-02-01 18:23:54 -05:00
Simon Kornblith
29f4dce061 Tiny cosmetic change 2012-02-01 18:21:17 -05:00
Dan Stillman
ebfae117fd Remove "classic" part of QuickFormat first-run guidance 2012-02-01 18:18:38 -05:00
Dan Stillman
3bd1ff7676 Fix broken annotations 2012-02-01 18:15:29 -05:00
Simon Kornblith
48f90cb8b4 Merge remote-tracking branch 'origin/3.0' into 3.0 2012-02-01 17:25:26 -05:00