CLC-3622 - Resolve intermittent issue with 'Add People' tool link
CLC-3622 - Optimized Javascript conditional logic
Updated active_attr gem from version 0.8.1 to 0.8.3
  gem "active_attr", "~> 0.8.3"
Updated all the jdbc adapters to v1.3.7
  gem "activerecord-jdbc-adapter", "~> 1.3.7"
  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.7"
  gem "activerecord-jdbch2-adapter", "~> 1.3.7"
  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.7"
OEC-272 Filter CCNs in chunks of 1000 to prevent Oracle syntax error
OEC-272 Add test to exercise large numbers of CCNs in query
OEC-272 Send CCN as string in test
Merge pull request #2451 from chikoon/CLC-3685-update-gems-1

CLC-3685-update-gems-1
Merge pull request #2452 from ctweney/oec-272

OEC-272 Fix Oracle error with more than 1000 ccns
Merge pull request #2449 from redconfetti/CLC-3622-canvas-fix-add-people-link

CLC-3622 - Resolve intermittent issue with 'Add People' tool link
CLC-3563 Anchor now wraps in Recent Activity
Merge pull request #2447 from NolanChan/CLC-3563

CLC-3563 Anchor now wraps in Recent Activity
CLC-3636-fix For IE and Firefox
Merge pull request #2446 from NolanChan/CLC-3636-fix

CLC-3636-fix For IE and Firefox
CLC-3594: NameError in MyActivitiesController#get_feed

https://jira.ets.berkeley.edu/jira/browse/CLC-3594

Renamed app/models/my_activities/canvas.rb to app/models/my_activities/canvas_activities.rb
CLC-3594: NameError in MyActivitiesController#get_feed

https://jira.ets.berkeley.edu/jira/browse/CLC-3594

Separated the class Canvas from the module MyActivities and renamed
the class CanvasActvities to avoid confusion with the modlule named
canvas.

As Chris pointed out, this was happening because
app/models/my_activities/canvas.rb had the same name
as Canvas the module.

Confirmed that the NameError in MyActivitiesController#get_feed
no longer appears.
OEC-274 Readme update
NOJIRA-separate-MyActivities-classes-from-module

In MyActivities, changed module::class to module;class so that the
class really has the parent MyActivities

  MyActivities::DashboardSites
  MyActivities::NotificationActivities
  MyActivities::RegBlocks
  MyActivities::SakaiAnnouncements

See: http://blog.elpassion.com/ruby-gotchas/
Merge pull request #2454 from chikoon/CLC-3594-name-error-in-activities-feed

Clc 3594 name error in activities feed
On branch NOJIRA-separate-MyAcademics-classes-from-module

According to the article on Ruby Gotcha's:
http://blog.elpassion.com/ruby-gotchas/

We're supposed to separate the classes from their module name
so that the module will actually be their parent.

This PR is dedicated to the MyAcademics section.  All tests are
passing green, but there were quite a few changes:

MyAcademics::AcademicsModule -> MyAcademicsModule
class MyAcademics::CollegeAndLevel -> module MyAcademics; class CollegeAndLevel
class MyAcademics::Exams -> module MyAcademics; class Exams
class MyAcademics::GpaUnits -> module MyAcademics; class GpaUnits
class MyAcademics::Merged -> module MyAcademics; class Merged
class MyAcademics::Regblocks -> module MyAcademics; class Regblocks
class MyAcademics::Requirements -> module MyAcademics; class Requirements
class MyAcademics::Semesters -> module MyAcademics; class Semesters
class MyAcademics::Teaching -> module MyAcademics; class Teaching
class MyAcademics::TeachingCanvas -> module MyAcademics; class TeachingCanvas
class MyAcademics::TeachingSakai -> module MyAcademics; class TeachingSakai
class MyAcademics::Telebears -> module MyAcademics; class Telebears
Merge pull request #2455 from chikoon/NOJIRA-separate-MyActivities-classes-from-module

NOJIRA-separate-MyActivities-classes-from-module