git.evergreen-ils.org Git - contrib/Conifer.git/commit

]> git.evergreen-ils.org Git - contrib/Conifer.git/commit

projects / contrib / Conifer.git / commit

author	Dan Scott <dscott@laurentian.ca>
	Fri, 2 Sep 2016 22:14:24 +0000 (18:14 -0400)
committer	Dan Scott <dscott@laurentian.ca>
	Fri, 2 Sep 2016 22:14:24 +0000 (18:14 -0400)
commit	dfbaa34e1eefb07a9c11d6affe75722f7565a0c6
tree	8836cc15c754ddfff312c1b076a2e4370c158190	tree
parent	655deac21bc542e849d1528c3b5e0e6e74313f08	commit \| diff
parent	9f095c82b18b71041810a0c7e6753d7a6db47e17	commit \| diff

Merge remote-tracking branch 'origin/rel_2_10' into rel_2_10_mergery_tpac

This should bring us up to date with the current stable branch of Evergreen,
and mostly properly resolved methinks.

Signed-off-by: Dan Scott <dscott@laurentian.ca>

19 files changed:

Open-ILS/examples/opensrf.xml.example	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/extras/install/Makefile.ubuntu-precise	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/live_t/08-lp1366964-libdbi-error.t	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/reporter/clark-kent.pl	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/t/regress/lp1414112_allow_spaces_as_ff_attr_values.pg	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/acq/common/li_table.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/browse.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/advanced/search.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/record/summary.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/searchbar.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/results.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/js/ui/default/acq/financial/list_funds.js	diff1 \|	diff2 \|	blob \| history
build/i18n/po/tpac/fr-CA.po	diff1 \|	diff2 \|	blob \| history

Evergreen contribs

RSS Atom

Open-ILS/examples/opensrf.xml.example	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/extras/install/Makefile.ubuntu-precise	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/live_t/08-lp1366964-libdbi-error.t	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/reporter/clark-kent.pl	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/t/regress/lp1414112_allow_spaces_as_ff_attr_values.pg	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/acq/common/li_table.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/browse.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/advanced/search.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/record/summary.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/searchbar.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/results.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/js/ui/default/acq/financial/list_funds.js	diff1 \|	diff2 \|	blob \| history
build/i18n/po/tpac/fr-CA.po	diff1 \|	diff2 \|	blob \| history