Diffusion invenio-infoscience 469255213491

Merge branch 'maint-2.0'
469255213491
Actions

Authored by kuncar on Mar 23 2015, 17:24.

Description

Merge branch 'maint-2.0'

maint-2.0: docs: fix reading of package version global: python coding utf-8 header fix global: HTML escaping of unicode characters

Details

Committed

kuncar

Mar 23 2015, 17:24

Parents

R3600:54137d48fb45: docs: fix reading of package version
R3600:a0c631a4b4ae: Merge branch 'maint-2.0'

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:469255213491: Merge branch 'maint-2.0' (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Mar 23 2015, 17:24

Merged Changes

Commit	Author	Details	Committed
54137d48fb45	Jiri Kuncar	docs: fix reading of package version	Mar 23 2015
78c457d12e3d	Jiri Kuncar	global: python coding utf-8 header fix	Mar 23 2015
04b68182fe32	Jiri Kuncar	global: HTML escaping of unicode characters	Mar 23 2015

Changes (49)

				Path
	M			docs/conf.py
	M			invenio/base/templates/_macros.html
	M			invenio/ext/gravatar/__init__.py
	M			invenio/legacy/bibindex/engine_utils.py
	M			invenio/legacy/bibindex/engine_washer.py
	M			invenio/legacy/webcomment/templates.py
	M			invenio/modules/alerts/user_settings.py
	M			invenio/modules/annotations/templates/annotations/notes_fragment_base.html
	M			invenio/modules/comments/templates/comments/add_base.html
	M			invenio/modules/comments/templates/comments/add_review_base.html
	M			invenio/modules/comments/templates/comments/comments_base.html
	M			invenio/modules/comments/templates/comments/reviews_base.html
	M			invenio/modules/communities/templates/communities/index_base.html
	M			invenio/modules/communities/templates/communities/new_base.html
	M			invenio/modules/formatter/format_templates/Default_HTML_detailed.bft
	M			invenio/modules/formatter/format_templates/Default_Mobile_detailed.bft
	M			invenio/modules/formatter/format_templates/Picture_HTML_detailed.bft
	M			invenio/modules/formatter/templates/format/record/Default_HTML_detailed.tpl
	M			invenio/modules/formatter/templates/format/record/Default_Mobile_detailed.tpl
	M			invenio/modules/formatter/templates/format/record/Picture_HTML_detailed.tpl
	M			invenio/modules/groups/user_settings.py
	M			invenio/modules/indexer/testsuite/test_indexer_engine_tokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexAuthorCountTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexAuthorTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexCJKTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexDOITokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexDefaultTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexExactAuthorTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexFilenameTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexFilteringTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexFulltextTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexItemCountTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexMultiFieldTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexRecJsonTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexStringTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexTokenizer.py
	M			invenio/modules/indexer/tokenizers/BibIndexYearTokenizer.py
	M			invenio/modules/previewer/templates/previewer/bottom_base.html
	M			invenio/modules/previewer/templates/previewer/pdf_base.html
	M			invenio/modules/previewer/templates/previewer/pdfjs_base.html
	M			invenio/modules/records/recordext/functions/get_pubinfo_standard_form.py
	M			invenio/modules/search/static/js/search/templates/button.mustache
	M			invenio/modules/search/templates/search/results_base.html
	M			invenio/modules/search/templates/search/search_base.html
	M			invenio/modules/workflows/templates/workflows/details_base.html
	M			invenio/testsuite/test_legacy_dbquery.py