Homec4science

Merge branch 'master' into next

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 11 2013, 17:27.

Description

Merge branch 'master' into next

  • master: WebSearch: asciification of oe grapheme WebSearch: bug fix for SPIRES date math search BibUpload: conflicting revision ticket queue BibRecord: new API records_identical() BibUpload: smart record uploader fixes BibUpload: BibCatalog connection BibUpload: sensible history and other goodies BibUpload: bibrec timestamp bug BibUpload: smart record uploader BibRecord: new API identical_records() BibSched: enhanced write_message() installation: help for BibAuthorID email settings BibCatalog: default email backend BibCatalog: new email ticketing backend

Conflicts:
modules/bibupload/lib/bibupload_regression_tests.py

  • NOTE Amended lazy import in some regression tests during merge.

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

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:df626433ef4d: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 11 2013, 18:00

Merged Changes

CommitAuthorDetailsCommitted
f117aa230631Tibor Simko
Merge branch 'maint-1.1' 
Sep 11 2013
4b91292219eaTibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Sep 11 2013
15fdcaf87875Tibor Simko
WebSearch: asciification of `oe` grapheme 
Sep 11 2013
bafb1ea782e5Alessio Deiana/Tibor Simko
WebSearch: bug fix for SPIRES date math search 
Sep 10 2013
03e0ddd9302fTibor Simko
BibUpload: conflicting revision ticket queue 
Sep 10 2013
382d02fe25b3Tibor Simko
BibRecord: new API records_identical() 
Sep 10 2013
2a5dd51f0604Samuele Kaplun/Tibor Simko
BibUpload: smart record uploader fixes 
Sep 10 2013
31de2db26c3eSamuele Kaplun/Tibor Simko
BibUpload: BibCatalog connection 
Sep 10 2013
d1921bc5af77Samuele Kaplun/Tibor Simko
BibUpload: sensible history and other goodies 
Sep 10 2013
7095b2186a57Samuele Kaplun/Tibor Simko
BibUpload: bibrec timestamp bug 
Sep 10 2013
4ef4798b60d1Vasanth Venkatraman/Tibor Simko
BibUpload: smart record uploader 
Sep 10 2013
85b97465dadfSamuele Kaplun/Tibor Simko
BibRecord: new API identical_records() 
Sep 10 2013
f8c2403dd5f8Samuele Kaplun/Tibor Simko
BibSched: enhanced write_message() 
Sep 10 2013
cc830df95d95Tibor Simko
installation: help for BibAuthorID email settings 
Sep 10 2013
28b6eb414174Tibor Simko
BibCatalog: default email backend 
Sep 10 2013
cdb8ab53fe64Eduardo Benavidez/Tibor Simko
BibCatalog: new email ticketing backend 
Sep 9 2013