fix test 2 (site member can skip pinserver) #1028
change order of site member & pinserver checks #1527

first try to serve private file to site members, then fallback to
pinserver if that fails.
#1546: Only display one date for events on the Upcoming Events page.
Merge branch 'SCHOLAR-3.2' into SCHOLAR-3.x
update os_software w/ filefield path settings #1277
Merge branch 'SCHOLAR-3.2' into SCHOLAR-3.x
Slideshow size slider uses same size limits as original textfield.  #1540

The slideshow was actually using the same javascript as the other slideshow.  Copied it into HC slideshow's javascript and updated it to use min/max from settings instead of hardcoded 400/960.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into SCHOLAR-3.x
Fixed change note settings in os_publications.  #1443

That was bigger than expected.  In d6 we used to have another menu path for loading app settings in a popup or without js.  That was never implemented.  I added the menu item and set up a callback to return ajax (or route you to the cp).  Updated the submit function that closes the modal.  While I was in there I also added a little ajax to update the note settings after the form saves.  It was that or reload the page.
SV list uses OSNodeFIeldQuery instead of EFQ.  #313

Testing out OSNFQ by using it instead of the EFQ in sv list.  So far so good.
#1546: Remove extra dates in colorbox mode of the calendar.
add global ga settings form, add ga link tracking #746
use ctools_include for OSNodeFieldQuery example and usage #313
Group site and courses when readded the course with the field collection.
Hook menu for defining the environment setting to the behat test.
Remove text assert due to failure of the beaht test.
Remove drush_print_r().
Merge pull request #1555 from openscholar/1554

Remove drush_print_r().
Merge pull request #1553 from openscholar/1485-2

Group site and courses when readded the course with the field collection.
Added patch to fix asterisk issue on required URL fields, also updated the url field to be required in the reader content type to allow for validation.  #407