Homec4science

Merge branch 'master' into next

Authored by Tibor Simko <tibor.simko@cern.ch> on Dec 19 2011, 15:10.

Description

Merge branch 'master' into next

  • master: (129 commits) BibAuthorID: workflow fix for papers claiming BibAuthorID: UI fix for creation of new person BibFormat: better escape BFE in admin test UI BibFormat: add 'output_pattern' param to BFE_FIELD CKEditor: enable vertical resizing CKEditor: updated to version 3.6.2 BibFormat: added 'label' parameter to bfe_doi WebSubmit: quote filename in URLs from CKEditor WebStyle: display restriction note for bibdocs dbquery: add option with_dict to run_sql() WebSearch: fix alignment of search select boxes WebSubmit: file manager uses CFG_TMPSHAREDDIR BibFormat: fix regression test WebStyle: customize text/password inputs only WebStyle: display restriction flag WebJournal: files of released articles are public installation: fix jquery.form.js URL installation: fix jQuery Jeditable URL BibFormat: fix URL to ejournal resolver WebSession: fix URL to "Your Loans" ...

Conflicts:
Makefile.am
modules/bibcirculation/lib/bibcirculation_webinterface.py
modules/bibcirculation/lib/bibcirculationadminlib.py
modules/bibedit/lib/bibedit_engine.py
modules/bibedit/lib/bibedit_utils.py
modules/bibmerge/lib/bibmerge_webinterface.py
modules/miscutil/lib/inveniocfg.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:0d27fb5b4363: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 19 2011, 15:10

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
821db804d164Samuele Carli/Tibor Simko
BibAuthorID: workflow fix for papers claiming 
Dec 13 2011
06518197023bSamuele Carli/Tibor Simko
BibAuthorID: UI fix for creation of new person 
Dec 12 2011
1f445a054b7bJerome Caffaro/Tibor Simko
BibFormat: better escape BFE in admin test UI 
Dec 12 2011
55861458a54dJerome Caffaro/Tibor Simko
BibFormat: add 'output_pattern' param to BFE_FIELD 
Dec 12 2011
d13e6c429c2dJerome Caffaro/Tibor Simko
CKEditor: enable vertical resizing 
Dec 9 2011
565ab6f5f7e1Jerome Caffaro/Tibor Simko
CKEditor: updated to version 3.6.2 
Dec 9 2011
68498fe40c6eJerome Caffaro/Tibor Simko
BibFormat: added 'label' parameter to bfe_doi 
Dec 9 2011
420ec8599c33Jerome Caffaro/Tibor Simko
WebSubmit: quote filename in URLs from CKEditor 
Dec 9 2011
f9528e36e604Jerome Caffaro/Tibor Simko
WebStyle: display restriction note for bibdocs 
Dec 9 2011
95e3d250ee14Raquel Jimenez Encinar/Tibor Simko
dbquery: add option with_dict to run_sql() 
Dec 8 2011
4c50d990d308Benoit Thiell/Tibor Simko
WebSearch: fix alignment of search select boxes 
Dec 7 2011
afbd9dcc0078Jerome Caffaro/Tibor Simko
WebSubmit: file manager uses CFG_TMPSHAREDDIR 
Dec 7 2011
a5fd241b1e7fJerome Caffaro/Tibor Simko
BibFormat: fix regression test 
Dec 7 2011
ae7f2a50f6bfJerome Caffaro/Tibor Simko
WebStyle: customize text/password inputs only 
Dec 7 2011
06eea92e18a9Jerome Caffaro/Tibor Simko
WebStyle: display restriction flag 
Dec 7 2011
05d59e5579dcJerome Caffaro/Tibor Simko
WebJournal: files of released articles are public 
Dec 7 2011
63d34abb120aTibor Simko
installation: fix jquery.form.js URL 
Dec 7 2011
5d21f4f8b938Tibor Simko
installation: fix jQuery Jeditable URL 
Dec 7 2011
c6777121143bJerome Caffaro/Tibor Simko
BibFormat: fix URL to ejournal resolver 
Dec 7 2011
c9393420b9a5Jerome Caffaro/Tibor Simko
WebSession: fix URL to "Your Loans" 
Dec 7 2011
e830745d33a3Samuele Kaplun/Tibor Simko
bibdocfile: fix bad MSIE check 
Dec 7 2011
ac4801d25e27Samuele Kaplun/Tibor Simko
WebSession: fix in_shibboleth() call 
Dec 1 2011
011dbf8a9c86Tibor Simko
installation: fix --drop-tables action 
Nov 30 2011
f27d2bd0bab8Tibor Simko
installation: drop aidCACHE table 
Nov 30 2011
5badd7db6ef0Carmen Alvarez Perez/Tibor Simko
WebStat: delete custom events when dropping site 
Nov 30 2011
aec32ccc56a1Samuele Carli/Tibor Simko
BibAuthorID: threading improvments 
Nov 30 2011
e02fd63b8a2eJerome Caffaro/Tibor Simko
WebStyle: remove border around form radio buttons 
Nov 29 2011
ef42a7f32530Samuele Carli/Tibor Simko
BibAuthorID: backend improvements 
Nov 29 2011
311b83f994b3Samuele Carli/Tibor Simko
BibAuthorID: fixes and cosmetics 
Nov 28 2011
9edf588a7247Tibor Simko
WebStyle: pre-load citation dictionaries for web 
Nov 25 2011
411f1caab302Benoit Thiell/Tibor Simko
BibRank: lazy loading of citation dictionaries 
Nov 25 2011
0935b38cadafTibor Simko
WebSession: fix crash when no admin user exists 
Nov 25 2011
136217429ac9Jerome Caffaro/Tibor Simko
WebSubmit: fix CKEditor attachments over HTTPS 
Nov 24 2011
87b7efdbb9cdJerome Caffaro/Tibor Simko
bibdocfile: https in CFG_BIBUPLOAD_FFT_ALLOWED_EXTERNAL_URLS 
Nov 24 2011
b315625025b7Tibor Simko
WebJournal: use raquo entity 
Nov 24 2011
f00df61e435cJerome Caffaro/Tibor Simko
WebJournal: add link to article statistics 
Nov 24 2011
ee9a940e2546Samuele Kaplun/Tibor Simko
BibHarvest: reimplementation of OAI repository 
Nov 23 2011
75b4941f27b2Samuele Kaplun/Tibor Simko
WebSession: refresh user detail only in Shibboleth 
Nov 23 2011
b1759372d4e7Tibor Simko
Merge branch 'chayward/refextract-authextract' 
Nov 23 2011
95f6df158b3bChristopher Hayward/Tibor Simko
refextract: use appropriate marc tags 
Nov 23 2011
49989b534236Christopher Hayward/Tibor Simko
refextract: improve affiliated author search 
Nov 23 2011
f12b25aa95c4Christopher Hayward/Tibor Simko
refextract: improve realign numeration 
Nov 23 2011
b48c5ea50500Christopher Hayward/Tibor Simko
refextract: include author choice heuristics 
Nov 23 2011
6b79ae83551aChristopher Hayward/Tibor Simko
refextract: improve author/affiliation extraction 
Nov 23 2011
095c23eb729fChristopher Hayward/Tibor Simko
refextract: attempt at integrating giva 
Nov 23 2011
00cdd58a05b9Christopher Hayward/Tibor Simko
refextract: removes leading whitespace characters 
Nov 23 2011
66e1707ff7bfChristopher Hayward/Tibor Simko
refextract: author replication for IBIDs 
Nov 23 2011
49a679e23b48Christopher Hayward/Tibor Simko
refextract: corrects some issues raised by Annette 
Nov 23 2011
1286b5a3bdaeChristopher Hayward/Tibor Simko
refextract: improved author recognition 
Nov 23 2011
3a38615ce2d7Christopher Hayward/Tibor Simko
refextract: further changes 
Nov 23 2011