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

5134 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Stillman
d7ce389201 Compatibility updates for TinyMCE 3.5.7 
3.5.7 seems to init before the DOMContentLoaded we were relying on
previously to add the init function gets called, so instead call a
fixed init function from the HTML that we insert before the load
from chrome.
 2012-10-30 04:40:12 -04:00
Dan Stillman
87d90e59d9 Update TinyMCE to 3.5.7 2012-10-30 04:40:12 -04:00
Simon Kornblith
1bc98edba4 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/translation/translate_firefox.js
	install.rdf
	update.rdf
 2012-10-29 18:04:42 -04:00
Simon Kornblith
52f4bd8f67 Fix processDocuments for Fx 17 2012-10-29 18:02:04 -04:00
Simon Kornblith
7d2c4e6b2d Fix DOMParser for Fx 17, and set minVersion to Fx 15 2012-10-29 18:01:23 -04:00
Simon Kornblith
78dd74f391 Remove corruption check, since it's no longer necessary and likely to be wrong 2012-10-29 17:32:51 -04:00
Dan Stillman
ef7a3f0121 Update locales submodule 2012-10-29 17:15:54 -04:00
Simon Kornblith
ce355357ae Remove callback line from merge 2012-10-29 15:55:27 -04:00
Simon Kornblith
1ed47f4823 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/attachments.js
	chrome/content/zotero/xpcom/utilities.js
 2012-10-29 15:54:44 -04:00
Simon Kornblith
d13e7037c3 Fix Zotero.selectItems for Firefox 17 sandboxing changes 2012-10-29 15:52:36 -04:00
Simon Kornblith
66347c2734 Another fixe for https://bugzilla.mozilla.org/show_bug.cgi?id=794602 2012-10-29 15:52:29 -04:00
Simon Kornblith
c6b812f0b1 Fix typo 2012-10-29 15:52:24 -04:00
Simon Kornblith
b41e2368a5 Update for https://bugzilla.mozilla.org/show_bug.cgi?id=794602 2012-10-29 15:52:18 -04:00
Simon Kornblith
a8efc1b874 Fix search translation for Firefox 17 sandboxing changes 2012-10-29 15:51:53 -04:00
aurimasv
e0e4699c3e Fix cleanDOI 
Conflicts:
	chrome/content/zotero/xpcom/utilities.js
 2012-10-29 15:51:14 -04:00
Simon Kornblith
c0823e0b7d Merge pull request #185 from adam3smith/master 
add field mappings corresponding to CSL 1.0.1 release
 2012-10-27 07:24:40 -07:00
Dan Stillman
bb7ee9b436 Enable autocomplete for programmingLanguage 2012-10-25 14:40:22 -04:00
adam3smith
18be5d396a add field mappings corresponding to CSL 1.0.1 release 2012-10-21 19:55:23 -06: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
Simon Kornblith
d18b6ffcf0 Fix Zotero.selectItems for Firefox 17 sandboxing changes 2012-10-10 15:34:35 -04:00
Simon Kornblith
1dd67fe837 Another fixe for https://bugzilla.mozilla.org/show_bug.cgi?id=794602 2012-10-10 15:33:40 -04:00
Simon Kornblith
f339e08894 Fix typo 2012-10-10 15:31:48 -04:00
Simon Kornblith
4535bb5315 Update for https://bugzilla.mozilla.org/show_bug.cgi?id=794602 2012-10-09 18:29:21 -04:00
Simon Kornblith
1ad5b9fd63 Revert sandboxing changes 2012-10-09 18:29:06 -04:00
Simon Kornblith
bdeff96162 Don't skip base fields that are mapped to a field with the same name 2012-10-03 17:54:21 -04:00
Simon Kornblith
dcfdf27c0b Make item-specific fields override base fields when specified 2012-10-03 14:54:34 -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
Simon Kornblith
0c2b8e6016 Merge pull request #171 from aurimasv/cleanDOI 
Fix cleanDOI
 2012-09-23 08:40:36 -07:00
aurimasv
c5061de782 Fix cleanDOI 2012-09-22 18:43:13 -05:00
Dan Stillman
cff1bac7b9 Update CSL locales checkout 2012-09-22 13:45:26 -04:00
Simon Kornblith
c70fd9fa39 Merge pull request #166 from aurimasv/attachments 
Allow relative file attachment import. Fix some bugs in _parsePath.
 2012-09-21 16:51:10 -07:00
Simon Kornblith
df6426af2e Fixes #168, Properly adjust index when skipping empty creators 2012-09-21 19:49:37 -04:00
Simon Kornblith
387e9e4fc0 Merge pull request #169 from aurimasv/connector-proxy 
Fix typo in proxy detection.
 2012-09-21 16:43:47 -07:00
Dan Stillman
a9cb1e75f5 Switch to master branch of CSL locales 2012-09-19 15:02:47 -04:00
Dan Stillman
dee75dd417 Save translator names as ASCII during repo updates as well 
Refs #459, Non-ascii translator names
 2012-09-19 04:19:30 -04:00
Dan Stillman
020eaf2d47 Fix translatorID in filename in ZIP build, hopefully 
Follow-up from d821778

Refs #459, Non-ascii translator names
 2012-09-19 03:37:44 -04:00
Dan Stillman
d821778d24 Use ASCII for translator filenames 
Remove diacritics and then use translatorID for anything that still has
extended characters.

Fixes #459, Non-ascii translator names
 2012-09-19 02:37:18 -04:00
Simon Kornblith
4eccdf724d Fix RDF in Fx >= 17 2012-09-18 11:54:00 -04:00
aurimasv
b700f3ef56 Fix typo in proxy detection. 2012-09-17 01:33:24 -05:00
Simon Kornblith
70fad9730a Fix CSL checkout 2012-09-16 21:55:39 -04:00
Simon Kornblith
4d41398d73 Fixes for https://bugzilla.mozilla.org/show_bug.cgi?id=553102 2012-09-16 21:49:41 -04:00
aurimasv
cffbed31e8 Make protocol decision clearer 2012-09-14 20:09:58 -05:00
aurimasv
b94837d3da Recognize URI protocol based on RFC 3986 specification 2012-09-14 02:21:54 -05:00
aurimasv
d6bd353005 Allow relative file attachment import. Fix some bugs in _parsePath. 2012-09-13 22:51:08 -05:00
Dan Stillman
53449d47a9 Install styles served as application/vnd.citationstyles.style+xml 2012-09-13 14:42:15 -04:00
Simon Kornblith
71db21c605 Fix nonbreaking spaces in citations edited using classic add citation dialog 2012-09-12 14:26:34 -04:00
Dan Stillman
878500a011 Add file sync debugging output from e599a207 to master 2012-09-10 17:24:00 -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
Dan Stillman
e1159b9838 Update submodules, and point CSL locales to 1.0.1 for now 2012-09-10 16:54:41 -04:00
Simon Kornblith
027ea09457 Merge pull request #161 from aurimasv/itemComplete 
Fix bug in item.complete()
 2012-09-09 14:44:07 -07:00