evergreen:rel_2_5

Last commit made on 2015-03-03
Get this branch:
git clone -b rel_2_5 https://git.launchpad.net/evergreen

Branch merges

Branch information

Name:
rel_2_5
Repository:
lp:evergreen

Recent commits

11da998... by Jason Stephenson on 2015-02-19

LP#1424755: Add IMPORTANT SECURITY INFORMATION release note.

Signed-off-by: Jason Stephenson <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>
Signed-off-by: Ben Shum <email address hidden>

c74ac78... by Jason Stephenson on 2015-02-18

LP#1424755: Org Unit Setting view permissions can be bypassed

Fix private org. unit setting leakage by forcing the $auth argument
to true if not passed in when open-ils.actor.ou_setting.ancestor_default
or open-ils.actor.ou_setting.ancestor_default.batch are called.

Other than a change to the desc of the public methods to reflect that
they now check permissions if permissions are required, there are no
required api changes to the back or the front ends.

Signed-off-by: Jason Stephenson <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>
Signed-off-by: Ben Shum <email address hidden>

e19eb6c... by Jason Stephenson on 2015-02-24

LP#1206589: Temporary Fix for Org. Unit Settings History Bug

This commit makes two changes to the coustl IDL entry.

1. It adds a retrieve permission of STAFF_LOGIN. This at least
requires someone with staff permission to be able to view settings
history.

2. It fixed the primary key field from date_applied to id. The
prior setting was just an outright error.

NOTE: This is intended as a short term fix for the Library Settings
Editor history feature.

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

c787b59... by Dan Wells on 2015-03-03

Forward port 2.5.7 upgrade script

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

325d2c4... by Ben Shum on 2014-12-26

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>

ce7710c... by Tim Spindler on 2014-11-26

Docs: Documentation for MARC Batch Edit

Signed-off-by: Yamil Suarez <email address hidden>

c0e0e39... by Josh Stompro <email address hidden> on 2014-11-10

Documentation: LP#1386854 - Locally Hosted Added Content.

Adds documentation that describes how to use the local content bypass
feature of the AddedContent modules. This allows for local added content like
cover art, reviews, TOC, exerpts or annotations to be shown in bib records.

I also changed the headers in the External Added Content section to use title case.

Signed-off-by: Josh Stompro <email address hidden>
Signed-off-by: Yamil Suarez <email address hidden>

Conflicts:
 docs/admin_initial_setup/designing_your_catalog.txt

3ea579e... by Mike Rylander on 2014-11-06

LP#1390225: Fail to care about errors from auth.session.delete

We're just tossing this call over the wall and moving on. We don't
care if the session wasn't there to delete or even if we didn't pass
a session to the server.

Signed-off-by: Mike Rylander <email address hidden>
Signed-off-by: Chris Sharp <email address hidden>
Signed-off-by: Jason Stephenson <email address hidden>

Conflicts:
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm

b759d75... by Mike Rylander on 2014-11-06

LP#1390225: redirect to ctx.home_page instead of through ctx.logout_page

This way, we skip the auth.session.delete call that will error out because
we no longer have the authtoken cookie.

Signed-off-by: Mike Rylander <email address hidden>
Signed-off-by: Chris Sharp <email address hidden>
Signed-off-by: Jason Stephenson <email address hidden>

Conflicts:
 Open-ILS/src/templates/opac/parts/base.tt2

10fbde2... by Dan Wells on 2014-11-05

Forward-port 2.5.7 upgrade script

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