Merge branch 'master' into next
df626433ef4d
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 11 2013, 17:27.

Description

Merge branch 'master' into next

master: WebSearch: asciification of oe grapheme WebSearch: bug fix for SPIRES date math search BibUpload: conflicting revision ticket queue BibRecord: new API records_identical() BibUpload: smart record uploader fixes BibUpload: BibCatalog connection BibUpload: sensible history and other goodies BibUpload: bibrec timestamp bug BibUpload: smart record uploader BibRecord: new API identical_records() BibSched: enhanced write_message() installation: help for BibAuthorID email settings BibCatalog: default email backend BibCatalog: new email ticketing backend

Conflicts:
modules/bibupload/lib/bibupload_regression_tests.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 11 2013, 18:00

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:df626433ef4d: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 11 2013, 18:00

Commit	Author	Details	Committed
f117aa230631	Tibor Simko	Merge branch 'maint-1.1'	Sep 11 2013
4b91292219ea	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Sep 11 2013
15fdcaf87875	Tibor Simko	WebSearch: asciification of `oe` grapheme	Sep 11 2013
bafb1ea782e5	Alessio Deiana/Tibor Simko	WebSearch: bug fix for SPIRES date math search	Sep 10 2013
03e0ddd9302f	Tibor Simko	BibUpload: conflicting revision ticket queue	Sep 10 2013
382d02fe25b3	Tibor Simko	BibRecord: new API records_identical()	Sep 10 2013
2a5dd51f0604	Samuele Kaplun/Tibor Simko	BibUpload: smart record uploader fixes	Sep 10 2013
31de2db26c3e	Samuele Kaplun/Tibor Simko	BibUpload: BibCatalog connection	Sep 10 2013
d1921bc5af77	Samuele Kaplun/Tibor Simko	BibUpload: sensible history and other goodies	Sep 10 2013
7095b2186a57	Samuele Kaplun/Tibor Simko	BibUpload: bibrec timestamp bug	Sep 10 2013
4ef4798b60d1	Vasanth Venkatraman/Tibor Simko	BibUpload: smart record uploader	Sep 10 2013
85b97465dadf	Samuele Kaplun/Tibor Simko	BibRecord: new API identical_records()	Sep 10 2013
f8c2403dd5f8	Samuele Kaplun/Tibor Simko	BibSched: enhanced write_message()	Sep 10 2013
cc830df95d95	Tibor Simko	installation: help for BibAuthorID email settings	Sep 10 2013
28b6eb414174	Tibor Simko	BibCatalog: default email backend	Sep 10 2013
cdb8ab53fe64	Eduardo Benavidez/Tibor Simko	BibCatalog: new email ticketing backend	Sep 9 2013

				Path
	M			INSTALL
	M			RELEASE-NOTES
	M			config/invenio.conf
	M			modules/bibcatalog/lib/Makefile.am
	M			modules/bibcatalog/lib/bibcatalog.py
	A			modules/bibcatalog/lib/bibcatalog_system_email.py
	A			modules/bibcatalog/lib/bibcatalog_system_email_unit_tests.py
	M			modules/bibedit/lib/bibeditcli.py
	M			modules/bibrecord/lib/bibrecord.py
	M			modules/bibsched/lib/bibtask.py
	M			modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
	M			modules/bibupload/lib/Makefile.am
	M			modules/bibupload/lib/bibupload.py
	M			modules/bibupload/lib/bibupload_config.py
	M			modules/bibupload/lib/bibupload_regression_tests.py
	A			modules/bibupload/lib/bibupload_revisionverifier.py
	A			modules/bibupload/lib/bibupload_revisionverifier_regression_tests.py
	M			modules/miscutil/lib/textutils.py
	M			modules/miscutil/lib/textutils_unit_tests.py
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/search_engine_query_parser.py