Diffusion invenio-infoscience d21e4d945530

Merge branch 'master' into next
d21e4d945530
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 7 2013, 17:06.

Description

Merge branch 'master' into next

master: WebAccess: IP-based rules and offline user fix Invenio v1.1.1 I18N: PO file update for the release of v1.1.1 global: login link using absolute URL redirection Invenio v1.0.4 I18N: PO file update for the release of v1.0.4 installation: inclusion of JS quicktags in tarball WebSearch: next-hit/previous-hit numbering fix WebSubmit: fix the approval URL for publiline WebAccess: admin interface usability improvement bibdocfile: better error report for unknown format errorlib: register_exception improvements BibDocFile: explicit redirection to secure URL WebSession: fix for login-with-referer issue

Merge note: ignoring the above session-related commit, so not changing the following files: modules/websession/lib/session.py modules/websession/lib/websession_config.py modules/websession/lib/webuser.py modules/webstyle/lib/webinterface_handler_wsgi.py modules/webstyle/lib/webinterface_handler_wsgi_utils.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 7 2013, 17:15

Parents

R3600:3dc9999860a2: Merge branch 'maint-1.1'
R3600:e60a6fbb399f: WebComment: collapsable comment threads

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:d21e4d945530: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 7 2013, 17:15

Merged Changes

Commit	Author	Details	Committed
3dc9999860a2	Tibor Simko	Merge branch 'maint-1.1'	Jan 7 2013
01a973828cef	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Jan 7 2013
a9c70a55af73	Tibor Simko	Merge branch 'maint-0.99' into maint-1.0	Jan 7 2013
c671331829b8	Samuele Kaplun/Tibor Simko	WebAccess: IP-based rules and offline user fix	Jan 7 2013
4af772f24938	Tibor Simko	Merge branch 'maint-1.1'	Dec 21 2012
d85790968e8a	Tibor Simko	Invenio v1.1.1	Dec 21 2012
30c8a87f35e9	Tibor Simko	Merge branch 'maint-1.1'	Dec 21 2012
b2abdf0b439e	Tibor Simko	I18N: PO file update for the release of v1.1.1	Dec 21 2012
4e9c0c85d734	Tibor Simko	Merge branch 'maint-1.1'	Dec 21 2012
422d4678bf65	Jerome Caffaro/Tibor Simko	global: login link using absolute URL redirection	Dec 21 2012
602db34ba329	Tibor Simko	Merge branch 'maint-1.1'	Dec 21 2012
df3d5c828bfa	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Dec 21 2012
b6b0e392d252	Tibor Simko	Invenio v1.0.4	Dec 21 2012
f73f5d93c052	Tibor Simko	Merge branch 'maint-1.1'	Dec 21 2012
9ab21d8b7ac4	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Dec 21 2012
5f9fbf680191	Tibor Simko	I18N: PO file update for the release of v1.0.4	Dec 21 2012
901e897065e8	Tibor Simko	Merge branch 'maint-1.1'	Dec 21 2012
81b3bf43ea36	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Dec 21 2012
fb8d63750569	Tibor Simko	installation: inclusion of JS quicktags in tarball	Dec 21 2012
c3dcd8b5a93b	Nikolaos Kasioumis/Tibor Simko	WebSearch: next-hit/previous-hit numbering fix	Dec 20 2012
b4786479b1bc	Nikolaos Kasioumis/Tibor Simko	WebSubmit: fix the approval URL for publiline	Dec 20 2012
14de0a153cea	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Dec 20 2012
febefaecae8a	Samuele Kaplun/Tibor Simko	WebAccess: admin interface usability improvement	Dec 20 2012
6d6e985c9abc	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Dec 20 2012
22f4e36755d7	Samuele Kaplun/Tibor Simko	bibdocfile: better error report for unknown format	Dec 20 2012
35fae4936684	Samuele Kaplun/Tibor Simko	errorlib: register_exception improvements	Dec 20 2012
19e1fb806f77	Samuele Kaplun/Tibor Simko	BibDocFile: explicit redirection to secure URL	Dec 20 2012
8f60cf39bada	Samuele Kaplun/Tibor Simko	WebSession: fix for login-with-referer issue	Dec 20 2012

Changes (17)

				Path
	M			INSTALL
	M			NEWS
	M			RELEASE-NOTES
	M			modules/bibcirculation/lib/bibcirculation_webinterface.py
	M			modules/bibdocfile/lib/bibdocfile_webinterface.py
	M			modules/bibformat/web/admin/Makefile.am
	M			modules/miscutil/lib/errorlib.py
	M			modules/webaccess/lib/access_control_firerole.py
	M			modules/webaccess/lib/access_control_firerole_unit_tests.py
	M			modules/webaccess/lib/webaccessadmin_lib.py
	M			modules/webbasket/lib/webbasket_webinterface.py
	M			modules/webcomment/lib/webcomment_webinterface.py
	M			modules/weblinkback/lib/weblinkback_webinterface.py
	M			modules/websearch/lib/websearch_templates.py
	M			modules/websession/lib/websession_templates.py
	M			modules/websession/lib/websession_webinterface.py
	M			modules/websubmit/lib/websubmit_templates.py