scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-12 03:48:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3127 commits 12 branches 404 tags 331 MiB
Commit graph

3127 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Stillman
dce40b63f4 Version update 2011-03-18 02:27:08 +00:00
Dan Stillman
8d2d9162dd Tagging 2.1 Final 2011-03-18 02:26:20 +00:00
Dan Stillman
ef5af125dc Merge r8648 to branch 2011-03-17 21:36:51 +00:00
Dan Stillman
17c7bc9b71 Merge r8646 to branch 2011-03-17 21:30:58 +00:00
Dan Stillman
a58252adbb Merge r8644 to branch 2011-03-17 20:17:16 +00:00
Dan Stillman
002af101bd Merge r8491 and more of r8489 to branch 2011-03-17 04:08:17 +00:00
Dan Stillman
7847f3b347 Merge [8489-8490] to branch 2011-03-17 04:02:43 +00:00
Dan Stillman
7cf9abaed8 Merge r8514 to branch 2011-03-17 03:57:06 +00:00
Dan Stillman
76bd8c8a15 Remove stray character 2011-03-17 03:49:05 +00:00
Simon Kornblith
640a1b9e38 merge r8629-8633 to branch 2011-03-16 23:29:19 +00:00
Simon Kornblith
a31b5e7f3f merge r8623, r8626, r8627 to 2.1 branch 2011-03-16 22:51:11 +00:00
Dan Stillman
deff135a5f Merge [8577-8578] to branch 2011-03-14 21:04:30 +00:00
Dan Stillman
d768fa9797 Merge r8574 to branch 2011-03-12 18:58:25 +00:00
Dan Stillman
1f94af0047 Merge r8572 to branch 2011-03-11 17:44:21 +00:00
Dan Stillman
573a0fdbf6 Merge r8570 to branch 2011-03-11 04:07:24 +00:00
Dan Stillman
3b78a69acd Merge r8565 to branch 2011-03-10 23:57:10 +00:00
Dan Stillman
809544b782 Merge r8563 to branch 2011-03-10 20:39:24 +00:00
Dan Stillman
c469a901e4 Merge r8559 to branch 2011-03-10 18:21:10 +00:00
Dan Stillman
6855d7b73c Merge r8557 to branch 2011-03-10 17:24:50 +00:00
Dan Stillman
c137b4184b Merge [8548-8550] to branch 2011-03-10 00:56:34 +00:00
Dan Stillman
dab16ca376 Merge r8541 to branch 2011-03-09 06:24:28 +00:00
Dan Stillman
ecff06b725 Merge r8539 to branch 2011-03-09 02:54:13 +00:00
Simon Kornblith
6f596b4caf merge r8534-8536 to branch 2011-03-08 23:50:14 +00:00
Dan Stillman
1bdfc76892 Merge [8527,8530-8532] to branch 2011-03-08 19:28:06 +00:00
Simon Kornblith
84940054a6 merge 8515, 8518, 8522-8525 to 2.1 branch 2011-03-08 07:22:09 +00:00
Dan Stillman
7cc57cfa18 Merging [8443-8477] to 2.1 branch 2011-03-04 19:59:47 +00:00
Simon Kornblith
cf9d3c67b4 merge r8220-8419 to 2.1 branch 2011-03-01 22:48:17 +00:00
Simon Kornblith
72b6866af7 merge r8217 to 2.1 branch 2011-02-14 23:34:06 +00:00
Dan Stillman
1c6702ac85 Merge [8210-8211] to branch 2011-02-14 18:52:05 +00:00
Simon Kornblith
a22ddf5468 merge 8126-8208 to 2.1 branch 2011-02-14 17:01:28 +00:00
Simon Kornblith
2487f74f8c merge r8103-8124 to 2.1 branch 2011-02-13 06:47:33 +00:00
Simon Kornblith
9e2f00893d merge 8083-8101 to branch 2011-02-12 19:59:13 +00:00
Dan Stillman
a7555674be Merge locales on branch and tag 2011-02-10 04:37:04 +00:00
Simon Kornblith
5ba7580cb7 merge r8064-8068 to branch 2011-02-10 02:01:09 +00:00
Simon Kornblith
54239b5a7a merge 8060-8061 to 2.1 branch (not really relevant outside of standalone) 2011-02-10 00:37:27 +00:00
Simon Kornblith
242816ffc6 merge r8055 to branch 2011-02-09 23:43:44 +00:00
Simon Kornblith
14354d45eb merge 8049 to branch 2011-02-09 23:18:22 +00:00
Simon Kornblith
013e974858 merge r8045-8046 to branch 2011-02-09 22:12:28 +00:00
Simon Kornblith
daa6b24e95 merge r8041-8042 to branch 2011-02-09 19:50:01 +00:00
Simon Kornblith
62d2de9fef merge 8027-8039 to 2.1 branch 2011-02-09 04:56:16 +00:00
Simon Kornblith
c43a76e5f1 merge 8009, 8012-8025 to branch 2011-02-07 08:55:29 +00:00
Dan Stillman
7e69d6ca99 Merge [8010-8011] to 2.1 branch 2011-02-07 08:42:12 +00:00
Simon Kornblith
e8c94214c8 merge 8004 to 2.1 branch 2011-02-06 07:17:47 +00:00
Simon Kornblith
09ff2fe1a4 merge r8001 to 2.1 branch 2011-02-06 06:54:58 +00:00
Simon Kornblith
9be3572165 merge r7971-8000 to 2.1 branch 2011-02-06 06:25:31 +00:00
Simon Kornblith
3c74d7c3a3 merge 6965-6969 to 2.1 branch 2011-02-04 03:54:30 +00:00
Simon Kornblith
84c738b41d merge r7950-r7964 to .1 branch 2011-02-03 20:29:35 +00:00
Dan Stillman
331bda0b40 2.1 branch 2011-02-02 07:51:37 +00:00
Simon Kornblith
328c95e176 update to citeproc-js 1.0.105 
From 1.0.100:

Allow institutional names to collapse correctly when cite collapsing
options are in effect.

Add an option to identify Vietnamese names and format them correctly
(i.e. always family name first). There is a small possibility of false
positives, so the option is off by default. See the processor manual
for details: http://gsl-nagoya-u.net/http/pub/citeproc-doc.html

From 1.0.101:

Add sortkeys array to skeleton items received during
restoreProcessorState() if it is undefined. Avoids a processor crash
on the first Zotero 2.1 connection to a Zotero 2.0.9 document.

From 1.0.102:

When rendering non-ranged cites collapsed  with collapse="year-
suffix", and the year suffix is implicit (not being rendered through a
cs:text node with variable="year-suffix"), add the necessary splice
delimiter details to the number object.

Protect against undefined name.multi.main when checking headline names
for a name tag.

From 1.0.103:

Add a reference to item data in registry objects.

Provide a registry method getSortedRegistryObjects() to return current
bibliography data.

Document new registry method in processor manual.

From 1.0.104:

Make restoreProcessorState() notice that the sequence of citations has
changed, and assign fresh citation IDs to duplicate citations in the
input.

From 1.0.105:

Assure that all ids passed into an array or as a straight variable are
stringified. Loosen condition statements where appropriate to treat
numeric IDs of string and numeric type as equivalent.
 2011-02-02 06:49:20 +00:00
Simon Kornblith
87ed620ccc reopens #1772, RDF translator loses creators linked via a symbol [patch] 
revert changes to RDF.js, since they break import of >1 creator
 2011-02-02 06:08:31 +00:00