projects / contrib / Conifer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: af3308f) | patch
Merge serials-integration branch, incorporating new work from Dan Wells.
authorsenator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 10 Nov 2010 17:54:34 +0000 (17:54 +0000)
committersenator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 10 Nov 2010 17:54:34 +0000 (17:54 +0000)
commit247f7ba645e303e557f036a7b0d002d53b7d41e9
tree184dc6f50ed8a66f317ba059671dff7b1387d0fbtree
parentaf3308f8e1f6ed4871e0dcbd60d4cd1a9ba71068commit | diff
Merge serials-integration branch, incorporating new work from Dan Wells.

Specifically, this contains changesets 18670, 18669, 18379, and 18373.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@18685 dcc99617-32d9-48b4-a31d-7c20da2025e4
18 files changed:
Open-ILS/src/perlmods/OpenILS/Application/Serial.pm diff | blob | history
Open-ILS/web/opac/locale/en-US/lang.dtd diff | blob | history
Open-ILS/xul/staff_client/chrome/content/main/constants.js diff | blob | history
Open-ILS/xul/staff_client/server/locale/en-US/serial.properties diff | blob | history
Open-ILS/xul/staff_client/server/serial/editor_base.js diff | blob | history
Open-ILS/xul/staff_client/server/serial/manage_dists.js [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/manage_dists.xul [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/manage_subs.js diff | blob | history
Open-ILS/xul/staff_client/server/serial/sbsum_editor.js [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/sbsum_editor.xul [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/sdist_editor.js diff | blob | history
Open-ILS/xul/staff_client/server/serial/sisum_editor.js [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/sisum_editor.xul [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/sssum_editor.js [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/sssum_editor.xul [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/sstr_editor.js [new file with mode: 0644] blob
Open-ILS/xul/staff_client/server/serial/sstr_editor.xul [new file with mode: 0644] blob
Evergreen contribs