evergreen:tags/rel_2_6_5

Last commit made on 2015-01-06
Get this branch:
git clone -b tags/rel_2_6_5 https://git.launchpad.net/evergreen

Branch merges

Branch information

Name:
tags/rel_2_6_5
Repository:
lp:evergreen

Recent commits

68cb991... by Dan Wells

Bumping version numbers, adding Upgrade Script and Changelog

Signed-off-by: Dan Wells <email address hidden>

3c67b9e... by Dan Wells

Bump OpenILS.pm version

Signed-off-by: Dan Wells <email address hidden>

8039a57... by Dan Wells

Changes to smooth out make_release

1) Make the fake 'HeadURL' into a URL which works with our web repo.
Note that this has 'tags/' hardcoded in, so it only works with true
release branches (e.g. rel_x_y_z) not "working" branches
(e.g. rel_x_y).

2) Change range selector when building log to better exclude commits
from previous releases.

Signed-off-by: Dan Wells <email address hidden>

0dd9b30... by Dan Wells

Forward-port 2.6.4 upgrade script

Signed-off-by: Dan Wells <email address hidden>

42a63ea... by Pasi Kallinen

Make Vandelay merge profile names translatable.

Signed-off-by: Pasi Kallinen <email address hidden>
Signed-off-by: Bill Erickson <email address hidden>

ad44809... by Ben Shum

Docs: fix asciidoc errors

When https://bugs.launchpad.net/evergreen/+bug/1386854 was merged to add a new
docs section for "Locally hosted content", it looks like there was a bad git
conflict resolution and an extra block of ======= was left behind.

Remove this to fix headings and table of contents for the documentation site.

Signed-off-by: Ben Shum <email address hidden>

7b189ea... by Michael Peters

LP#1319964 "Summaries & More" displays improperly in TPAC

Commit 14eb3d30 added HTML-escaping of OPAC extras display
labels, meaning that if an ampersand in such a label is
desired, it should be entered in the template just as an ampersand.

Signed-off-by: Michael Peters <email address hidden>

[Amended original commit to tweak message and remove unecessary changes
 to .po files, which are rebuilt when a release is rolled.]

Signed-off-by: Galen Charlton <email address hidden>

05fafd0... by Dan Scott <email address hidden>

LP#1402905 Use stricter matching for UPC values

Per http://www.loc.gov/marc/bibliographic/bd024.html we
should be checking to see if either the ind1 is "1" or
if there's a subfield 2 with a value of "upc" before
assuming that any "Other standard identifier" 024 field
is a UPC value.

Signed-off-by: Dan Scott <email address hidden>
Signed-off-by: Ben Shum <email address hidden>

40d2321... by Mike Rylander

LP#921142: Bring back automatic padding of short fixed fields in the GUI MARC editor

Bring back automatic padding of short fixed fields in the GUI MARC
editor. Also, use onblur instead of oninput, so that we've already lost
focus and don't care if that happens again.

Signed-off-by: Mike Rylander <email address hidden>
Signed-off-by: Remington Steed <email address hidden>
Signed-off-by: Ben Shum <email address hidden>

0d39de4... by Ben Shum

LP#1394356: Stamping upgrade script for patron purge post code fix

Signed-off-by: Ben Shum <email address hidden>