Merge branch 'master' into next
241f1c02ca5c
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 27 2013, 21:38.

Description

Merge branch 'master' into next

master: BatchUploader: avoid tempfile.tempdir redefinition BibRank: temporary file storage in CFG_TMPDIR WebJournal: fix image dimension retrieval WebJournal: sample Twitter Card markup BibFormat: initial example of Twitter Card support WebComment: link to "Your Comments" after posting WebAccess: update check for "external" account at CERN OAIHarvest: consider source_id for selective post-processing OAIHarvest: configurable selective post-processing BibMerge: delete duplicate record first

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 28 2013, 09:46

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:241f1c02ca5c: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 28 2013, 09:46

Commit	Author	Details	Committed
50474d8c000a	Tibor Simko	Merge branch 'maint-1.1'	Nov 27 2013
c8951cdae4a7	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Nov 27 2013
4a7091267761	Jerome Caffaro/Tibor Simko	BatchUploader: avoid tempfile.tempdir redefinition	Nov 27 2013
ff91087ce898	Tibor Simko	Merge branch 'maint-0.99' into maint-1.0	Nov 27 2013
074f06c407ab	Jerome Caffaro/Tibor Simko	BibRank: temporary file storage in CFG_TMPDIR	Nov 27 2013
fd732ad90e60	Jerome Caffaro/Tibor Simko	WebJournal: fix image dimension retrieval	Nov 27 2013
78cc1b1aca87	Jerome Caffaro/Tibor Simko	WebJournal: sample Twitter Card markup	Nov 27 2013
fcba63c36163	Jerome Caffaro/Tibor Simko	BibFormat: initial example of Twitter Card support	Nov 27 2013
c6d21d453022	Jerome Caffaro/Tibor Simko	WebComment: link to "Your Comments" after posting	Nov 27 2013
18ddb1f12f33	Jerome Caffaro/Tibor Simko	WebAccess: update check for "external" account at CERN	Nov 27 2013
d01a5e71a919	Jerome Caffaro/Tibor Simko	OAIHarvest: consider source_id for selective post-processing	Nov 27 2013
24e5dd8d7a10	Jerome Caffaro/Tibor Simko	OAIHarvest: configurable selective post-processing	Nov 27 2013
b1526759f232	Jerome Caffaro/Tibor Simko	BibMerge: delete duplicate record first	Nov 27 2013

				Path
	M			modules/bibformat/etc/format_templates/Default_HTML_meta.bft
	M			modules/bibformat/lib/elements/bfe_meta_opengraph_image.py
	M			modules/bibformat/lib/elements/bfe_meta_opengraph_video.py
	M			modules/bibmerge/lib/bibmerge_engine.py
	M			modules/bibrank/lib/bibrank_grapher.py
	M			modules/bibupload/lib/batchuploader.py
	M			modules/bibupload/lib/batchuploader_engine.py
	M			modules/miscutil/demo/democfgdata.sql
	M			modules/oaiharvest/lib/oai_harvest_daemon.py
	M			modules/oaiharvest/lib/oai_harvest_templates.py
	M			modules/webaccess/lib/external_authentication_sso.py
	M			modules/webcomment/lib/webcomment_templates.py
	M			modules/webjournal/etc/AtlantisTimes_Detailed.bft
	M			modules/webjournal/lib/elements/bfe_webjournal_article_body.py
	M			modules/webjournal/lib/elements/bfe_webjournal_articles_overview.py