Diffusion invenio-infoscience e0efece98cfc

Merge branch 'master' into next
e0efece98cfc
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on May 21 2013, 18:32.

Description

Merge branch 'master' into next

master: WebAccess: ORCID support WebAccess: OpenID and OAuth authentication BibFormat: skip hidden icons in OpenGraph image tag installation: fix for jQuery hotkeys add-on URL BibCirculation: email ID changes and test fixes

Conflicts:
Makefile.am
config/invenio.conf
modules/miscutil/lib/Makefile.am
modules/miscutil/lib/inveniocfg.py
modules/webaccess/lib/Makefile.am
modules/webstyle/lib/webinterface_handler_wsgi.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

May 21 2013, 18:32

Parents

R3600:a93c61055079: WebAccess: ORCID support
R3600:b7b2cbfdd176: WebDeposit: optional ckeditor & date format

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:e0efece98cfc: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).May 21 2013, 18:32

Merged Changes

Commit	Author	Details	Committed
a93c61055079	Samuele Kaplun/Tibor Simko	WebAccess: ORCID support	May 21 2013
d0dea72a8949	Alper Cinar/Tibor Simko	WebAccess: OpenID and OAuth authentication	May 21 2013
fe3af560e41e	Tibor Simko	Merge branch 'maint-1.1'	May 21 2013
b7d75830689a	Jerome Caffaro/Tibor Simko	BibFormat: skip hidden icons in OpenGraph image tag	May 17 2013
1e5c804921d1	Samuele Kaplun/Tibor Simko	installation: fix for jQuery hotkeys add-on URL	May 17 2013
e1ad69783dfb	Raja Sripada/Tibor Simko	BibCirculation: email ID changes and test fixes	May 17 2013

Changes (71)

				Path
	M			INSTALL
	M			Makefile.am
	M			config/invenio.conf
	M			configure-tests.py
	M			modules/bibcirculation/lib/bibcirculation.py
	M			modules/bibcirculation/lib/bibcirculation_config.py
	M			modules/bibcirculation/lib/bibcirculation_daemon.py
	M			modules/bibcirculation/lib/bibcirculation_dblayer.py
	M			modules/bibcirculation/lib/bibcirculation_templates.py
	M			modules/bibcirculation/lib/bibcirculation_webinterface.py
	M			modules/bibcirculation/lib/bibcirculationadmin_webinterface.py
	M			modules/bibcirculation/lib/bibcirculationadminlib.py
	M			modules/bibformat/lib/elements/bfe_meta_opengraph_image.py
	M			modules/miscutil/lib/Makefile.am
	A			modules/miscutil/lib/containerutils.py
	M			modules/miscutil/lib/inveniocfg.py
	M			modules/miscutil/lib/mailutils.py
	M			modules/miscutil/sql/tabcreate.sql
	M			modules/webaccess/lib/Makefile.am
	M			modules/webaccess/lib/access_control_config.py
	M			modules/webaccess/lib/external_authentication.py
	A			modules/webaccess/lib/external_authentication_oauth1.py
	A			modules/webaccess/lib/external_authentication_oauth2.py
	A			modules/webaccess/lib/external_authentication_openid.py
	M			modules/websession/lib/webaccount.py
	M			modules/websession/lib/websession_config.py
	M			modules/websession/lib/websession_templates.py
	M			modules/websession/lib/websession_webinterface.py
	M			modules/websession/lib/webuser.py
	M			modules/webstyle/css/invenio.css
	M			modules/webstyle/img/Makefile.am
	A			modules/webstyle/img/aol_icon_24.png
	A			modules/webstyle/img/aol_icon_48.png
	A			modules/webstyle/img/blogger_icon_24.png
	A			modules/webstyle/img/blogger_icon_48.png
	A			modules/webstyle/img/facebook_icon_24.png
	A			modules/webstyle/img/facebook_icon_48.png
	A			modules/webstyle/img/flickr_icon_24.png
	A			modules/webstyle/img/flickr_icon_48.png
	A			modules/webstyle/img/foursquare_icon_24.png
	A			modules/webstyle/img/foursquare_icon_48.png
	A			modules/webstyle/img/google_icon_24.png
	A			modules/webstyle/img/google_icon_48.png
	A			modules/webstyle/img/googleoauth2_icon_24.png
	A			modules/webstyle/img/googleoauth2_icon_48.png
	A			modules/webstyle/img/instagram_icon_24.png
	A			modules/webstyle/img/instagram_icon_48.png
	A			modules/webstyle/img/linkedin_icon_24.png
	A			modules/webstyle/img/linkedin_icon_48.png
	A			modules/webstyle/img/livejournal_icon_24.png
	A			modules/webstyle/img/livejournal_icon_48.png
	A			modules/webstyle/img/myopenid_icon_24.png
	A			modules/webstyle/img/myopenid_icon_48.png
	A			modules/webstyle/img/myspace_icon_24.png
	A			modules/webstyle/img/myspace_icon_48.png
	A			modules/webstyle/img/myvidoop_icon_24.png
	A			modules/webstyle/img/myvidoop_icon_48.png
	A			modules/webstyle/img/openid_icon_24.png
	A			modules/webstyle/img/openid_icon_48.png
	A			modules/webstyle/img/orcid_icon_24.png
	A			modules/webstyle/img/twitter_icon_24.png
	A			modules/webstyle/img/twitter_icon_48.png
	A			modules/webstyle/img/verisign_icon_24.png
	A			modules/webstyle/img/verisign_icon_48.png
	A			modules/webstyle/img/wordpress_icon_24.png
	A			modules/webstyle/img/wordpress_icon_48.png
	A			modules/webstyle/img/yahoo_icon_24.png
	A			modules/webstyle/img/yahoo_icon_48.png
	A			modules/webstyle/img/yammer_icon_24.png
	A			modules/webstyle/img/yammer_icon_48.png
	M			modules/webstyle/lib/webinterface_handler_wsgi.py