evergreen:rel_2_4

Last commit made on 2014-07-03
Get this branch:
git clone -b rel_2_4 https://git.launchpad.net/evergreen

Branch merges

Branch information

Name:
rel_2_4
Repository:
lp:evergreen

Recent commits

1c47370... by Remington Steed on 2014-06-06

LP#968514: Revive bib/auth importing docs from 2.1, add intro

This commit revives the following sections from the 2.1 version of the docs
and updates them for 2.6:

  - marc_export: Exporting Bibliographic Records into MARC files
    - includes new options for 2.6
  - Importing Authority Records from Command Line
  - Importing Authority Records from the Staff Client

The first two are included in a new section called "Support Scripts"
within the "Developer Resources" section, with a new intro and summary
of other commonly used scripts provided with Evergreen. The third section
is moved inside the Cataloging chapter "Batch Importing MARC Records",
with slight modifications to the intro to that chapter.

Signed-off-by: Remington Steed <email address hidden>

932b7d5... by Erica Rohlfs on 2014-05-30

Docs: Minor wording change

Signed-off-by: Erica Rohlfs <email address hidden>
Signed-off-by: Remington Steed <email address hidden>

f940d1e... by Yamil Suarez <email address hidden> on 2014-05-08

Documentation: add a 'where' clause to bib record import stored procedure

The stored procedure for doing bib record import was lacking a 'where'
clause in one of the update statements.

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

0707923... by Jeff Godin on 2013-10-30

Add alert in user editor for method errors

Add an alert() in the user editor so that method errors are not
silent.

Without this, a method error (such as when saving a patron fails at
the db level) is silent. Better to at least inform the user that
something is amiss.

Signed-off-by: Jeff Godin <email address hidden>
Signed-off-by: Mike Rylander <email address hidden>

df77fdd... by Bill Erickson on 2014-03-22

LP#1115599: Ignore canceled lineitems during batch cancel

Continue ignoring already-canceled lineitems during batch cancel so that
a) no unnecessary calls are made and b) staff can be alerted when no
viable lineitems were selected for the requested action.

Signed-off-by: Bill Erickson <email address hidden>
Signed-off-by: Kathy Lussier <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>

df7a004... by Kathy Lussier on 2014-01-29

LP#1115599: Allow cancelled lineitems to be received and invoiced

Acquisitions staff need to be able to receive and invoice cancelled items,
particularly when those items are backordered. This branch restores the
ability to perform these actions on cancelled lineitems from the PO
screen.

Signed-off-by: Kathy Lussier <email address hidden>
Signed-off-by: Bill Erickson <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>

bf77cf3... by Yamil Suarez <email address hidden> on 2014-03-28

Documentation: Changed return type of staging_importer() SP

Now it returns VOID, before it retunred NULL and gave an error

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

5d66b17... by Remington Steed on 2014-03-25

Change xref syntax to avoid docs processing bug

The current Documentation processing script can't handle the newer xref
syntax for cross references. Let's use the older syntax for now, and
consider changing over in the future, after the processing bug is fixed.

Signed-off-by: Remington Steed <email address hidden>

52e2249... by Remington Steed on 2014-03-20

Docs: Revive/merge content into "Using the Staff Client"

This commit brings in three old sections and merges with any similar
content.

- Revive old section about sticky check box settings
- Merge old section about Font and Sound settings

  Adds a brief section about zooming in the OPAC, and otherwise only
  reformats some lines to make them git-friendly.

- Docs: Fix and copy Customize Toolbars section

  The old "Customizable Toolbar" docs section is already revived in the
  Evergreen Book "System Configuration and Customization" chapter. Since
  this feature seems to belong under "Using the Staff Client ->
  Workstation Administration", this commit duplicates it into that
  chapter. This also fixes a few asciidoc bugs in both places.

  In addition, the section "Button Bar/Toolbar" that was also under
  "Workstation Administration" has been moved up a level, since it
  pertains more to staff client users rather than admins. And the
  admin-specific content at the end of that section has been replaced
  with a link to the newly duplicated "Customizable Toolbar" section.

  The result of this reorganization should be:

  - Using the Staff Client
    - Button Bar/Toolbar (for staff client users)
    - Workstation Administration
      - Customizable Toolbar (for staff client admins)

Signed-off-by: Remington Steed <email address hidden>

Conflicts:
 docs/root.txt

eadf138... by Remington Steed on 2014-03-20

Docs: Revive old section about Column Picker

Signed-off-by: Remington Steed <email address hidden>