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

162 commits

Author SHA1 Message Date
Dan Stillman
99dd1c0697 Merge branch '4.0' 
Since modal windows (e.g., the Create Bib window and the Quick Copy site
editor window) can't use yield, style retrieval
(Zotero.Styles.getVisible()/getAll()) is now synchronous, depending on a
previous async Zotero.Styles.init(). The translator list is generated in
the prefs window and passed into the Quick Copy site editor, but it's
possible the translators API should be changed to make getTranslators()
synchronous with a prior init() as well.
 2015-06-27 16:59:58 -04:00
Dan Stillman
3a5854f49f Update versions and submodules 2015-06-26 02:40:18 -04:00
Dan Stillman
fec43f1f62 Merge branch '4.0' into api_syncing 2015-04-13 02:01:43 -04:00
Dan Stillman
4b83b1a630 Bump version and maxVersion 2015-03-27 19:00:25 -04:00
Dan Stillman
bdd69d0a53 Merge branch '4.0' into api_syncing 2015-03-16 23:41:10 -04:00
Dan Stillman
aeb7b83a39 Update versions 2015-02-21 21:52:06 -05:00
Dan Stillman
5a1d605330 Update maxVersion 2015-02-10 22:57:55 -05:00
Dan Stillman
1afa1ffea6 Update submodules, repotime, and versions 2015-02-10 00:13:42 -05:00
Dan Stillman
b0e37a38a2 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/xpcom/schema.js
	chrome/content/zotero/xpcom/translation/translate.js
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
 2015-01-29 19:59:47 -05:00
Dan Stillman
0c3332b5e4 Update versions 2015-01-14 00:08:31 -07:00
Dan Stillman
b9fb7fa3c6 Update versions 2015-01-12 23:59:26 -07:00
Dan Stillman
f1a3cb3577 Update versions, submodules, and repotime 2015-01-12 21:54:56 -07:00
Dan Stillman
e3d7101923 Update version 2014-12-02 00:26:41 -05:00
Dan Stillman
7dc9022a1f Update maxVersion 2014-12-01 02:51:44 -05:00
Dan Stillman
d7d542a79c Update version, submodules, and repotime 2014-12-01 02:17:09 -05:00
Dan Stillman
6c814e2fa2 Update version 2014-10-14 22:55:07 -04:00
Simon Kornblith
d3a69be997 Fix translation under Firefox 33 
Our strategy: put arguments into a property of the function, and then
get them out unwrapped. This avoids security checks on arguments passed
to the function.
 2014-10-10 18:31:10 -04:00
Dan Stillman
cebaab4e4e Update versions 2014-09-19 20:42:29 -04:00
Dan Stillman
f33d249e9c Update minVersion/maxVersion 2014-09-11 21:10:03 -04:00
Dan Stillman
14a5643f38 Update submodules, repotime, versions 2014-09-01 14:56:01 -04:00
Dan Stillman
36c5dceff4 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/browser.js
	chrome/content/zotero/longTagFixer.js
	chrome/content/zotero/xpcom/schema.js
	chrome/content/zotero/xpcom/utilities.js
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
 2014-07-15 22:17:27 -04:00
Dan Stillman
60f3419900 Update version 2014-06-27 14:14:44 -04:00
Dan Stillman
479598b80c Update versions 2014-06-25 17:35:02 -04:00
Dan Stillman
8ab079797c Update version 2014-06-24 17:47:45 -04:00
Dan Stillman
28dbfabb4f Update version 2014-06-21 13:13:01 -04:00
Dan Stillman
96de2add96 Update versions 2014-06-20 03:47:24 -04:00
Dan Stillman
aee65951fd Bump maxVersion 2014-06-20 00:13:51 -04:00
Dan Stillman
57116fa892 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/xpcom/collectionTreeView.js
	chrome/content/zotero/xpcom/libraryTreeView.js
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
 2014-05-08 15:52:31 -04:00
Dan Stillman
61af5e987d Update versions 2014-04-30 15:08:58 -04:00
Dan Stillman
74ed0879f6 Update versions 2014-04-29 04:21:32 -04:00
Dan Stillman
f49c15d29c Use new Z icon in Add-ons window 2014-04-28 18:26:33 -04:00
Dan Stillman
6fa3511f33 Update submodules, repotime, maxVersion, and renamed styles 2014-04-26 01:41:32 -04:00
Dan Stillman
62fb1024b2 Update versions 2014-03-24 16:50:58 -04:00
Dan Stillman
af5e7abb31 Update versions, submodules, and repotime 2014-03-21 04:10:38 -04:00
Dan Stillman
d137850075 Update versions 2014-03-19 06:23:30 -04:00
Dan Stillman
bfdc9cf5fc Update maxVersions 2014-03-16 00:23:29 -04:00
Dan Stillman
d7ce74f1c5 Update version and maxVersion 2014-01-31 18:23:15 -05:00
Dan Stillman
1a784915b0 Remove a1 from version, since build script will add it 
Also bump maxVersion
 2014-01-31 05:36:47 -05:00
Dan Stillman
b82728aeea Update submodules, versions, and repotime 2013-12-13 18:23:04 -05:00
Dan Stillman
207c34b1a4 Update maxVersion 2013-12-11 15:19:03 -05:00
Dan Stillman
322755e745 Update repotime, submodules, and versions 2013-11-19 01:39:52 -05:00
Dan Stillman
0d7e14bb6b Update versions, submodules, and repotime 2013-11-12 00:33:19 -05:00
Dan Stillman
3c16eb2fb3 Update versions 2013-11-06 11:23:03 -05:00
Dan Stillman
21546cab88 Update versions, repotime, and submodules 2013-11-05 16:44:50 -05:00
Dan Stillman
5d1efea137 Update maxVersion 2013-09-19 21:54:44 -04:00
Dan Stillman
79d55a32ce Update minVersion/maxVersion 2013-08-09 12:50:25 -04:00
Dan Stillman
2dc8fc6912 Update versions 2013-08-09 11:50:10 -04:00
Dan Stillman
8f0dac0eb4 Update version and styles 2013-08-08 15:24:47 -04:00
Dan Stillman
bfaa0f1172 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/xpcom/db.js
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
 2013-08-08 01:06:35 -04:00
Dan Stillman
b673718f2a Update maxVersion 2013-08-07 17:11:25 -04:00