Homec4science
Diffusion invenio-infoscience c6c05f2ba0c6

Merge branch 'master' into next
c6c05f2ba0c6
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 25 2013, 15:01.

Description

Merge branch 'master' into next

  • master: WebSearch: unit test disabling for CFG_CERN_SITE BibDocFile: additional mimetypes support
  • Merge note: amended for lazy imports.

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

Conflicts:
modules/websearch/lib/search_engine_unit_tests.py

Details

Committed
Tibor Simko <tibor.simko@cern.ch>Jun 25 2013, 15:04
Parents
R3600:45b717d9129f: Merge branch 'maint-1.1'
R3600:6e56b1e3e861: WebComment: guest commenting/reviewing not allowed
Branches
Unknown
Tags
Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:c6c05f2ba0c6: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 25 2013, 15:04

Merged Changes

CommitAuthorDetailsCommitted
45b717d9129fTibor Simko
Merge branch 'maint-1.1' 
Jun 25 2013
5ca855221cb2Jerome Caffaro/Tibor Simko
WebSearch: unit test disabling for CFG_CERN_SITE 
Jun 25 2013
b98f24bf38b9Samuele Kaplun/Tibor Simko
BibDocFile: additional mimetypes support 
Jun 24 2013

Changes (4)

Path
Mconfig/invenio.conf
Mmodules/bibdocfile/lib/bibdocfile.py
Mmodules/miscutil/lib/inveniocfg.py
Mmodules/websearch/lib/search_engine_unit_tests.py

R3600:c6c05f2ba0c6

View Options

config/invenio.conf

Loading...
View Options

modules/bibdocfile/lib/bibdocfile.py

Loading...
View Options

modules/miscutil/lib/inveniocfg.py

Loading...
View Options

modules/websearch/lib/search_engine_unit_tests.py

Loading...
c4science · Help