reset author
http://issues.collectionspace.org/browse/UCBG-319
UCBG-344: long accession notes don't display
PAHMA-930, PAHMA-926, PAHMA-811: fieldsets in KIR/OIR, handler update, object count now updates.
UCJEPS-448: initial commit of code to support 'data sources for portals'
PAHMA-922: OIR/KIR choke on long Brief Descriptions
NORJIRA: incremental improvements to solr datasource stuff
NOJIRA: correct schema error: provenance_ss -> provenance_s
PAHMA-931: Added a drop down menu for acceptable alt num types.
Merge remote-tracking branch 'upstream/master'
PAHMA-843: Enable processing barcode scan file from webapp

The barcode scan file upload webapp now processes the files as well in
near-real time, obviating the need for the Talend job and cron script.
Still needs EXTENSIVE testing.
PAHMA-843: Change to cswaMain.py

Wasn't included in first commit by mistake.
PAHMA-914 (Part 2): Removes spurious error messages

Adds a check to make sure that pre-existing non-preferred terms don't
cause error messages in KIR/OIR.
NOJIRA: Fix CollectionStats crash bug

The CollectionStats webapp was crashing because "d was null". This fix
moves the offending code into an addenda that was previously only used
by collectionstats, nicely solving the problem (knock on wood).
PAHMA-937: Tersified EFC names and eliminated None as an EFC

The stats table for EFC no longer contains None, and the percentages are
now calculated based only on items with EFCs. Additionally, the EFC's
were shortened for display on the charts to allow for readibility.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from JulianJaffe/master

NOJIRA: Reconciliate repos