Merge pull request #93 from Harvard-University-iCommons/develop

Merging from develop to Master
Merge pull request #95 from Harvard-University-iCommons/develop

Merging UI changes to fix scrolling
Merge pull request #98 from Harvard-University-iCommons/develop

Added  requirements/stage.txt
Merge branch 'develop'

* develop: (32 commits)
  Updated the version of icommons-ui to version 0.7 to get the latest changes.
  Removed comments
  Moved the fade out to getSectionClassList which always gets called on complete
  Removed commented HTML
  Fixes for the display of the success/error message when adding users to a section
  Convert tabs in tests.py to spaces in order for tests to run.
  Fixes: - Include TaEnrollment as a valid enrollment type when getting class and section lists from SDK - Reverse order of sending enrollment_type and enrollment_role to SDK method and make them named parameters instead of positional - Enforce that section_id and enrollment_id are post parameters that must be present by allowing KeyError to trigger if either is not in the POST - Add tests to check for above conditions, as well as one that ensures the SDK enroll method is called with expected parameters
  When editing the section name, make sure the section count stays accurate.
  On remove user from section hover, change the "X" icon to white
  Added to tooltips for removing an adding users to a section
  small changes to templates and tests based on code review
  changes to deal with errors that emerged on qa due to differences between local web server (manage.py) unicorn on qa removed section_name param from one method
  removed extraneous comments
  javascript
  template fixes after code review
  more js fixes
  javascript fix for multiple submits on delete
  javascript tweaks
  minor js
  js tweaks
  ...
Merge branch 'develop'

* develop:
  fixed exception handing messages
  Add error-level logging for the "add_people" sectioning tool to the production settings file.
Merge branch 'develop'

* develop:
  turned on daemonize and set the pid file in the QA gunicorn config
Merge branch 'develop'

* develop:
  Match egg version of canvas-python-sdk in lti_tools base requirements with requirement listed as dependency of icommons_common.
  Revert to original Vagrantfile
  Add updated session inactivity expiration setting to canvas_sdk_settings dictionary in production.
  Use renamed session inactivity request context subclass when instantiating shared context variable.
  Remove unused import from views.  Use RequestContext subclass from icommons_common project to expire sessions after a certain period of inactivity.
  Updated the version of django-icommons-ui to 0.7.1
  PEP-8 cleanup of utils file.  Remove unused logger.
  Removed debugs
  Removed comments/debugs
  Removed redundant url encoding
  Re added slugify to fix issue with delete grayed out after editing a section
  Modified signature to add attribute allow edit as the template expects this attribute
  Using is_primary check to validate primary sections
  Fix for merge conflict remaining in view.py.
  Pass is_primary function result as a variable that indicates whether the section is editable or not - this is essentially the negative of whether the section is considered primary or not.  Modify section_list to use url helper tag.
  Getting section information and passing whether section is primary or not into section detail templates.
  Update for primary section logic
  Update for helper method
  Update for primary section helper method
Merge branch 'develop'

* develop:
  Bumped the version of django-icommons-common to 1.4
Merge branch 'develop'
Merge branch 'develop'

* develop:
  fixed the version number of django-auth-lti
Merge branch 'develop'

* develop:
  there were duplicate test names, when that happens the second method overrides the first, in this case the second test was redundant so it was removed.
  added check for isites_tool_link, the link to the isite should only be shown when there is not isites_tool_link and when there is a topic id.
  Added new unit test for new helper methods
  removed unused imports, fixed some tests, refactored mocks
Merge branch 'develop'

* develop:
  slightly simpler fix
  hotfix for broken reserves tool: code wasn't handling the case where a course is associated with an iSite but that site doesn't have a reserves tool on it.  In any case, we don't even need to try to find that topic now that we're using a standalone topic, so if a standalone topic is configured we will bypass this lookup altogether.
Merge branch 'develop'
Merge pull request #129 from Harvard-University-iCommons/develop

Merge develop to master
Merge branch 'develop'
Merge branch 'develop'

* develop:
  css change
  css change
  added return to map view link at bottom of edit form
  added return to map view link at bottom of edit form
  added return to map view link at bottom of edit form
  removed cancel button
  fixed cancel button
  fixed cancel button
  fixed a few issues with saving permission data as well as length of address field
  updated tool_config
  fixed issue with no location data entered and added logging to display course_id with resource_link_id incase resource link id changes
Merge branch 'develop'

* develop:
  moved video seesion timeout into settings
  refactored some of the code
  changed video timeout to 1 minute for testing
  pointing QA at Prod icommons api, the QA server can't connect to termtool-qa
  pointing icommonsapi at QA
  updated video list session timeout to 15 minutes
  added a session value called video-td to track how long the current video session has been active. We can set a timeout value in the code to expire just the video list when this time has elapsed. This is to prevent the video list from not updating if the user does not close their browser for days.
  removed storing videos in the session
Merge pull request #136 from Harvard-University-iCommons/release

Merge from release to master - QA sign-off
bumped icommons_common to 1.7.1
Merge branch 'hotfix/point_to_icommons_common_1.7.1' into develop