Dan Stillman
|
09bd70230f
|
Update translators and repotime
|
2013-03-26 13:36:40 -04:00 |
|
Dan Stillman
|
f5d33a3a0c
|
Update submodules and versions
|
2013-03-22 02:34:12 -04:00 |
|
Dan Stillman
|
83cd3c49b0
|
Update submodules
|
2013-03-20 22:55:41 -04:00 |
|
Dan Stillman
|
e68f87fc83
|
Update translators and repotime
|
2013-03-14 02:42:01 -04:00 |
|
Dan Stillman
|
f92ed125b6
|
Merge branch '3.0' into 3.1
Conflicts:
chrome/content/zotero/tinymce/note.html
chrome/content/zotero/tinymce/noteview.html
chrome/content/zotero/xpcom/zotero.js
install.rdf
update.rdf
|
2013-02-25 12:46:43 -05:00 |
|
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
|
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
|
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
|
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
|
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 |
|