Revert "rename student outcomes gradebook feature"

Change-Id: I273a8966811fc10944516c4e4cdbe845b47d210c
Reviewed-on: https://gerrit.instructure.com/36557
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Braden Anderson <braden@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
conversations: update unread count only for recipients

fixes CNVS-13639

test plan:
  * as user A, send a message to B and C
  * as user B, mark the conversation as read
  * as user C, reply privately to A
  * as user B, verify that your unread message count does not change

Change-Id: I9fbf9b7bfea507d51a95231568ec33211ddd14da
Reviewed-on: https://gerrit.instructure.com/36519
Reviewed-by: Drew Bowman <dbowman@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Braden Anderson <braden@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
allow html5 fullscreen for the canvadocs iframe

Adds the "allowfullscreen" attribute to the iframe created for Canvadoc
documents, signalling that Canvadocs can open into fullscreen.

fixes CNVS-13650

test plan:
 * configure canvadocs, and view a file with it
 * verify that the canvadocs iframe has "allowfullscreen" as an
   attribute

Change-Id: I84b8b01796caa7291246dca6050ccdf13cca3813
Reviewed-on: https://gerrit.instructure.com/36503
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Zach Wily <zach@instructure.com>
don't stop CountsReport when one job fails

fixes CNVS-6375

Change-Id: I6e0631f73f8b47dc3c7d825d9f9f84f42225a33d
Reviewed-on: https://gerrit.instructure.com/36484
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
don't raise error in course export if external tool is missing

test plan:
* create a course with an external tool with a navigation tab
* permanently delete the tool in the console:

 ContextExternalTool.delete_all(:context_id => <INSERT COURSE ID HERE>)

* set a course setting (such as the tab configuration)
* copy the course
* should retain the course settings

fixes #CNVS-13661

Change-Id: Id3d810282e3eff3bc9cb0b98cdb96af73a503a28
Reviewed-on: https://gerrit.instructure.com/36531
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
bump moodle2cc version to 0.2.10

closes #CNVS-13513

Change-Id: Ic2bded7075775e75ef61a1001b3adb699d04595b
Reviewed-on: https://gerrit.instructure.com/36628
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>

Conflicts:
	vendor/plugins/moodle2cc/Gemfile
don't send ruby object to statsd key

Change-Id: I7b81cc8017b24843f8c52fb0090374db8ee73691
Reviewed-on: https://gerrit.instructure.com/36650
Reviewed-by: Ben Chobot <bench@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
avoid running unsharded query in migrations for new shards

Change-Id: I11eadea36cc6e05a010f1d831d32a5d91b5fd6bb
Reviewed-on: https://gerrit.instructure.com/36783
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
bump ruby-saml-mod to 0.1.29

refs OPS-170

Change-Id: Iec3f9064b40b12fbf801cc80e5052efa1a018f6f
Reviewed-on: https://gerrit.instructure.com/36602
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Paul Hinze <paulh@instructure.com>
QA-Review: Paul Hinze <paulh@instructure.com>
check unread conversation count periodically

fixes CNVS-10558

test plan:
  * open Canvas
  * send yourself a new conversation from another user
  * wait 30 seconds
  * verify that your unread conversation count is updated

Change-Id: I4e9bb2e06bbc862842fbf18e0d77f03afee1bd81
Reviewed-on: https://gerrit.instructure.com/36711
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Braden Anderson <braden@instructure.com>
conversations: clear unread_conversations_count cache

test plan:
  * open Canvas as a user with unread conversations
  * POST to /api/v1/conversations/mark_all_as_read
  * refresh the page
  * verify that your unread conversations badge is gone
  * verify that receiving new conversations also
      immediately updates the badge

Change-Id: Ib0b629ba84a59af102810a415d5955f7a2f4e46a
Reviewed-on: https://gerrit.instructure.com/36698
Product-Review: Braden Anderson <braden@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
conversations: recompute unread count when opening inbox

test plan:
  * set your unread conversations count to an incorrect value:

u = User.find(X); u.unread_conversations_count = 20; u.save

  * open Canvas
  * open your inbox
  * verify that your unread count badge is correct

Change-Id: I11b504dd9ee78db105de88305827d39e9d8433d3
Reviewed-on: https://gerrit.instructure.com/36707
Product-Review: Braden Anderson <braden@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
treesame commit of origin/stable/2014-06-14

Treesame-Commit-Id: 4ba870d37a35aa705ca02ac28b855b4d91696d4a
Merge pull request #14 from instructure/stable

merge stable