Merge branch 'master' into next
c44d56c89413
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 10 2013, 16:31.

Description

Merge branch 'master' into next

Committed

Tibor Simko <tibor.simko@cern.ch>

Jun 10 2013, 16:31

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:c44d56c89413: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 10 2013, 16:31

	Commit			Author	Details	Committed
	fbfba4a6777b			Jiri Kuncar/Tibor Simko	BibField: new calculated fields	Jun 10 2013
	c0149630d979			Esteban J. G. Gabancho/Tibor Simko	BibField: virtual field aliases amended	Jun 10 2013

				Path
	M			modules/bibfield/etc/atlantis.cfg
	M			modules/bibfield/lib/bibfield_config_engine.py
	M			modules/bibfield/lib/bibfield_jsonreader.py
	M			modules/bibfield/lib/bibfield_regression_tests.py
	M			modules/bibfield/lib/bibfield_utils.py
	M			modules/bibfield/lib/bibfield_utils_unit_tests.py
	P			modules/bibfield/lib/functions/get_cited_by_count.py Copied from modules/websearch/lib/facets/facet_author.py
	P			modules/bibfield/lib/functions/get_number_of_comments.py Copied from modules/websearch/lib/facets/facet_collection.py
	P			modules/bibfield/lib/functions/get_number_of_reviews.py Copied from modules/websearch/lib/facets/facet_year.py