Merge branch 'master' into next
75c170fe401a
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 14 2013, 15:58.

Description

Merge branch 'master' into next

master: WebStyle: new /goto URL handler dateutils: new get_time_estimator function WebLinkBack: fix truncated FSF address in docstring WebSearch: 410 HTTP code for deleted records BibSched: bugfix for high-priority monotasks CKEditor: updated to version 3.6.6 BibCirculation: set colour of some buttons

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 14 2013, 15:58

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:75c170fe401a: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 14 2013, 15:58

Commit	Author	Details	Committed
6066d0c442b6	Tibor Simko	Merge branch 'maint-1.1'	Jan 14 2013
c2076bb4be70	Samuele Kaplun/Tibor Simko	WebStyle: new /goto URL handler	Jan 14 2013
fc9c0a93ef36	Samuele Kaplun/Tibor Simko	dateutils: new get_time_estimator function	Jan 14 2013
eaff94605c9a	Jerome Caffaro/Tibor Simko	WebLinkBack: fix truncated FSF address in docstring	Jan 11 2013
769f18e5e604	Samuele Kaplun/Tibor Simko	WebSearch: 410 HTTP code for deleted records	Jan 11 2013
6a716630fbb5	Samuele Kaplun/Tibor Simko	BibSched: bugfix for high-priority monotasks	Jan 10 2013
7267947313a2	Jerome Caffaro/Tibor Simko	CKEditor: updated to version 3.6.6	Jan 8 2013
4bb74439f49b	Ludmila Marian/Tibor Simko	BibCirculation: set colour of some buttons	Jan 8 2013

		Path
M		.gitignore
M		Makefile.am
M		configure.ac
M		modules/bibcirculation/lib/bibcirculation_templates.py
M		modules/bibdocfile/lib/bibdocfile_webinterface.py
M		modules/bibsched/lib/bibsched.py
M		modules/bibsched/lib/tasklets/bst_weblinkback_updater.py
M		modules/miscutil/lib/dateutils.py
P		modules/miscutil/lib/upgrades/invenio_2013_01_08_new_goto_table.py Copied from modules/miscutil/lib/upgrades/invenio_2012_12_11_new_citation_errors_table.py
M		modules/miscutil/sql/tabcreate.sql
M		modules/websearch/lib/websearch_webinterface.py
M		modules/webstyle/bin/Makefile.am
P		modules/webstyle/bin/gotoadmin.in Copied from modules/miscutil/bin/dbdump.in
M		modules/webstyle/doc/admin/webstyle-admin-guide.webdoc
M		modules/webstyle/lib/Makefile.am
A		modules/webstyle/lib/goto_engine.py
A	(dir)	modules/webstyle/lib/goto_plugins/
P		modules/webstyle/lib/goto_plugins/Makefile.am Copied from modules/websearch/lib/facets/Makefile.am
P		modules/webstyle/lib/goto_plugins/__init__.py Copied from modules/bibauthorid/lib/__init__.py
A		modules/webstyle/lib/goto_plugins/goto_plugin_cern_hr_documents.py
A		modules/webstyle/lib/goto_plugins/goto_plugin_latest_record.py
P		modules/webstyle/lib/goto_plugins/goto_plugin_simple.py Copied from modules/miscutil/lib/cache.py
A		modules/webstyle/lib/goto_webinterface.py
M		modules/webstyle/lib/webinterface_handler_config.py
M		modules/webstyle/lib/webinterface_layout.py
M		modules/webstyle/lib/webstyle_regression_tests.py