Diffusion invenio-infoscience 2461c205a758

Merge branch 'master' into next
2461c205a758
Actions

Authored by kuncar on Jun 7 2014, 12:16.

Description

Merge branch 'master' into next

Conflicts:
configure.ac
invenio/legacy/bibrank/adminlib.py
invenio/legacy/search_engine/__init__.py
invenio/legacy/websearch/adminlib.py
invenio/legacy/websearch/templates.py
invenio/utils/plotextractor/cli.py
invenio/utils/plotextractor/getter.py
modules/miscutil/demo/democfgdata.sql
modules/websearch/doc/hacking/Makefile.am
modules/websearch/lib/Makefile.am
modules/websearch/lib/websearch_regression_tests.py
modules/websearch/lib/websearchadmin_regression_tests.py
modules/websubmit/lib/functions/Makefile.am

Details

Committed

kuncar

Jun 7 2014, 14:49

Parents

R3600:576f5c8f3915: I18N: POTFILES.in update
R3600:1a6232bbf316: jsonalchemy: fix for `__additional_info__` access

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:2461c205a758: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Jun 7 2014, 14:49

Merged Changes

Commit	Author	Details	Committed
576f5c8f3915	Tibor Simko	I18N: POTFILES.in update	Nov 28 2013
f4cfc5761139	Tibor Simko	installation: table creation fix	Nov 28 2013
f7385db80a33	Jerome Caffaro/Tibor Simko	WebSearch: search services	Nov 28 2013
d40cd7d1f886	Jerome Caffaro/Tibor Simko	WebSearch: custom i18n collection boxes	Nov 28 2013
b5811c3e43e2	Jerome Caffaro/Tibor Simko	BibEditMulti: display all MARC fields	Nov 28 2013
c471d70ac987	Jerome Caffaro/Tibor Simko	plotextractor: more shell argument escaping	Nov 28 2013
a886f4811cac	Jerome Caffaro/Tibor Simko	WebSubmit: new Run_PlotExtractor function	Nov 28 2013
771004f9f471	Jerome Caffaro/Tibor Simko	plotextractor: process files of a record	Nov 28 2013
ab606126e0e4	Jerome Caffaro/Tibor Simko	plotextractor: fix CLI parameters parsing	Nov 28 2013

Changes (38)

		Path
M		config/invenio.conf
M		invenio/base/static/css/invenio.css
M		invenio/legacy/bibeditmulti/engine.py
M		invenio/legacy/bibrank/adminlib.py
M		invenio/legacy/bibrecord/doc/hacking/bibrecord-internals.webdoc
M		invenio/legacy/miscutil/sql/tabcreate.sql
M		invenio/legacy/miscutil/sql/tabdrop.sql
M		invenio/legacy/miscutil/sql/tabfill.sql
M		invenio/legacy/search_engine/__init__.py
M		invenio/legacy/websearch/adminlib.py
M		invenio/legacy/websearch/doc/admin/websearch-admin-guide.webdoc
M		invenio/legacy/websearch/doc/hacking/search-engine-internals.webdoc
A		invenio/legacy/websearch/doc/hacking/search-services.webdoc
M		invenio/legacy/websearch/templates.py
M		invenio/legacy/websearch/webcoll.py
A		invenio/legacy/websubmit/functions/Run_PlotExtractor.py
M		invenio/modules/search/config.py
M		invenio/modules/search/models.py
M		invenio/modules/search/registry.py
A	(dir)	invenio/modules/search/searchext/
P		invenio/modules/search/searchext/__init__.py Copied from docs/__init__.py
A	(dir)	invenio/modules/search/searchext/services/
A		invenio/modules/search/searchext/services/CollectionNameSearchService.py
P		invenio/modules/search/searchext/services/FAQKBService.py Copied from invenio/utils/memoise.py
A		invenio/modules/search/searchext/services/LHCBeamStatusService.py
A		invenio/modules/search/searchext/services/MathCalculatorService.py
A		invenio/modules/search/searchext/services/SubmissionNameSearchService.py
A		invenio/modules/search/searchext/services/WeatherService.py
P		invenio/modules/search/searchext/services/__init__.py Copied from docs/__init__.py
A		invenio/modules/search/services.py
M		invenio/modules/submit/fixtures.py
P		invenio/modules/upgrader/upgrades/invenio_2013_02_06_new_collectionboxname_table.py Copied from invenio/modules/upgrader/upgrades/invenio_2013_01_08_new_goto_table.py
P		invenio/modules/upgrader/upgrades/invenio_2013_04_30_new_plotextractor_websubmit_function.py Copied from invenio/modules/upgrader/upgrades/invenio_2013_02_01_oaiREPOSITORY_last_updated.py
M		invenio/utils/plotextractor/cli.py
M		invenio/utils/plotextractor/converter.py
M		invenio/utils/plotextractor/getter.py
M		invenio/utils/plotextractor/output_utils.py
M		po/POTFILES.in

Merge branch 'master' into next2461c205a758Actions

Description

Details

Event Timeline

Merged Changes

Changes (38)

R3600:2461c205a758

config/invenio.conf

invenio/base/static/css/invenio.css

invenio/legacy/bibeditmulti/engine.py

invenio/legacy/bibrank/adminlib.py

invenio/legacy/bibrecord/doc/hacking/bibrecord-internals.webdoc

invenio/legacy/miscutil/sql/tabcreate.sql

invenio/legacy/miscutil/sql/tabdrop.sql

invenio/legacy/miscutil/sql/tabfill.sql

invenio/legacy/search_engine/__init__.py

invenio/legacy/websearch/adminlib.py

invenio/legacy/websearch/doc/admin/websearch-admin-guide.webdoc

invenio/legacy/websearch/doc/hacking/search-engine-internals.webdoc

invenio/legacy/websearch/doc/hacking/search-services.webdoc

invenio/legacy/websearch/templates.py

invenio/legacy/websearch/webcoll.py

invenio/legacy/websubmit/functions/Run_PlotExtractor.py

invenio/modules/search/config.py

invenio/modules/search/models.py

invenio/modules/search/registry.py

invenio/modules/search/searchext/__init__.py

invenio/modules/search/searchext/services/CollectionNameSearchService.py

invenio/modules/search/searchext/services/FAQKBService.py

invenio/modules/search/searchext/services/LHCBeamStatusService.py

invenio/modules/search/searchext/services/MathCalculatorService.py

invenio/modules/search/searchext/services/SubmissionNameSearchService.py

invenio/modules/search/searchext/services/WeatherService.py

invenio/modules/search/searchext/services/__init__.py

invenio/modules/search/services.py

invenio/modules/submit/fixtures.py

invenio/modules/upgrader/upgrades/invenio_2013_02_06_new_collectionboxname_table.py

invenio/modules/upgrader/upgrades/invenio_2013_04_30_new_plotextractor_websubmit_function.py

invenio/utils/plotextractor/cli.py

invenio/utils/plotextractor/converter.py

invenio/utils/plotextractor/getter.py

invenio/utils/plotextractor/output_utils.py

po/POTFILES.in

Merge branch 'master' into next
2461c205a758
Actions

invenio/legacy/search_engine/init.py

invenio/modules/search/searchext/init.py

invenio/modules/search/searchext/services/init.py