Change edu-apps linke to point to www.edu-apps.org

fixes #CNVS-6158

Change-Id: I6736e5891f1eb3432755fb43311e50d22e0d1afa
Reviewed-on: https://gerrit.instructure.com/21160
Reviewed-by: Eric Berry <ericb@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
fix user filtering for cross-shard conversations or without sharding

test plan:
 * without sharding, filter conversations by user; it should work
 * with sharding:
   * create a conversation between users on the same shard
   * from another shard, create a conversation with one of the
     users from the first shard
   * from the first shard, search for the conversation with
     the user from the other shard
   * it should work

Change-Id: I92b67f5974af96daf952d95e14c4350bd4225d07
Reviewed-on: https://gerrit.instructure.com/21155
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
add debugging information to track down an issue

Change-Id: I8bdf9efcfc8a03478bfa8f99e5cd82a4d6ff4d13
Reviewed-on: https://gerrit.instructure.com/21251
Reviewed-by: Paul Hinze <paulh@instructure.com>
Product-Review: Paul Hinze <paulh@instructure.com>
QA-Review: Paul Hinze <paulh@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
only strand quiz_stats jobs per quiz

fixes CNVS-6175

test plan:
- submit a quiz, and then generate stats for it
- it should work

Change-Id: I07d6ca8eaa7c05cef45cea5539ba899697a627d4
Reviewed-on: https://gerrit.instructure.com/21208
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
fix role api routing to find roles with periods

test plan:
* create a custom role with a period
* should be able to update/delete it through the
interface (which goes through the API)

fixes #CNVS-3904

Change-Id: Ifc2c9893786b0a3ce06d664c863f78e5e125161a
Reviewed-on: https://gerrit.instructure.com/21158
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
incoming message processor should ignore harmless parsing errors

fixes CNVS-6138

test plan:
 - use a directory test to check:
   - normal emails are still processed correctly.
   - emails with irrelevant parsing errors (like a bad
     Received header) get processed normally and aren't treated
     like as errors.
   - emails with relevant parsing errors (like a badly
     folder To header) are treated as errors.
 - make sure receiving actual email isn't broken.

Change-Id: Ifbe8480de4546ec1b6205ebbdfef8d7ea72d3284
Reviewed-on: https://gerrit.instructure.com/21170
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
should not default imported wiki pages to unpublished state

test plan:
* import the package attached to the ticket
* the imported page should not be unpublished
(and currently invisible)

fixes #CNVS-6177

Change-Id: I4f8dd1766854e62cc95ed3823258539b079aa72a
Reviewed-on: https://gerrit.instructure.com/21235
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
handle 0 variance in quiz_stats item analysis

fixes CNVS-6178

test plan:
- create a quiz
- answer it with > 15 students, exactly the same
- run item analysis
- it should work

Change-Id: I9f6661e81edb16ec112c00d27eb0374a7d3f66c6
Reviewed-on: https://gerrit.instructure.com/21209
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
add alias for delayed posting from old delayed jobs

fixes CNVS-6143

test plan
- have some old delayed jobs that try to post a discussion using
 DiscussionTopic#try_posting_delayed
- ensure that they do indeed post the discussion

Change-Id: Ie3c2fa1e0ec65a031d4da258ce2d66be3a1cb7e1
Reviewed-on: https://gerrit.instructure.com/21248
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
don't send attachment verifier for files#api_show if locked_for is true

fixes CNVS-6088

test plan:
* lock a file manually as a teacher, and note the file id
* as a student, visit /api/v1/files/<fileid> and verify no download information
* do the same with a file locked by date, rather than manually
* verify that students still get api download info for unlocked files

Change-Id: I9519775b19017a72eb15d7da815a58a54df6dedb
Reviewed-on: https://gerrit.instructure.com/21403
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>

Conflicts:
	lib/api/v1/attachment.rb
filter app center apps by search term

test steps:
- go to the app center
- type in the search area and ensure the displayed apps toggle display
- try filtering by category as well (e.g. science)

Change-Id: I869a9e6e3fc8bf66c80769e8fae2fb5cd2ca9a18
Reviewed-on: https://gerrit.instructure.com/21107
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Product-Review: Eric Berry <ericb@instructure.com>
added the ability for users to review app center apps

test steps:
- enable the app center with a valid access token
- visit the app center under account settings
- click on a tool and ensure the reviews appear in the list at the
  bottom
- click the link 'Rate this tool' and add a review
- ensure that the review list reloads

** note: you will not see the actual app star rating or review
count change when you add/modify a review. this is expected behavior.

Change-Id: I79ab0769f56b3a17b6eb2056de1416eb1a0a71ca
Reviewed-on: https://gerrit.instructure.com/21054
Reviewed-by: Brad Humphrey <brad@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
fix cross-shard context bug in CalendarController::show2

fixes CNVS-6150

some context lookups were being done with shard-local ids on a
shard that they didn't live on. this meant that either the wrong
context object was being looked up or no context was found, causing
a broken calendar

test plan
you will need:
- two shards (called Shard 1 and Shard 2 from now on)
- a course on Shard 2 with an id that does not correspond to a
 course on Shard 1. i.e. if the course has an id of 2~5 there must
 not be a course with an id of 1~5. one way to make such a course
 would be to make more courses on Shard 2 than there are on Shard 1
- a user on Shard 1 that is in the course on Shard 2
- a calendar event in the course

with all this in place:
- as the user, ensure that the calendar page shows the calendar
 event without error

Change-Id: Ie2a73c4aa775dfc249943318e5d72731542ca6a5
Reviewed-on: https://gerrit.instructure.com/21226
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
fix race condition generating submissions zip

fixes CNVS-6283

test plan:
 * use S3 files
 * download a submissions zip for an assignment (the larger
   the resultant zip the more likely to hit the race condition)
 * it should only zip up the files once

Reviewed-on: https://gerrit.instructure.com/21385
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>

Conflicts:

	app/controllers/quiz_submissions_controller.rb

Change-Id: Ib9dc0463c0bddd8d72257fd02f0625ed2eaceb0a
Reviewed-on: https://gerrit.instructure.com/21581
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
treesame commit of origin/stable/2013-06-01

Treesame-Commit-Id: 4e51bdb90c1720ec3b0b4cbf1d97227723957d46