Commit Graph

21656 Commits

Author SHA1 Message Date
James Williams 114fa41175 course timetable event generator
test plan:
* see the new api endpoints in the calendar events controller

* can use the 'set_course_timetable' endpoint to send a schedule
 for a course (optionally per section) with a list of
 weekdays (e.g. "Mon,Wed,Fri") and times

* it will automatically generate calendar events from the start date
 of the course (or section) to the end date that correspond to the dates

* if the schedule is changed, the old events will be deleted and
 new ones generated

* can also use the 'set_course_timetable_events' endpoint to
 generate events from a complete list

closes #CNVS-30523

Change-Id: Idf2b4047af14a6e71838bbe9672583f5bddc3e9f
Reviewed-on: https://gerrit.instructure.com/86051
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2016-08-05 17:07:21 +00:00
John Corrigan a2f1068ae9 enable use of MathMan PluginSetting for latex => svg conversion
fixes CNVS-30392

test plan:

** Code Cogs **

- Add an assignment (or some type of content with a description editable
  via tinymce / rcs).
- Update the description to include a latex equation using the equation
  editor.
- Upon saving the assignment, observe that an image of the equation is
  visible.

*With Mathman*

- Navigate to an account's plugin page, and select the MathMan plugin.
- On the edit screen, enable the plugin, and provide a working mathman
  base url and check the 'Use for svg' checkbox. Save the changes.
- Add an assignment (or some type of content with a description editable
  via tinymce / rcs).
- Update the description to include a latex equation using the equation
  editor.
- Upon saving the assignment, observe that an image of the equation is
  visible.

Change-Id: I1737fc4e583ea82f31875d4ea62dcd9a6bd549e3
Reviewed-on: https://gerrit.instructure.com/84796
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: John Corrigan <jcorrigan@instructure.com>
2016-08-05 15:31:36 +00:00
John Corrigan c9e0fa96a3 enable use of MathMan for latex => mathml conversion
fixes CNVS-59514

Also adds a MathMan module that wraps some convenience methods for 1-
figuring out if it's ok to use mathman; 2- constructing urls for hitting
mathman's endpoints.

test plan:

*With Ritex*

- Add an assignment (or some type of content with a description editable
  via tinymce / rcs).
- Update the description to include a latex equation using the equation
  editor.
- Upon saving the assignment, observe that an image of the equation is
  visible.
- Using the browser's elemnt / DOM inspector, select the equation image,
  and observe that there is a hidden span that contain a math ml
  representation.

*With Mathman*

- Navigate to an account's plugin page, and select the MathMan plugin.
- On the edit screen, enable the plugin, and provide a working mathman
  base url and check the 'Use for mml' checkbox. Save the changes.
- Add an assignment (or some type of content with a description editable
  via tinymce / rcs).
- Update the description to include a latex equation using the equation
  editor.
- Upon saving the assignment, observe that an image of the equation is
  visible.
- Using the browser's elemnt / DOM inspector, select the equation image,
  and observe that there is a hidden span that contain a math ml
  representation.

Change-Id: I194d155b339123f7ed1948cf29070c1d17fc7f17
Reviewed-on: https://gerrit.instructure.com/84031
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: John Corrigan <jcorrigan@instructure.com>
2016-08-05 15:31:23 +00:00
John Corrigan db7d3ccfc1 add PluginSetting for MathMan
fixes CNVS-30442

test plan:
- Navigate to plugin management page.
- Observe that plugin for MathMan is present in the list.
- Click on MathMan.
- Observe that a base_url can be provided, and MathMan can be configured
  to be used for the conversion of latex to svg & MathML.
- Observe that entering a non-url value for the base url will fail.

Change-Id: If72075a57921ae3e3e13fa4665fe093678412da4
Reviewed-on: https://gerrit.instructure.com/85311
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: John Corrigan <jcorrigan@instructure.com>
2016-08-05 15:31:09 +00:00
KC Naegle 61dd938105 spec: fix chrome failures
Change-Id: I4bc1d21784037fa36cf3d811ffc7202a53dd1904
Reviewed-on: https://gerrit.instructure.com/86536
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2016-08-05 15:28:06 +00:00
Stephen Jensen 4d3c924758 Allow users to remove images from Dashcard
closes: CNVS-30603

Test Plan:
- Enable the course images feature flag

- Navigate to the Course Settings and select
  'Change Image' to open the Change Image modal

- Use the flickr search option and select an
  image from flickr

- Update course settings so the image persists

- If you navigate to the dashboard, the image
  should display on the dashboard card for
  that course

- Return to course settings

- A cog should now appear overlayed on the
  image in course settings

- If you select the cog, you should see a
  dropdown menu with the options to change
  the image, or remove the image

- If you select 'Change Image', the change
  image modal should appear and you should
  be able to select a different image

- If you select 'Remove Image' the image
  should disappear from the preview in
  course settings

- If you update course settings, the image
  removal should persist, and the image should
  not appear in the preview in course settings

- If you navigate to the dashboard, the image
  should also not appear on the corresponding
  course dashboard card

- Repeat the same process for uploading an
  image from your computer locally

- NOTE: local image uploads are being stored in
  the users course files inside a directory
  labeled 'course_image'. If the currently
  assigned course image is a local image
  upload, and you delete it from this directory,
  and you return to course settings or the dashboard,
  the image should not appear in either place
  after being deleted.

Change-Id: I29ecc3e702cd8e58939da367cc89325027c57c5c
Reviewed-on: https://gerrit.instructure.com/84244
Tested-by: Jenkins
QA-Review: Pierce Arner <pierce@instructure.com>
Reviewed-by: Matt Zabriskie <mzabriskie@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2016-08-05 15:13:52 +00:00
KC Naegle cb84365d4f spec: fix should have a 'Have not been graded' option spec for chrome
Change-Id: I83c9cddd1d4da7104c8ddbc269a66746ceae6253
Reviewed-on: https://gerrit.instructure.com/86542
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2016-08-04 23:14:40 +00:00
KC Naegle b3ba213b4a spec: fix hide and show notes spec
Change-Id: I9265d51de5159d18da938c4f3994007636b06a6f
Reviewed-on: https://gerrit.instructure.com/86539
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2016-08-04 23:13:19 +00:00
KC Naegle 74dcaf1fb1 spec: fix can select a student for chrome
Change-Id: I3aef48b39373293e0040c5694dda9fb3cf225716
Reviewed-on: https://gerrit.instructure.com/86541
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2016-08-04 23:12:49 +00:00
Nathan Mills 2fd126d4e9 allow external tool nav to be opened in new tab
fixes PLAT-1203

test plan:

create navigation settings for user, course and account placements
include in those placements
"<lticm:property name="windowTarget">_blank</lticm:property>"
launch from each of those placments
it should open in a new tab or window depending on your browser settings

double check that you can embed an rce lti link using
Content-Item that open in a new tab

Change-Id: I987ebf1b5aa4c43f616b0a5fe2ed5e5d648c2d44
Reviewed-on: https://gerrit.instructure.com/86158
Tested-by: Jenkins
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2016-08-04 20:47:28 +00:00
Stephen Jensen 91cf33bdb3 Make images show on the dashcard
closes CNVS-28649

Test Plan:
- Enable course images feature flag

- Go to course settings

- Click on the "Change Image" button to open
  the Change Image modal

- Upload a local image by browsing your
  computer or by drag and drop

- Update course settings

- Navigate to the dashboard

- The dashboard card for that course should
  now display the uploaded image

- Repeat this process by selecting an image
  from flickr in the Change Image modal.

Change-Id: I5d8d632536e3e93feeece333aeefbf869cd47d86
TODO: Needs test specs
Reviewed-on: https://gerrit.instructure.com/84042
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Pierce Arner <pierce@instructure.com>
2016-08-04 20:40:23 +00:00
James Williams 6d6aff57f5 fix stream item hiding with submission comments from students
test plan:
* create an assignment
* as a student,
 submit to the assignment and add a submission comment
* mute the assignment
* dashboard notifications for instructors should still be shown

* adding another submission comment while still muted should also
 show another dashboard notification

closes #CNVS-30670

Change-Id: I734ca0a53699bb6b0ba7bd6a76dc919b9ccf56d9
Reviewed-on: https://gerrit.instructure.com/86724
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-08-04 20:17:25 +00:00
Jon Jensen 3895f1981d spec: fix brittle spec
this fails at least once on over half of all builds

Change-Id: I18595808e992ba2687a3a1b8d87fe7e899c3a5e9
Reviewed-on: https://gerrit.instructure.com/86921
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-08-04 19:47:39 +00:00
Clay Diffrient 00ae5e6186 Make subscribe button read to screenreaders properly
closes CNVS-30482

Test Plan:
  - Go to the discussions index page
  - Using a screenreader navigate to a discussion topic
  - Toggle the subscription button
  - In each state, it should read the state properly

Change-Id: I68d30a5c117b2ed2e1902b38cce7fede1914a6be
Reviewed-on: https://gerrit.instructure.com/86402
Tested-by: Jenkins
Reviewed-by: Matthew Sessions <msessions@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
2016-08-04 19:41:54 +00:00
Chris Hart 2eca79061f Update item groups layout and styles
Fixes: CNVS-29681

Test plan:

- Please test this change as both a student
  and a teacher/admin, because Modules,
  Assignments and Quiz item groups appear
  differently for each kind of user.

- Go to a Canvas course with a lot of Assignments.
  The Assignments index page should now look like
  this: http://screencast.com/t/rEowTYSzrh

  It should show the exact same information as
  before this update, and the drag-and-drop
  should function exactly as it did before: The only
  thing that should have changed is the design.
  Experiment with editing the details of an
  Assignment, to make sure it still updates
  correctly.

- Go to a Canvas course with plenty of Quizzes.
  Go to the main Quizzes page. The Quiz item
  groups should look just like the Assignments
  item groups (above) -- and function exactly as
  they did before.

- Go to a Canvas course with a lot of Modules.
  Test in the same manner as assignments. Modules
  item groups should now look like this:
  http://screencast.com/t/u9juucjivDZ

- Go to a Canvas course with active and past
  Conferences. Test in the same manner as
  Assignments and Modules. Conferences item
  groups should now look like this:
  http://screencast.com/t/ff7VyTH18L60

Change-Id: I30779d222210a602cb5dca01ce95db04b1ece81f
Reviewed-on: https://gerrit.instructure.com/82116
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Pierce Arner <pierce@instructure.com>
2016-08-04 19:39:23 +00:00
Clay Diffrient 2400c77613 Fix code showing rather than score at least points in modules
closes CNVS-30768

Test Plan:
  - Go to /courses/x/modules
  - As a teacher create a module by clicking on +Module and enter a module name
  - Publish the module by clicking on the cloud icon
  - Click on + on module row and Add an assignment module item to the module
  - Edit the module by clicking on cog icon in the module row,
    Add requirement , score at least x for the assignment
  - You should not see code showing, but instead "Score at least X
    points" where X is the value of the points you used.

Change-Id: I62ef34ea4a39dd1aa85a80504c87b3d5b33a0eb5
Reviewed-on: https://gerrit.instructure.com/86901
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2016-08-04 19:09:34 +00:00
Cody Cutrer bf0dc3f022 "fix" direct page view lookup with pv4 for audit apis
refs CNVS-23365

Change-Id: I995b50e4951fd6a45e703bca58277a0bd7206227
Reviewed-on: https://gerrit.instructure.com/86898
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2016-08-04 18:34:26 +00:00
Keith Garner 74e1b6ce67 honor gradebook inactive/concluded settings in export
Gradebook export now honors the settings from gradebook related to
showing active and inactive enrollments.

fixes CNVS-30640

test plan:
 - Create a course with an assignment, and three
   students, one active, one inactive, and one concluded.
 - In gradebook turn off show inactive and show concluded.
 - Export the gradebook and note that only the active student shows.
 - In gradebook turn on show inactive.
 - Export the gradebook and note that both the active and inactive
   students show.
 - In gradebook turn off show inactive and turn on show concluded.
 - Export the gradebook and note that both the active and concluded
   students show.
 - In gradebook turn on show inactive and turn on show concluded.
 - Export the gradebook and note that all the students show
 - Edit the export and change the grade for all students.
 - Upload the export and note that only the active and inactive students
   are graded

Change-Id: I40dfe08991049f0689e05588f189b33a59cf9813
Reviewed-on: https://gerrit.instructure.com/86570
Reviewed-by: Derek Bender <djbender@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Christi Wruck
2016-08-04 18:13:09 +00:00
Clay Diffrient 7071a26211 Bump redux to version 3.5.2
Test Plan:
  - Apps using redux still work
  - Regression test Moderated Grading
  - Automated tests pass

Change-Id: I00035a0a89fa3bd7dc7ba8c1a049915497d78fb2
Reviewed-on: https://gerrit.instructure.com/85767
Reviewed-by: Jon Willesen <jonw+gerrit@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2016-08-04 17:24:08 +00:00
Matthew Berns 14fdcd0878 adds unsubmitted and ungraded filters to assignments api
closes OUT-346

test plan:
- create some assignments
- as a student, submit to some of the assignments
- as a teacher, grade some of the submissions

go to api endpoint:
users/(student_id)/courses/(course_id)/assignments
?include%5B%5D=submission&bucket=unsubmitted

- the endpoint should list the assignments the student
  has not yet submitted to

go to api endpoint:
users/(student_id)/courses/(course_id)/assignments
?include%5B%5D=submission&bucket=ungraded

- the endpoint should list the assignments the teacher
  has not yet graded
- assignments the student does not have access to,
  such as those restricted by section, should not appear
  regardles of status

Change-Id: Ia0d27b01a5124e68a98dc5af8776ead6714e4772
Reviewed-on: https://gerrit.instructure.com/86359
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Tested-by: Jenkins
QA-Review: Alex Ortiz-Rosado <aortiz@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2016-08-04 16:55:51 +00:00
Alex Boyd 06cc23f79f favorite courses and groups by default
test plan:
* courses and groups in the menu should appear by default
 when enrolled or added

closes CNVS-28908

Change-Id: I48885a6748be20e0a010e23a13ad9ad611e04395
Reviewed-on: https://gerrit.instructure.com/80064
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
Tested-by: Jenkins
2016-08-04 15:30:05 +00:00
Transifreq 9cd1869f77 update nb translation
Change-Id: I2d24c342ee4d3123913db0551fee6623215021c1
2016-08-04 05:28:31 -06:00
John Corrigan dfe78f9ac4 update oj gem
fixes CNVS-30747

test plan:
- run `touch config/RAILS4_2`
- run `docker-compose run --rm web bundle install`
- run `docker-compose run --rm web bundle exec rails c`
- Observe that it doesn't take 450 seconds to enter the console

Change-Id: I513a15ae693ed3667e94902b0ba7bd5b09d4f23c
Reviewed-on: https://gerrit.instructure.com/86790
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: John Corrigan <jcorrigan@instructure.com>
2016-08-03 23:09:12 +00:00
Joel Hough fe02df478e associate new conversations with their context's root account
fixes CNVS-30527

test plan(from ticket)
- Create a user (at school A) and enroll them into a course that
 has several other students enrolled.
- Merge the user with another user in another account on the same
 shard (school B) that also has at least one enrollment in a course
 with other students.
- As the user, login at school A's Canvas domain.
- Go to the Conversations Inbox and send a new message to a user(s)
 in the course at school B.
- Login as an Account Admin for school B.
- Masquerade as the user from steps 1-4 and view their Inbox; note
 you can see the conversation, with names of the recipients from
 school B, and any info that was sent to them.

Change-Id: Ifc7d84a3f819c52af4b06e3cfcafdd4eb9da8d4e
Reviewed-on: https://gerrit.instructure.com/86235
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2016-08-03 23:03:33 +00:00
Clay Diffrient c08c79e127 Fix the webpack build for quiz statistics
This keeps quiz_statistics using the underscore compatible
version of lodash 2.4.1 in which exists _.findWhere rather than
using the new 4.x version of lodash recently added.

closes CNVS-30750

Test Plan:
  - Post-merge and silent patchset builds for selenium webpack pass

Change-Id: I4f63aa431e29b77dd46dad4a9828afe10e84ef85
Reviewed-on: https://gerrit.instructure.com/86007
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2016-08-03 22:28:29 +00:00
Jeremy Stanley 2f8e67c619 front-end for moving calendar events between calendars
also fix a related API bug

test plan:
 - move events on the calendar view (by clicking the event,
   the Edit button, and choosing a different calendar from
   the Calendar dropdown) between users, courses, and groups.
 - ensure the following events do not present the option
   to move to a new calendar:
   - section-specific events
   - assignments
   - Scheduler appointments
 - ensure section-specific events can still be edited
   (more options / update event) without error

closes CNVS-30525

Change-Id: I3507ca4ad360dcc0597f563a30c261886d460a9a
Reviewed-on: https://gerrit.instructure.com/85816
Tested-by: Jenkins
Reviewed-by: Matthew Sessions <msessions@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-08-03 20:20:01 +00:00
Jon Willesen 7302e35a87 Revert "add react_modules feature flag and initial bundle"
This reverts commit cf56ea57a7.

Change-Id: I53b90ac0b41c459479f51ab5c4dfc0e251377869
Reviewed-on: https://gerrit.instructure.com/86674
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jon Willesen <jonw+gerrit@instructure.com>
2016-08-03 19:45:31 +00:00
Jason Steck 7bcf671977 fix editing quiz answers with RCE high-risk flag on
wrap all editor toggle textares in a container, instead of passing
the manage parent rce option

fixes CNVS-30567, fixes CNVS-30554

test plan:
 - create a new quiz question
 - edit and save the question text twice
 - click the ellipsis to edit the response text twice
 - repeats tests for discussion replies

Change-Id: I4b4c8708a1fa4de09e0d9bf028f4c6fdb3952add
Reviewed-on: https://gerrit.instructure.com/86468
Tested-by: Jenkins
Reviewed-by: Jason Steck <jsteck@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Ian Hoerner <ian@instructure.com>
2016-08-03 19:27:41 +00:00
Brent Burgoyne 490edc0354 ensure sidebar shows when focusing rcs editor
refs CNVS-30691

test plan:
- test agains rcs with https://gerrit.instructure.com/#/c/86606/
- enable high risk rcs flag
- edit or create a quiz
- add a question (multiple choice)
- click the edit icon next to an answer to bring up rce
- enter text and click done
- scroll up, sidebar should be gone.
- focus the rce for the question text
- the sidebar should appear

Change-Id: I60440c5175be4fd39b542a8918e22f4ddf4bf54d
Reviewed-on: https://gerrit.instructure.com/86733
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Ian Hoerner <ian@instructure.com>
2016-08-03 19:27:36 +00:00
Alex Boyd 46309f949d use index_exists? the right way
fixes CNVS-30741

Change-Id: Iadbfc515264f4af598eed38baef84cacb5988e61
Reviewed-on: https://gerrit.instructure.com/86772
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Alex Boyd <aboyd@instructure.com>
QA-Review: Alex Boyd <aboyd@instructure.com>
2016-08-03 19:22:21 +00:00
Heath Hales e53496af73 spec: 927147 block linked page from redirecting parent page
- verifies that the linked page cannot exploit the
Windows Opener Property bug
- verifies the link includes the rel="noreferrer" attribute
- turns out this was much more testable from Selenium
- no outside websites visited

Change-Id: I24ecb131c4eb4fd3528456c1aef79273a742ae96
Reviewed-on: https://gerrit.instructure.com/86406
Tested-by: Jenkins
Reviewed-by: August Thornton <august@instructure.com>
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2016-08-03 18:51:42 +00:00
KC Naegle 79aedc8495 spec: edit grading period
Change-Id: Ibe99118058d131d297e8e1935c33fd262576b5f3
Reviewed-on: https://gerrit.instructure.com/86784
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2016-08-03 17:04:36 +00:00
Stephen Jensen 40ed0cbc3c Make Flickr search/selection work in the selection modal
closes CNVS-28648

Test Plan:
- Enable course images feature flag

- Go to course settings

- Click on the "Change Image" button to open
  the Change Image modal

- Under the Flickr logo, go to the input box to
  "Search Flickr" and type in a random thing to
  search such as "Foosball"

- As you are typing, flickr should be returning
  results

- While the images are loading, they should appear
  as gray rectangular placeholders until the image
  actually displays

- At the bottom of the modal, if there is more than
  one page of results, you should see a "Next" button
  and selecting it goes to the next page of results

- After selecting next, a previous button should
  be present, and selecting it returns you to the
  previous page of results

- If you completely clear your search text, the
  results should disappear

- Clicking one of the flickr results should close
  the modal and the chosen image should appear
  in the image preview in course settings

- If you update course settings, the image should
  persist

Change-Id: I7c9b6ddde9d2ad1563b831cd496bb3362c34ab3e
Reviewed-on: https://gerrit.instructure.com/83741
Reviewed-by: Matt Zabriskie <mzabriskie@instructure.com>
QA-Review: Pierce Arner <pierce@instructure.com>
Tested-by: Jenkins
Product-Review: Colleen Palmer <colleen@instructure.com>
2016-08-03 16:41:19 +00:00
James Williams 623fb75c4c set reverse association on enrollment states
improve performance for enrollment state processing by
preserving preloaded associations on enrollments

Change-Id: Ife886e11578ecafe91dca7c0334326fed20528fb
Reviewed-on: https://gerrit.instructure.com/86774
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-08-03 15:30:04 +00:00
James Williams f23ccead89 make searchcontroller#all_courses more fault resistant
closes #CNVS-30702

Change-Id: Ia527f623cc48451d6e3c9edf735996d15b31742d
Reviewed-on: https://gerrit.instructure.com/86675
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-08-03 13:39:18 +00:00
James Williams f2c7db7570 fix the fix for to-do list caching over dates
/facepalm

refs #CNVS-25957

Change-Id: I35f9c2a372832beb922aa8e9da952f316d81ae9b
Reviewed-on: https://gerrit.instructure.com/86725
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-08-03 12:53:50 +00:00
James Williams 892307a80d don't allow rubric title suffix to bypass length validation
closes #CNVS-30700

Change-Id: Ied13bd9462eca40ec992eaa1425378ea93cd4d6c
Reviewed-on: https://gerrit.instructure.com/86683
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-08-03 12:39:59 +00:00
Alex Boyd 697a1c4562 point index_trgm_users_name_active_only at the right column
fixes CNVS-30740

Change-Id: I2463a0add13cead70f89524132b6b6eac640e945
Reviewed-on: https://gerrit.instructure.com/86769
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Alex Boyd <aboyd@instructure.com>
QA-Review: Alex Boyd <aboyd@instructure.com>
Tested-by: Jenkins
2016-08-03 03:32:23 +00:00
Benjamin Porter 5a975d407f Include pdfjs in preferred_plugins array
Instead of sending a separate param to canvadocs for pdfjs as
a preferred plugin, just put it in the preferred_plugins array (which
used to be called preferred_renders)

Refs CNVS-30582

Test Plan:

    - This is very difficult to test manually, particularly without
      changing any code.  The reason for this is that canvadocs doesn't
      currently do anything with the pdfjs preferred plugin so you can't
      just check for that behavior.  However, this is something you can
      do even tho it isn't ideal (and this is how I tested this patch in
      development):
      - get canvas working with a canvadocs instance on which you can
        modify code.  By modifying the canvadocs instead of the canvas,
        the integrity of this patch is maintained for test purposes.
      - In the canvadocs session controller
        (app/controllers/session_controller.js), add a log statement to
        display what comes in in the body of the request.  Something
        like:
        - console.log('Request body: ')
        - console.dir(req.body)
      - Submit an assignment to a course as a student.
      - As a teacher, open speedgrader from that assignment.  This will
        cause a new canvadocs viewing session to be created.
      - In the console output of the canvadocs instance, see that the
        body did not include a preferred_plugin of pdfjs.
      - Toggle the feature flag to enable new annotations.
      - Repeat opening speedgrader but this time observe that the body
        includes pdfjs in the list of preferred_plugins.

Change-Id: Ie3e16e1331fcdd757e96888f033e8341e7d6a0bc
Reviewed-on: https://gerrit.instructure.com/86549
Tested-by: Jenkins
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Product-Review: Benjamin Porter <bporter@instructure.com>
2016-08-03 03:07:50 +00:00
Alex Ortiz-Rosado 3d5e6e4cfc Spec: Move outcomes specs to their own directory.
Test Plan:
 - Pass Jenkins

Change-Id: I22b2f78f7c100f49c624787a0fc0b83616b1603d
Reviewed-on: https://gerrit.instructure.com/86619
Tested-by: Jenkins
Reviewed-by: Matt Berns <mberns@instructure.com>
Product-Review: Alex Ortiz-Rosado <aortiz@instructure.com>
QA-Review: Alex Ortiz-Rosado <aortiz@instructure.com>
2016-08-02 22:22:36 +00:00
Cody Cutrer a8e4ff4dea search common accounts more exhaustively for user permissions
fixes CNVS-30666

Change-Id: I63a64c4798ef156339ec4a952faa6866fa38d95f
Reviewed-on: https://gerrit.instructure.com/86428
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2016-08-02 20:36:26 +00:00
Cody Cutrer 36fe264507 don't bother caching a constant for feature flags
refs CNVS-30659

Change-Id: If90aedf26994f0012fa1efebf875451779c2cc97
Reviewed-on: https://gerrit.instructure.com/86712
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2016-08-02 20:25:43 +00:00
Clay Diffrient 0668a4ea52 Make uploads via upload dialog work
closes CNVS-28647

Test Plan:
  - Enable course images feature flag
  - Go to the course settings
  - Open the change image modal
  - Click/Use keyboard to activate the "browse your computer"
    link
  - A file upload dialog should appear.
  - Uploading a file should close the modal and update
    the image.
  - Save the course settings and the image should persist

Change-Id: I3bd701ad282ef7c891201fe0ddee8037591a85f0
Reviewed-on: https://gerrit.instructure.com/77196
Reviewed-by: Matt Zabriskie <mzabriskie@instructure.com>
Tested-by: Jenkins
QA-Review: Pierce Arner <pierce@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2016-08-02 19:10:46 +00:00
Alex Boyd 540ec880ac add trigram user indexes restricted to active users only
Change-Id: I03b0564b143148fca35062dc925999367f265bdf
Reviewed-on: https://gerrit.instructure.com/86550
Tested-by: Jenkins
Reviewed-by: Rosser Schwarz <rschwarz@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Alex Boyd <aboyd@instructure.com>
QA-Review: Alex Boyd <aboyd@instructure.com>
2016-08-02 18:41:06 +00:00
Pam Hiett a8d684ae0a replace "ALT" icon in speedgrader header and rce
Fixes: CNVS-30674

test plan:
- make sure the icon font updates locally
- as a teacher/admin
- navigate to speedgrader to ensure the "ALT" has been replaced
  with a "keyboard"
- next navigate to a quiz or an assignment and in the edit view
  the keyboard shortcut icon should be back to the "icon-info"
  (it will be updated in a future commit as far as placement
  and aligning with the updated keyboard look)

Change-Id: I85541a8f0858a1a22d798003e38e7145016ef9db
Reviewed-on: https://gerrit.instructure.com/86524
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Pierce Arner <pierce@instructure.com>
2016-08-02 18:21:18 +00:00
Ben Young 18af33a308 allow teachers to set lti submission type when grading
Refs PFS-4941

Test plan:
- Create an assignment in a course with an active student
- As a teacher, use submissions update endpoint to assign
    a submission type of 'basic_lti_launch' and url to student
- Verify submission has been updated with correct submission type and url
- Create another assignment with any online submission types
- As a student, submit to the assignment
- As a teacher, use the submissions update endpoint to attempt to
    assign a submission type of 'basic_lti_launch' and url
    for student
- Verify submission type used by student remains, and changes
    attempted by teacher were not applied

Change-Id: I2bd7f3345df06135cd0328fc87826563b2481bad
Reviewed-on: https://gerrit.instructure.com/86183
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Christi Wruck
2016-08-02 17:59:34 +00:00
Deepeeca Soundarrajan c870e081f5 spec: Add specs for groups page
Test plan:
  passes Jenkins

Change-Id: I0406428065803dc8403f298f472a6a5f180b9699
Reviewed-on: https://gerrit.instructure.com/86386
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
2016-08-02 15:53:48 +00:00
James Williams 0bf0041957 fix attempts to update in slave for enrollment state
initially found because of attempts to touch the user but
realized saving would likely fail as well

closes #CNVS-30711

Change-Id: I474a2a7eac78ba75b2e76124d6b6f25ae532b076
Reviewed-on: https://gerrit.instructure.com/86657
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-08-02 15:22:03 +00:00
James Williams a4f7dc86a1 conditional release content migration service
test plan:
* make sure canvas is configured with a
 conditional release service with g/85046 merged or checked out
* create assignments in a course with conditional content
* after copying the course, or exporting/importing the course,
 the new assignments should have conditional content

closes #CNVS-30371 #CYOE-235

Change-Id: I42693f2d12185f5c7f665d303baf938ad4af08ad
Reviewed-on: https://gerrit.instructure.com/85108
Tested-by: Jenkins
Reviewed-by: Michael Brewer-Davis <mbd@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Christian Prescott <cprescott@instructure.com>
QA-Review: Alex Morris <amorris@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-08-02 15:11:13 +00:00
James Williams d086e37945 bump moodle2cc
test plan:
* import the moodle package referenced in the ticket
* it should work

closes #CNVS-30501

Change-Id: I74a35417a0baff5e7da02eae7e89d533cd4a537a
Reviewed-on: https://gerrit.instructure.com/86367
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-08-02 12:47:24 +00:00