Homec4science

Merge branch 'jgarcial/bibcirculation-fixing'

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 24 2010, 15:02.

Description

Merge branch 'jgarcial/bibcirculation-fixing'

  • jgarcial/bibcirculation-fixing: BibCirculation: less strict item check before ILL BibCirculation: code cleaned using kwalitee check BibCirculation: several fixes in ILL requests BibCirculation: several fixes BibCirculation: fixed main menu links BibCirculation: jQuery added and bugs fixed BibCirculation: several fixes
  • Solved conflicts:

Makefile.am

  • Other amendments done during merge:
    • Use version 1.7.2 of jQuery datepicker (latest has files renamed, and needs some further edits).
    • Fixed two cases of wrong function calls (deletion of uid).
    • Added metaheader to Holdings tab to have nice calendar display.

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:e2a978e7746f: Merge branch 'jgarcial/bibcirculation-fixing' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 24 2010, 15:02

Merged Changes

CommitAuthorDetailsCommitted
72a8c785fbcdJaime Garcia Llopis
BibCirculation: less strict item check before ILL 
Feb 23 2010
39c38db1553aJaime Garcia Llopis
BibCirculation: code cleaned using kwalitee check 
Feb 23 2010
36e498aefcf3Jaime Garcia Llopis
BibCirculation: several fixes in ILL requests 
Feb 23 2010
7f0346cecba7Jaime Garcia Llopis
BibCirculation: several fixes 
Feb 23 2010
bedae11d5e7bJaime Garcia Llopis
BibCirculation: fixed main menu links 
Feb 23 2010
b91ffc7da51aJaime Garcia Llopis
BibCirculation: jQuery added and bugs fixed 
Feb 23 2010
654fb8af623bJaime Garcia Llopis/Nikolaos Kasioumis
BibCirculation: several fixes 
Feb 2 2010