old-git.evergreen-ils.org Git - evergreen/equinox.git/commit

projects / evergreen / equinox.git / commit

author	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Thu, 8 Sep 2011 22:02:10 +0000 (18:02 -0400)
committer	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Thu, 8 Sep 2011 22:21:11 +0000 (18:21 -0400)
commit	50371fb3d58a6806221a4131694f26dcb8fa8ee4
tree	9d82b98629ed6410e8922204f586e443690b4e14	tree
parent	1485d8b47f277d7b35bb9f8e8b536a20dd4b6405	commit \| diff
parent	3a5a8d6c944e8c9161ceab73f62dd8fd09f26412	commit \| diff

Merge remote branch 'equinox/ttopac-staff-saved-searches' into tto-master-merge-plus-masslnc

Staff recent searches show up on the left of the results and record
details pages now. You can turn this off via OU settings if you like.
See merged commits. Again this is just when viewing through staff
client.

Conflicts:
Open-ILS/src/templates/opac/results.tt2
Open-ILS/web/templates/default/opac/record.tt2

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

Evergreen working repo (Equinox)

RSS Atom

Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/qtype_selector.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/opac/parts/staff_saved_searches.tt2	\|	\|	blob
Open-ILS/src/templates/opac/record.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/opac/results.tt2	diff1 \|	\|	blob \| history
Open-ILS/web/css/skin/default/opac/style.css	diff1 \|	diff2 \|	blob \| history