Dan Stillman
|
ee16d96f92
|
Merge branch '3.0'
Conflicts:
chrome/content/zotero/preferences/preferences.xul
chrome/content/zotero/xpcom/storage/webdav.js
chrome/locale/gl-ES/zotero/zotero.dtd
chrome/locale/gl-ES/zotero/zotero.properties
chrome/locale/zh-CN/zotero/zotero.dtd
chrome/locale/zh-CN/zotero/zotero.properties
install.rdf
update.rdf
|
2013-02-16 05:07:59 -05:00 |
|
Dan Stillman
|
0b89ccadf9
|
Update Q library
|
2012-12-11 03:30:47 -05:00 |
|
Dan Stillman
|
4caae896cf
|
Merge branch '3.0'
Conflicts:
chrome/content/zotero/xpcom/attachments.js
chrome/content/zotero/xpcom/translation/translate_item.js
install.rdf
update.rdf
|
2012-11-23 01:49:32 -05:00 |
|
Dan Stillman
|
ac195d2a5e
|
Merge branch '3.0'
Conflicts:
chrome/content/zotero/integration/quickFormat.js
chrome/content/zotero/xpcom/attachments.js
chrome/content/zotero/xpcom/utilities.js
install.rdf
styles
update.rdf
|
2012-11-20 03:22:49 -05:00 |
|
Simon Kornblith
|
585e5981f6
|
Merge branch '3.0'
Conflicts:
chrome/content/zotero/xpcom/storage/webdav.js
chrome/content/zotero/xpcom/storage/zfs.js
|
2012-11-12 16:04:39 -05:00 |
|
Simon Kornblith
|
bd367dcd85
|
Merge branch '3.0'
|
2012-11-11 17:15:30 -05:00 |
|
Simon Kornblith
|
73f775950d
|
Merge branch '3.0'
Conflicts:
chrome/content/zotero/xpcom/cite.js
|
2012-11-08 09:40:18 -05:00 |
|
Simon Kornblith
|
bdfbfc10b2
|
Use methodjit...
|
2012-07-30 02:37:39 -04:00 |
|
Simon Kornblith
|
f3ca563f9b
|
Add license to csl-validator.js
|
2012-07-10 20:00:16 -04:00 |
|
Simon Kornblith
|
a35461e2fc
|
Rename q.jsm to q.js, and use a version of q that's closer to the original and allows use in script tags as well
|
2012-07-10 15:27:38 -04:00 |
|
Simon Kornblith
|
06825c4767
|
Validate CSL styles on installation, and restructure Zotero.Styles.install() to use Q.
Closes https://www.zotero.org/trac/ticket/1681, automatic CSL validation
|
2012-07-10 02:46:57 -04:00 |
|
Simon Kornblith
|
34a2239fa1
|
Update q from upstream
|
2012-07-09 21:01:29 -04:00 |
|
Simon Kornblith
|
723213f11f
|
Merge branch '3.0'
Conflicts:
chrome/content/zotero/xpcom/translation/translate_firefox.js
chrome/content/zotero/xpcom/zotero.js
install.rdf
update.rdf
|
2012-07-04 18:24:17 -04:00 |
|
Simon Kornblith
|
c4cb783317
|
Add q promise library (as jsm)
|
2012-06-03 00:43:42 -04:00 |
|
Simon Kornblith
|
4e5d4281f1
|
Merge branch '3.0'
|
2012-05-26 18:24:52 -04:00 |
|
Dan Stillman
|
d456117ebe
|
Merge branch '3.0'
|
2012-05-03 17:56:32 -04:00 |
|
Dan Stillman
|
17e9c466d0
|
Merge branch '3.0'
|
2012-02-17 04:26:58 -05:00 |
|
Simon Kornblith
|
09813b145d
|
Merge branch '3.0'
|
2012-02-14 15:00:07 -05:00 |
|
Simon Kornblith
|
e29c87c77b
|
Merge branch '3.0'
|
2012-02-11 00:41:24 -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
|
be38be66f7
|
Don't unpack xpi
|
2012-01-29 15:15:23 -05:00 |
|