Diffusion invenio-infoscience 763217363f14

Merge branch 'master' into next
763217363f14
Actions

Authored by kuncar on Oct 1 2014, 13:48.

Description

Merge branch 'master' into next

master: (34 commits) WebSearch: richer /record and /search API docs docs: initial release of CONTRIBUTING guide SolrUtils: fix of similar-to-recid result order BibRank: fix of similar-to-recid result order WebSubmit: link to successfully created record WebSearch: fix for record numbering in pagination BibMerge: onclickSubmitButton missing comma fix webcoll: fix for "--language" option WebSearch: new Add-to-Search Interface Invenio v1.1.4 I18N: PO file update for the release of v1.1.4 Invenio v1.0.7 I18N: PO file update for the release of v1.0.7 sequtils: more robust cnum generation BibSort: last_updated column name typo fix OAIRepository: OAI-PMH handler URL documented BibDocFile: FFT comment/description documentation BibRank: (Overflow|ZeroDivision)Error usability WebSession: CSRF token in profiling settings WebSession: CSRF token in API key settings form ...

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>

Conflicts:
INSTALL
RELEASE-NOTES
invenio/legacy/bibdocfile/cli.py
invenio/legacy/bibrank/word_indexer.py
invenio/legacy/inveniocfg.py
invenio/legacy/websearch/templates.py
invenio/legacy/websearch/webcoll.py
invenio/legacy/websearch/webinterface.py
invenio/legacy/websession/webinterface.py
invenio/legacy/websubmit/functions/Print_Success.py
invenio/legacy/webuser.py
modules/bibrank/lib/bibrank_regression_tests.py
modules/oaiharvest/lib/oai_harvest_daemon.py
modules/oaiharvest/lib/oai_harvest_web_tests.py
modules/websearch/doc/hacking/Makefile.am
modules/websearch/lib/search_engine_config.py
modules/websearch/lib/websearch_regression_tests.py
modules/websession/lib/websession_regression_tests.py
modules/websubmit/lib/websubmit_web_tests.py

Details

Committed

kuncar

Oct 1 2014, 15:47

Parents

R3600:ec657e820c2b: WebSearch: richer `/record` and `/search` API docs
R3600:43e0b56d4a1b: installation: setuptools>=2.2

Branches

Unknown

Tags

Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:763217363f14: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Oct 1 2014, 15:47

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
ec657e820c2b	Tibor Simko	WebSearch: richer `/record` and `/search` API docs	Sep 24 2014
359c6953b8d5	Tibor Simko	Merge branch 'maint-1.1'	Sep 23 2014
41de6d034742	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Sep 23 2014
31ff1093a17a	Tibor Simko	docs: initial release of CONTRIBUTING guide	Sep 23 2014
94042f384c41	Patrick Glauner/Tibor Simko	SolrUtils: fix of similar-to-recid result order	Sep 8 2014
f6b5508a8532	Patrick Glauner/Tibor Simko	BibRank: fix of similar-to-recid result order	Sep 8 2014
40eb4d981ae3	Patrick Glauner/Tibor Simko	WebSubmit: link to successfully created record	Sep 8 2014
bf4fee0d7f9a	Nikolaos Kasioumis/Tibor Simko	WebSearch: fix for record numbering in pagination	Sep 8 2014
08e4307aa39d	Øystein Blixhavn/Tibor Simko	BibMerge: `onclickSubmitButton` missing comma fix	Sep 8 2014
dc985490db8c	Patrick Glauner/Tibor Simko	webcoll: fix for "--language" option	Sep 5 2014
d628da3b0338	Ludmila Marian/Tibor Simko	WebSearch: new Add-to-Search Interface	Sep 5 2014
66fdd13d32c7	Tibor Simko	Merge branch 'maint-1.1'	Aug 31 2014
6bfbf71fd1e7	Tibor Simko	Invenio v1.1.4	Aug 31 2014
373fe04b30e6	Tibor Simko	Merge branch 'maint-1.1'	Aug 31 2014
25b9f2d8d925	Tibor Simko	Merge branch 'maint-1.1'	Aug 31 2014
b024897c492d	Tibor Simko	I18N: PO file update for the release of v1.1.4	Aug 31 2014
9c907620df53	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 31 2014
8381efa28cfb	Tibor Simko	Invenio v1.0.7	Aug 31 2014
f60eec3f3ae1	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 31 2014
03f20dddf968	Tibor Simko	I18N: PO file update for the release of v1.0.7	Aug 31 2014
6c31dadc1d6b	Tibor Simko	Merge branch 'maint-1.1'	Aug 28 2014
8ef05d72e74f	Samuele Kaplun/Tibor Simko	sequtils: more robust cnum generation	Aug 28 2014
7bb00d29e824	Tibor Simko	Merge branch 'maint-1.1'	Aug 28 2014
ec2edc2271aa	Ludmila Marian/Tibor Simko	BibSort: `last_updated` column name typo fix	Aug 28 2014
72456133160e	Tibor Simko	Merge branch 'maint-1.1'	Aug 28 2014
5a923978aae5	Samuele Kaplun/Tibor Simko	OAIRepository: OAI-PMH handler URL documented	Aug 28 2014
abadedda4513	Tibor Simko	Merge branch 'maint-1.1'	Aug 27 2014
96b23a3c6566	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 27 2014
26c1ec630496	Samuele Kaplun/Tibor Simko	BibDocFile: FFT comment/description documentation	Aug 27 2014
18f48e46ffc1	Tibor Simko	Merge branch 'maint-1.1'	Aug 27 2014
60f11d20f3bf	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 27 2014
d766aa2e7802	Samuele Kaplun/Tibor Simko	BibRank: (Overflow\|ZeroDivision)Error usability	Aug 27 2014
cb0250b85904	Tibor Simko	WebSession: CSRF token in profiling settings	Aug 26 2014
d58147e92387	Tibor Simko	Merge branch 'maint-1.1'	Aug 26 2014
0ec4b95a7591	Tibor Simko	WebSession: CSRF token in API key settings form	Aug 26 2014
c2d328168565	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 26 2014
729701ada450	Tibor Simko	WebSession: CSRF tokens in account settings forms	Aug 26 2014
a1f3e33170ed	Jan Aage Lavik/Tibor Simko	BibDocFile: duplicate docname fix	Aug 25 2014
b0c92b46eb8a	Nikolaos Kasioumis/Tibor Simko	WebSubmit: more robust JavaScript check	Aug 24 2014
7244d6df88b9	Nikolaos Kasioumis/Tibor Simko	WebSubmit: print white space instead of None	Aug 24 2014
c53a08301c55	Nikolaos Kasioumis/Tibor Simko	WebSubmit: support for elements' custom_level	Aug 24 2014
19e8b051cd55	Tibor Simko	WebSubmit: `test_revise_picture_admin` test fix	Aug 24 2014
9c8241a51651	Tibor Simko	WebSubmit: `deferRelatedFormatsCreation` param fix	Aug 24 2014
fdf92b9c2030	Sebastian Witowski/Tibor Simko	Bibdocfile: change_name missing parameter fix	Aug 24 2014
abf9899a327d	Sebastian Witowski/Tibor Simko	BibDocFile: change name failure raises exception	Aug 23 2014
5abaede494e1	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Aug 23 2014
aba5932488be	Ludmila Marian/Tibor Simko	I18N: fix gender problem in a French translation	Aug 22 2014
7566ada82d36	Samuele Kaplun/Tibor Simko	BibDocFile: more robust decompose_bibdocfile_url()	Aug 22 2014
3f15d3868c58	Jan Aage Lavik/Tibor Simko	OAIHarvest: conversion argument name upgrade	Aug 22 2014
22928505b5e6	Sebastian Witowski/Tibor Simko	WebSubmit: Link_Records error message fix	Aug 22 2014

Changes (39)

				Path
	M			AUTHORS
	A			CONTRIBUTING.rst
	M			NEWS
	M			RELEASE-NOTES
	M			config/invenio.conf
	M			invenio/base/config.py
	M			invenio/base/static/css/invenio.css
	M			invenio/base/translations/fr/LC_MESSAGES/messages.po
	M			invenio/legacy/bibdocfile/api.py
	M			invenio/legacy/bibdocfile/cli.py
	M			invenio/legacy/bibdocfile/managedocfiles.py
	M			invenio/legacy/bibdocfile/templates.py
	M			invenio/legacy/bibrank/word_indexer.py
	M			invenio/legacy/bibrank/word_searcher.py
	M			invenio/legacy/bibsort/engine.py
	M			invenio/legacy/bibupload/doc/admin/bibupload-admin-guide.webdoc
	M			invenio/legacy/inveniocfg.py
	M			invenio/legacy/miscutil/solrutils_bibrank_searcher.py
	M			invenio/legacy/miscutil/sql/tabfill.sql
	M			invenio/legacy/oairepository/doc/admin/oairepository-admin-guide.webdoc
	M			invenio/legacy/search_engine/__init__.py
	A			invenio/legacy/websearch/doc/hacking/record-api.webdoc
	M			invenio/legacy/websearch/doc/hacking/search-engine-api.webdoc
	M			invenio/legacy/websearch/doc/hacking/search-engine-internals.webdoc
	M			invenio/legacy/websearch/templates.py
	M			invenio/legacy/websearch/webcoll.py
	M			invenio/legacy/websearch/webinterface.py
	M			invenio/legacy/websession/templates.py
	M			invenio/legacy/websession/webaccount.py
	M			invenio/legacy/websession/webinterface.py
	M			invenio/legacy/websubmit/engine.py
	M			invenio/legacy/websubmit/functions/Create_Modify_Interface.py
	M			invenio/legacy/websubmit/functions/Link_Records.py
	M			invenio/legacy/websubmit/functions/Print_Success.py
	M			invenio/legacy/websubmit/templates.py
	M			invenio/legacy/webuser.py
	M			invenio/modules/merger/static/js/merger/engine.js
	M			invenio/modules/sequencegenerator/cnum.py
	P			invenio/modules/upgrader/upgrades/invenio_2014_06_02_oaiHARVEST_arguments_cfg_namechange.py Copied from invenio/modules/upgrader/upgrades/invenio_2012_11_15_hstRECORD_marcxml_longblob.py

Merge branch 'master' into next763217363f14Actions

Description

Details

Event Timeline

Merged Changes

Changes (39)

R3600:763217363f14

AUTHORS

CONTRIBUTING.rst

NEWS

RELEASE-NOTES

config/invenio.conf

invenio/base/config.py

invenio/base/static/css/invenio.css

invenio/base/translations/fr/LC_MESSAGES/messages.po

invenio/legacy/bibdocfile/api.py

invenio/legacy/bibdocfile/cli.py

invenio/legacy/bibdocfile/managedocfiles.py

invenio/legacy/bibdocfile/templates.py

invenio/legacy/bibrank/word_indexer.py

invenio/legacy/bibrank/word_searcher.py

invenio/legacy/bibsort/engine.py

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

invenio/legacy/inveniocfg.py

invenio/legacy/miscutil/solrutils_bibrank_searcher.py

invenio/legacy/miscutil/sql/tabfill.sql

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

invenio/legacy/search_engine/__init__.py

invenio/legacy/websearch/doc/hacking/record-api.webdoc

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

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

invenio/legacy/websearch/templates.py

invenio/legacy/websearch/webcoll.py

invenio/legacy/websearch/webinterface.py

invenio/legacy/websession/templates.py

invenio/legacy/websession/webaccount.py

invenio/legacy/websession/webinterface.py

invenio/legacy/websubmit/engine.py

invenio/legacy/websubmit/functions/Create_Modify_Interface.py

invenio/legacy/websubmit/functions/Link_Records.py

invenio/legacy/websubmit/functions/Print_Success.py

invenio/legacy/websubmit/templates.py

invenio/legacy/webuser.py

invenio/modules/merger/static/js/merger/engine.js

invenio/modules/sequencegenerator/cnum.py

invenio/modules/upgrader/upgrades/invenio_2014_06_02_oaiHARVEST_arguments_cfg_namechange.py

Merge branch 'master' into next
763217363f14
Actions

invenio/legacy/search_engine/init.py