evergreen:rel_2_6

Last commit made on 2015-10-24
Get this branch:
git clone -b rel_2_6 https://git.launchpad.net/evergreen

Branch merges

Branch information

Name:
rel_2_6
Repository:
lp:evergreen

Recent commits

a0264c2... by Galen Charlton on 2015-10-23

LP#1509479: set a limit on loops in QP's decompose() method

Following a suggestion of Dan Scott's, add a pair of
suspenders to the belt and enforce an arbitrary limit
of 1000 passes through QP->decompse().

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

b5d6cb8... by Galen Charlton on 2015-10-23

LP#1509479: fix infinite loop bug in QueryParser

An unclosed phrase search that has a modifier can cause QueryParser to
enter an infinite loop, tying up open-ils.storage backends.

Examples of such searches include:

  -"cats and dogs
  subject:+"physical chemistry

This patch fixes the bug by allowing the end of the query string
to terminate a phrase (in addition to a quotation mark).

To test:

[1] Verify that the t/21-QueryParser.t unit test passes
[2] To test in a *development* database, before applying the patch
    run one of the example queries. Observe that no
    results are returned, and that one of the open-ils.storage
    drones is running at 100% CPU.
[3] Apply the patch and restart the open-ils.storage service.
[4] Try the query again; this time, it should return results
    immediately without causing an open-ils.storage drone to
    peg a CPU.

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

8835e0d... by Angela Kilsdonk on 2015-06-24

Docs: 2.6 Duplicate Serials Barcode Alert

Documentation for new duplicate serials barcode alert in Serials Batch Receive.

Signed-off-by: Angela Kilsdonk <email address hidden>

3bb8201... by Bill Erickson on 2015-06-17

LP#1446816 HTML-escape notes in XUL patron alert page

Avoid rendering HTML contained in patron messages, etc. in the XUL
patron stop-sign page.

Thanks to Jason Etheridge, ESI for noting this problem and contributing
the original patch fix.

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

5bce280... by Jane Sandberg on 2015-05-19

Docs: General improvements to EDI docs

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

e2633b6... by Jane Sandberg on 2015-05-17

Docs: Added hard due dates docs

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

2ac4155... by Galen Charlton on 2015-04-30

LP#1449283: fix auth when running under Apache 2.4

When running under Apache 2.4 using the stock configuration
derived from apache_24/eg_vhost.conf.in, protected
URLs such as https://eghost/reporter/ that are meant to
require valid EG staff credentials were not in fact
requiring authentication.

This patch does the following to fix this:

[1] Removes several uses of "Require all granted" that
    was causing authentication to be ignored.
[2] Changes OpenILS::WWW::Proxy::Authen so that it always
    sets the username in the Apache request object if
    authentication was successful; it appears that starting
    with Apache 2.4, authentication handlers must ensure
    that a user name is set for a "Require valid-user"
    directive to work.

Signed-off-by: Galen Charlton <email address hidden>
Signed-off-by: Jason Stephenson <email address hidden>
Signed-off-by: Bill Erickson <email address hidden>

78c06b7... by Dan Wells on 2015-05-01

Forward-port 2.6.7 upgrade script

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

513d551... by Jason Boyer on 2015-03-02

LP#1427309 Fix Crash in Collections User Balance Summary

Previously a patron in collections that paid off all
transactions would cause a crash and stop processing
any balance summary file that they are supposed to
appear in. Now user balance summaries can be created
in full even if some users have a 0 balance.

Signed-off-by: Jason Boyer <email address hidden>
Signed-off-by: Bill Erickson <email address hidden>

3db7211... by Bill Erickson on 2015-04-06

LP#1380803 Update PO summary amounts

Refresh the PO summary amounts (spent, encumbered, estimated) each time
an amount-changing event occurs. These include changing the lineitem
price, adding/removing a direct charge, and adding/removing copies via
the copy grid.

Note that adding/removing copies via the batch-updater alread causes a
page refresh, which updates the summary amounts.

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