Commit graph

4548 commits

Author SHA1 Message Date
Simon Kornblith
7a2e402d0d Merge commit '0d0a6f38b28618ab9311d886ba93df84af52ba90'; commit 'c7b4c41aee68c6a63df0bd9746e44087c33d7724' 2012-02-18 13:41:52 -05:00
Simon Kornblith
724cee24ff Fix bustage (@dstillman should make sure that there's nothing else screwed up from the merge) 2012-02-18 13:37:32 -05:00
Simon Kornblith
134c6097c6 Merge pull request #59 from grolimur/patch-1
Update chrome/content/zotero/zoteroPane.xul
2012-02-17 14:47:30 -08:00
grolimur
7e18d0cf8e Update chrome/content/zotero/zoteroPane.xul 2012-02-17 23:20:07 +01:00
Simon Kornblith
c36a2b32b1 Merge branch '3.0' 2012-02-17 14:48:26 -05:00
Simon Kornblith
88edc08e78 Expose XMLSerializer to translators 2012-02-17 14:43:48 -05:00
Simon Kornblith
4aa81bd39f Fix option to force charset 2012-02-17 12:16:06 -05:00
Dan Stillman
17e9c466d0 Merge branch '3.0' 2012-02-17 04:26:58 -05:00
Dan Stillman
7dea22bd6e Update versions 2012-02-17 01:07:36 -05:00
Simon Kornblith
5cb830d9c6 Update submodules 2012-02-17 00:50:04 -05:00
Dan Stillman
12c51f41d7 Update repotime again 2012-02-17 00:49:29 -05:00
Dan Stillman
444c413868 Update repotime 2012-02-17 00:42:10 -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
Dan Stillman
75dd27bf5b Remove setAttribute('onclick'...) with embedded id for AMO 2012-02-16 19:43:38 -05:00
Simon Kornblith
02d6ca1058 Don't support Firefox 13 to please AMO 2012-02-16 19:22:35 -05:00
Simon Kornblith
6aedc8bff5 Prevent inconsequential error 2012-02-16 16:03:07 -05:00
Simon Kornblith
d94b4683b3 Force ZSA into online mode on startup 2012-02-16 14:42:21 -05:00
Simon Kornblith
1c83646212 Avoid throwing if attempt to catch startup errors somehow fails? 2012-02-16 14:22:50 -05:00
Simon Kornblith
a402350cda Better error handling in addStatement 2012-02-16 13:29:32 -05:00
Simon Kornblith
95fa3bc554 Fix an error spotted in an error report 2012-02-16 07:59:42 -05:00
Simon Kornblith
a47174748e Update to citeproc-js 1.0.285 2012-02-16 07:56:40 -05:00
Simon Kornblith
2296d1f6ac Don't throw if the user types before the window finishes initializing 2012-02-16 07:44:02 -05:00
Simon Kornblith
eeacdc7391 Fix issues saving attachments from another translator 2012-02-16 06:34:34 -05:00
Dan Stillman
10d23e76bf Fix "Please restart undefined" in WebDAV error message
And a little other weirdness
2012-02-16 04:51:30 -05:00
Simon Kornblith
c62c229e6f Don't screw up toolbar styling 2012-02-16 04:17:51 -05:00
Simon Kornblith
54b2916f7e Don't let Firefox hide our toolbars 2012-02-16 04:13:47 -05:00
Simon Kornblith
c99a7d37f0 Zotero toolbar should always be visible 2012-02-16 04:05:12 -05:00
Simon Kornblith
6a68139591 charset is a complex value in newer Fx versions
probably fixes http://forums.zotero.org/discussion/21956/zotero-wont-accept-ris-file/#Item_2
2012-02-16 03:51:26 -05:00
Dan Stillman
bfa7b5b153 Add some storage filename debugging 2012-02-16 03:45:25 -05:00
Simon Kornblith
5d78e3cfe8 Update to citeproc-js 1.0.283 2012-02-16 02:59:02 -05:00
Simon Kornblith
1e5bde6a54 Fix an inconsequential error 2012-02-15 13:07:12 -05:00
Simon Kornblith
da2a8dfdb0 Remove code with no consequences 2012-02-15 03:11:03 -05:00
Simon Kornblith
645bbf92b8 More hacks for pdf.js 2012-02-15 02:43:08 -05:00
Simon Kornblith
9b76f4b5b8 Hack to open PDFs in pdf.js when available 2012-02-14 23:01:44 -05:00
Simon Kornblith
ca994fd22b Prevent accept from being called twice 2012-02-14 22:55:35 -05:00
Simon Kornblith
fb657bf0cf Fix bustage 2012-02-14 15:20:19 -05:00
Simon Kornblith
09813b145d Merge branch '3.0' 2012-02-14 15:00:07 -05:00
Simon Kornblith
65a024e980 Revert "Revert "Potentially fix an issue with LibreOffice when setting a field code for a citation that hasn't changed""
This reverts commit aa6a85051a.

Changed my mind...
2012-02-14 14:05:30 -05:00
Simon Kornblith
aa6a85051a Revert "Potentially fix an issue with LibreOffice when setting a field code for a citation that hasn't changed"
This reverts commit a618d75e5b.

This shouldn't actually fix anything, because the setText() call would only happen if isRich were set to begin with.
2012-02-14 13:55:26 -05:00
Simon Kornblith
a618d75e5b Potentially fix an issue with LibreOffice when setting a field code for a citation that hasn't changed 2012-02-14 13:47:04 -05:00
Simon Kornblith
25e49faa2c Don't break bibliography dialog in RTF Scan 2012-02-14 12:06:26 -05:00
Simon Kornblith
a6f253b46a Knock off beginning rather than end of errors 2012-02-14 00:41:04 -05:00
Dan Stillman
2903fd27ef Update repotime and submodules 2012-02-14 00:01:23 -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
Simon Kornblith
899e881f93 Don't break cookie sandboxing 2012-02-13 21:03:01 -05:00
Simon Kornblith
4c97ee3ce5 Unregister ConsoleListener on Zotero shutdown 2012-02-13 20:50:44 -05:00
Simon Kornblith
ad6e4242a9 Don't break launch on Fx 3.6 2012-02-13 20:47:00 -05:00
Simon Kornblith
6138149e6d Blacklist "trying to re-register CID" error, which is produced by integration plugins because Firefox version detection for XPCOM components is hard 2012-02-13 20:47:00 -05:00