Merge branch 'master' into next
bcda6d98370f
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 20 2013, 13:16.

Description

Merge branch 'master' into next

master: textutils: create function to show diff view BibEdit: update admin help page and shortcuts BibEdit: remove extra holding pen call BibEdit: show/hide specific parts of the record BibEdit: merge record with template BibEdit: custom errors for AJAX requests BibEdit: better holdingpen integration BibEdit: tab switch between fields BibEdit: minor fixes WebStyle: more accurate "Restricted" flag display

Conflicts:
modules/webstyle/img/Makefile.am

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 20 2013, 13:16

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:bcda6d98370f: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 20 2013, 13:16

Commit	Author	Details	Committed
0c490984ef36	Sebastian Witowski/Tibor Simko	textutils: create function to show diff view	Mar 20 2013
ea6996f561d7	Javier Martin Montull/Tibor Simko	BibEdit: update admin help page and shortcuts	Mar 20 2013
0a846084a7fe	Javier Martin Montull/Tibor Simko	BibEdit: remove extra holding pen call	Mar 20 2013
9c4129034540	Javier Martin Montull/Tibor Simko	BibEdit: show/hide specific parts of the record	Mar 20 2013
923a5d288427	Javier Martin Montull/Tibor Simko	BibEdit: merge record with template	Mar 20 2013
151591e6fdba	Javier Martin Montull/Tibor Simko	BibEdit: custom errors for AJAX requests	Mar 20 2013
7b36252caccc	Sebastian Witowski/Tibor Simko	BibEdit: better holdingpen integration	Mar 20 2013
66c90dbe965a	Javier Martin Montull	BibEdit: tab switch between fields	Mar 19 2013
d40ea739b0a3	Javier Martin Montull	BibEdit: minor fixes	Mar 19 2013
19c6c59d1961	Jerome Caffaro/Tibor Simko	WebStyle: more accurate "Restricted" flag display	Mar 19 2013

				Path
	M			config/invenio.conf
	M			modules/bibauthorid/lib/bibauthorid_name_utils.py
	M			modules/bibedit/doc/admin/bibedit-admin-guide.webdoc
	M			modules/bibedit/lib/bibedit.css
	M			modules/bibedit/lib/bibedit_config.py
	M			modules/bibedit/lib/bibedit_display.js
	M			modules/bibedit/lib/bibedit_engine.js
	M			modules/bibedit/lib/bibedit_engine.py
	M			modules/bibedit/lib/bibedit_holdingpen.js
	M			modules/bibedit/lib/bibedit_keys.js
	M			modules/bibedit/lib/bibedit_refextract.js
	M			modules/bibedit/lib/bibedit_templates.py
	M			modules/bibedit/lib/bibedit_utils.py
	M			modules/bibrecord/lib/bibrecord.py
	M			modules/miscutil/lib/textutils.py
	M			modules/oaiharvest/lib/oai_harvest_admin.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/webstyle/css/invenio.css
	M			modules/webstyle/img/Makefile.am
	A			modules/webstyle/img/magnifying_minus.png
	A			modules/webstyle/img/magnifying_plus.png
	M			modules/webstyle/lib/webstyle_templates.py