Homec4science

Merge branch 'master' into next

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 20 2013, 15:10.

Description

Merge branch 'master' into next

  • master: (61 commits) OAIHarvest: for for bad exception handling BibIndex: index type in admin interface BibIndex: virtual global index BibIndex: indexing only affected indexes BibEncode: support for FFmpeg >= v0.9 BibEncode: updated for latest BibDocFile APIs BibEdit: send latest timestamp when reverting BibField: fix number_of_copies field BibRank: no citerank error when no citations BibAuthority: separate Authorities collection installation: location of flot BibCirculation: minor spelling error fix BibUpload: pretend holding pen fix errorlib: wrap warnings to invenio.err BibIndex: clean warning messages in test suite installation: Python-2.6 and pip requirements dbquery: closes redundant connection BibIndex: filetype and itemcount tokenizer fix BibUpload: fill affected_fields in hstRECORD I18N: initial Persian (Farsi) translation ...

Conflicts:
INSTALL
THANKS
configure-tests.py
modules/bibfield/lib/bibfield.py
modules/bibfield/lib/bibfield_regression_tests.py
modules/bibfield/lib/bibfield_utils_unit_tests.py
modules/bibfield/lib/functions/check_field_type.py
modules/bibformat/etc/output_formats/HB.bfo
modules/bibformat/etc/output_formats/HD.bfo
modules/bibformat/lib/bibformat_regression_tests.py
modules/bibindex/lib/bibindex_engine_tokenizer_unit_tests.py
modules/bibindex/lib/bibindex_engine_unit_tests.py
modules/bibupload/lib/bibupload_revisionverifier_regression_tests.py
modules/websearch/lib/search_engine_query_parser.py
modules/websearch/lib/websearch_regression_tests.py
modules/websession/lib/webuser.py
modules/webstyle/lib/invenio.wsgi
requirements-extras.txt
requirements.txt

  • NOTE During merge, introduced new SQLAlchemy models, introduced new demo site fixtures, amended most unit and regression tests, amended BibField, with a total of more than 2000 LOCs changed.

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

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:a9cd3d4e3376: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 26 2013, 16:06

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
205bafa0b018Tibor Simko
Merge branch 'maint-1.1' 
Nov 19 2013
4b0328d3a22bJan Aage Lavik/Tibor Simko
OAIHarvest: for for bad exception handling 
Nov 19 2013
5b2e95a34c4bGrzegorz Szpura/Tibor Simko
BibIndex: index type in admin interface 
Nov 17 2013
f0a0b02c3b14Grzegorz Szpura/Tibor Simko
BibIndex: virtual global index 
Nov 17 2013
c5d715921e38Grzegorz Szpura/Tibor Simko
BibIndex: indexing only affected indexes 
Nov 17 2013
5488dba6ddbaJerome Caffaro/Tibor Simko
BibEncode: support for FFmpeg >= v0.9 
Nov 14 2013
b2f5b49f96acJerome Caffaro/Tibor Simko
BibEncode: updated for latest BibDocFile APIs 
Nov 14 2013
e0184fbf29a9Javier Martin Montull/Tibor Simko
BibEdit: send latest timestamp when reverting 
Nov 13 2013
d892ccd89ec1Esteban J. G. Gabancho/Tibor Simko
BibField: fix number_of_copies field 
Nov 13 2013
45df2263dfb5Ludmila Marian/Tibor Simko
BibRank: no citerank error when no citations 
Nov 13 2013
89bde74db06cTibor Simko
BibAuthority: separate Authorities collection 
Nov 12 2013
82466f9b2a9fTibor Simko
Merge branch 'maint-1.1' 
Nov 12 2013
edfdee506aeeTibor Simko
installation: location of flot 
Nov 12 2013
dda38783c7fbRaja Sripada/Tibor Simko
BibCirculation: minor spelling error fix 
Nov 11 2013
963cacf3b10cSamuele Kaplun/Tibor Simko
BibUpload: pretend holding pen fix 
Nov 8 2013
4047f19bf128Samuele Kaplun/Tibor Simko
errorlib: wrap warnings to invenio.err 
Nov 7 2013
ffe86970fd01Grzegorz Szpura/Tibor Simko
BibIndex: clean warning messages in test suite 
Nov 7 2013
6dad999a0f95Tibor Simko
installation: Python-2.6 and pip requirements 
Nov 5 2013
924595f8d604Tibor Simko
Merge branch 'maint-1.1' 
Nov 5 2013
b463dc481891Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Nov 4 2013
c8713cb10855Samuele Kaplun/Tibor Simko
dbquery: closes redundant connection 
Nov 4 2013
722057b107e4Grzegorz Szpura/Tibor Simko
BibIndex: filetype and itemcount tokenizer fix 
Nov 4 2013
405e40f33a8fGrzegorz Szpura/Tibor Simko
BibUpload: fill affected_fields in hstRECORD 
Nov 1 2013
46f4ef3d663aMehdi Zahedi/Tibor Simko
I18N: initial Persian (Farsi) translation 
Oct 31 2013
26ed3d5ad324Tibor Simko
I18N: infrastructure for Persian (Farsi) 
Oct 31 2013
840a183030d8Esteban J. G. Gabancho/Tibor Simko
BibField: new upgrade recipe to remove json cache 
Oct 29 2013
561b7993bfa8Esteban J. G. Gabancho/Tibor Simko
BibField: new field filtering for `get_record` 
Oct 29 2013
1150545447fbEsteban J. G. Gabancho/Tibor Simko
BibField: elimination of None values in recjson 
Oct 29 2013
e2272aef8335Esteban J. G. Gabancho/Tibor Simko
BibField: `schema` in `split_blob` 
Oct 29 2013
2ac335b4ac5bEsteban J. G. Gabancho/Tibor Simko
BibField: `is_empty` update 
Oct 29 2013
86e2e48edca3Esteban J. G. Gabancho/Tibor Simko
BibField: fix for '__eq__' to better compare recs 
Oct 29 2013
467f8627ae71Esteban J. G. Gabancho/Tibor Simko
BibField: fix for `is_type_isbn` 
Oct 29 2013
cf40c5160410Esteban J. G. Gabancho/Tibor Simko
BibField: continuable vs fatal errors 
Oct 29 2013
87460835099aEsteban J. G. Gabancho/Tibor Simko
BibField: bibdoc integration 
Oct 29 2013
ee7d925db1b8Esteban J. G. Gabancho/Tibor Simko
BibField: new decorator @only_if_master_format 
Oct 29 2013
7449af94dec0Esteban J. G. Gabancho/Tibor Simko
BibField: better handling of calculated fields 
Oct 29 2013
346c489a030aEsteban J. G. Gabancho/Tibor Simko
BibField: fix for misbehavior when parsing rules 
Oct 29 2013
8ec687d2f571Esteban J. G. Gabancho/Tibor Simko
BibField: new producer section added to config 
Oct 29 2013
39565923d135Esteban J. G. Gabancho/Tibor Simko
BibField: clean up of atlantis.cfg demo file 
Oct 29 2013
2e4215934fa8Tibor Simko
installation: information about unidecode 
Oct 25 2013
53f4d452135bGrzegorz Szpura/Tibor Simko
BibIndex: new index 'filetype' 
Oct 18 2013
68424150aa1bRaja Sripada/Tibor Simko
BibCirculation: fix for mandatory library type 
Oct 18 2013
4d22ede853e8Tibor Simko
WebSearch: item count regression test activation 
Oct 18 2013
cfc4eef6802bTibor Simko
Merge branch 'maint-1.1' 
Oct 18 2013
23b2ae21ff73Tibor Simko
BibFormat: fix for BibTeX regression tests 
Oct 18 2013
b5e681a16b0cTibor Simko
WebSearch: fix for BibTeX regression tests 
Oct 18 2013
fc4067d15b19Grzegorz Szpura/Tibor Simko
BibIndex: new index 'itemcount' 
Oct 18 2013
1d8b7e2539d9Grzegorz Szpura/Tibor Simko
BibIndex: tokenisation of authority records 
Oct 18 2013
428b778502f0Tibor Simko
Merge branch 'maint-1.1' 
Oct 18 2013
eb53cc6308a1David Bengoa/Tibor Simko
I18N: several fixes in Spanish translation 
Oct 18 2013