Commit Graph

2491 Commits

Author SHA1 Message Date
Keith Garner f980a6f3a7 delint and reformat speed_grader_select_menu and speed_grader
Reformat and delint speed_grader_select_menu.js to make later patchsets easier to
code review.  Reformat speed_grader.

refs GRADE-176

test plan:
  - Smoke test functionality around student menu of SpeedGrader and
    SpeedGrader as a whole

Change-Id: Ia3f08d577a6525d9bf574e8ecdc34aa4d40284c4
Reviewed-on: https://gerrit.instructure.com/123717
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-08-24 22:45:43 +00:00
Brent Burgoyne 2be11521b1 re-add missing timezone locales
add timezone locales that were lost when moving from vendoring the
library to pulling it from npm. custom locales were apparently added
to the vendored lib.

fixes CNVS-38138

test plan:
- change user locale to each of the following:
  ar, da, fa, ht, hy, mi, nn, tr
- load a page
- ensure there is not a 404 when trying to load the timezone js file

Change-Id: Idff0059e3e445d1602f5d595d595af4780b34517
Reviewed-on: https://gerrit.instructure.com/123653
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Brent Burgoyne <bburgoyne@instructure.com>
2017-08-23 21:01:06 +00:00
Andrew Butterfield 9605d338a5 Make it more clear when entering external content
fixes PLAT-2552

Test plan:
* Install the test tool app with all placements checked

* For each of the following placements verify the following
  * Using the keyboard navigate forward through the page
  * Ensure there is a notice prior to entering external content that
    lets the user know they are entering partner content
  * Ensure there is a notice after exiting external content that lets
    the user know they have left partner content
  * Ensure the same with a screen reader

* Placement checks
  * Post grades
    * Go to the gradebook and click the sync grades button in the top right and select the test tool
    * Verify the modal
    * Enable the new gradebook and go to the actions menu and select the
      test tool
    * Verify the modal
  * Homework Submission
    * Go to submission page as a student and pick the tab for the test
      tool
    * Verify in page iframe
  * Content Import
    * Go to course import
    * Select the tool from the Content Type drop down
    * Click Find a Course button
    * Verify the modal
  * Collaborations
    * Select the tool from the drop down
    * Verify in page iframe
    * Send back a content item with a target url
  * Collaborations edit
    * Select edit icon on collaboration
    * Verify in page iframe
  * New Collaborations
    * Enable the External Tool Collaboration feature flag
    * Validate the previous collaborations checks
  * Assignment Configuration
    * Go to create an assignment for online submission file upload
    * Select the tool from the plagiarism drop down
    * Verify the in page iframe
  * Tool Configuration
    * Go to course settings and click the cog for the test tool and
      select configure
    * Verify the modal
  * LTI2 Registration
    * Go to course settings and install an LTI 2 tool
    * Verify the modal
  * Assignment Settings
    * Go to assignment index page
    * Select tool from cog menu next to new assignment button
    * Verify the modal
  * Module Item
    * Create a module
    * Add an external tool module item
    * Select the tool
    * Verify the modal
  * RCE
    * Click the LTI option from the RCE
    * Verify the modal
  * Assignment submission type
    * Go to create an assignment and select external tool as the
      submission type
    * Verify the modal

Change-Id: I365b9364d73a9fe3097031fffec79148e9671959
Reviewed-on: https://gerrit.instructure.com/112506
Tested-by: Jenkins
Product-Review: Nathan Rogowski <nathan@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
2017-08-21 15:55:07 +00:00
wdransfield 47dc390ac1 Make min tool launch heights match
Closes PLAT-2730

Test Plan:
- Follow the steps to reproduce at
  https://instructure.atlassian.net/browse/PLAT-2730
- Navigate to the module and verify that the module navigation
  no longer covers the bottom of the tool launch iframe

Change-Id: I9136392046edeade0906c038a69c5dcbd108e720
Reviewed-on: https://gerrit.instructure.com/122642
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins
Product-Review: Weston Dransfield <wdransfield@instructure.com>
2017-08-18 17:04:21 +00:00
wdransfield 7464d9fb31 Handle multiple tool on the page when resizing
Closes PLAT-2738

Test Plan:
- Install two lti tools that use the new
  'com.instructure.PostMessageToken' variable expansion.
- Visit a page with two LTI tools launched (this happens when
  launching a tool in a course that has chat enabled).
- Have one tool send a resize post message and verify the correct
  tool is resized. The post message should include the token
  for the value of 'token':

  <script type="text/javascript">
   parent.postMessage({
      subject: 'lti.frameResize',
      height: 12000,
      token: '<%= @wrapper_id %>'
   }, '*');
  </script>

- Verify the proper tool is resized.

Change-Id: Ie7e976c5cd53ef5c61cd86c471ba416045a0fb68
Reviewed-on: https://gerrit.instructure.com/119858
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
Tested-by: Jenkins
Product-Review: Weston Dransfield <wdransfield@instructure.com>
2017-08-18 16:30:28 +00:00
Gerrit Code Review 720097d648 Merge "Merge branch 'dev/grid-extraction-v2'" 2017-08-15 00:17:00 +00:00
James Williams b7ab72ceeb master courses: descriptions with file links shouldn't break
test plan:
* in a blueprint course create an assignment, discussion and
a quiz all with a link to a file in their description
* lock content for all of them
* sync to a child course
* in the child course, should be able to edit dates without
getting an error

close #CNVS-38520

Change-Id: I0eb7331094871d8e2698ee1357fa2c0c16f3bd46
Reviewed-on: https://gerrit.instructure.com/122384
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: David Mirabile <dmirabile-c@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-14 17:05:49 +00:00
Jeremy Neander 3553dd2331 Merge branch 'master' into dev/grid-extraction-v2
refs CNVS-38346

test plan:
* ensure Jenkins passes

Change-Id: I2f666750e3aad6b8b95377f92a62ae3b829c31ac
2017-08-11 14:54:23 -05:00
Sheldon Leibole 996f2e054b clean up late policies ui
closes: CNVS-38205

Test Plan

1. Create a course with at least one student and assignment.
2. Set the assignment due date to some time in the past.
3. Submit the assignment as the student.
4. Grade the assignment as the teacher.
5. Navigate to gradezilla.
6. Open the subission details tray.
7. Verify that "Late Penalty: <penaltiy>"
   and "Final Grade: <final grade>" are stacked
   on top of each other.
8. Switch to individual view gradebook.
9. Select the student and the assignment.
10. Under "Grading" verify that the
    input with "(out of <total>)", "Late Penalty <penalty>",
    and "Final Grade <final grade>" are stacked on
    top of each other

Change-Id: I087a2ce489938a995c3edde6c494edd93680b157
Reviewed-on: https://gerrit.instructure.com/119973
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-08-08 16:37:06 +00:00
Jeremy Neander 569d7cfff4 Merge branch 'master' into dev/grid-extraction-v2
refs CNVS-38346

test plan:
* ensure Jenkins passes

Change-Id: Ib10b7e81ed39b666d79a5999f1f7054f7e6ac981
2017-08-04 21:27:25 -05:00
Brent Burgoyne 0c1c81fef2 make all locale files agree on short month names
fixes CNVS-34165

test plan:
- make sure you are running with RAILS_LOAD_ALL_LOCALES=1
  for (web and webpack if you are running docker)
- change locale to each of es, de, fr, fr-ca, he and pl
- create/edit a quiz
- in the due date try setting the due date to a day in each month
  - no need to save
- make sure after clicking the day it doesn't change to a different
  month or year

Change-Id: I2da96f80678193e084786d867b27f2944a6e402c
Reviewed-on: https://gerrit.instructure.com/119926
Tested-by: Jenkins
Product-Review: brian kirkby <bkirkby@instructure.com>
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
Reviewed-by: brian kirkby <bkirkby@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
2017-08-04 22:14:48 +00:00
Derek Bender f8e1da0be7 show a message when speedgrader times out
fixes: GRADE-153

test plan:
- Given an assignment where there are so many
students/submissions/comments that speedgrader doesn't load
- When loading up speedgrader
- Then there is an alert message saying speedgrader won't
load once the endpoint times out

Change-Id: Iad8e29a8e1773d93537be2917cf13d1a22a3ab1e
Reviewed-on: https://gerrit.instructure.com/121273
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Tested-by: Jenkins
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-08-04 18:25:57 +00:00
brian kirkby 45f15fb2bd add media button to tinymce toolbar for iframe resizing
fixes CNVS-37244

test plan:
- using rcs add an iframe item to a page (like youtube video)
- with iframe item selected, press the media button to change the size of item
- verify the size of the item has changed

Change-Id: I05bd464d705212b09491d0e79c4a8f6b833733d0
Reviewed-on: https://gerrit.instructure.com/119527
Tested-by: Jenkins
Product-Review: brian kirkby <bkirkby@instructure.com>
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
2017-08-04 00:31:08 +00:00
brian kirkby 5132438e70 add mathjax support for mathml if needed
fixes CNVS-30765

test plan:
- test mathjax in Syllabus
- in html editor mode add the following MathML code:
  '<math><mi>&pi;</mi><msup><mi>r</mi><mn>2</mn></msup></math>'
- save the code and verify that the display of the the mathml includes a
  prettified '(pi)r^2' visual

Change-Id: If0675ca9ff9ad8fa2310066307786d371de783a5
Reviewed-on: https://gerrit.instructure.com/118131
Tested-by: Jenkins
Product-Review: brian kirkby <bkirkby@instructure.com>
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
2017-08-03 21:05:50 +00:00
Daniel Lee 823884bd04 Display "session expiring soon" warnings for DocViewer
refs RD-4269

Displays a warning at 9 hrs 50 min, then 55, 58, 59.  At 10 hours, reloads
the page.

Test plan:
- In canvas-lms/public/javascripts/speed_grader.js, replace lines
1930 through 1936 with the following:
      const oneMinute = 60 * 1000
      const sessionLimit = oneMinute;
      return [
        oneMinute - (30 * 1000),
        oneMinute - (20 * 1000),
        oneMinute - (10 * 1000),
        oneMinute - (5 * 1000)
      ];
- This will change the timeout to one minute, with warnings at 30, 40, 50
and 55 seconds.

Change-Id: I5c0dc4329cb22ae52ba502869bf45783a032c712
Reviewed-on: https://gerrit.instructure.com/120165
Tested-by: Jenkins
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2017-08-03 15:57:15 +00:00
Jeremy Stanley b0bb886869 don't create graded discussions from the modules page
test plan:
 - create a discussion topic via the modules page
   - it should not be graded
 - regression test SIS-2854

fixes CNVS-38297

Change-Id: I2f89d50387aba494712573bdd388fde7df8a0b46
Reviewed-on: https://gerrit.instructure.com/119944
Reviewed-by: Nick Houle <nhoule@instructure.com>
Tested-by: Jenkins
QA-Review: David Mirabile <dmirabile-c@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2017-07-31 20:43:39 +00:00
Jeremy Neander 1b55e8b1fe create grid support columns module
refs CNVS-38346

test plan:
* ensure Jenkins passes

Change-Id: I07d6d0bc66477479e3c1f2a574af582feb3480d7
Reviewed-on: https://gerrit.instructure.com/120905
Tested-by: Jenkins
Reviewed-by: Brian Park <brian@siimpl.io>
Reviewed-by: Derek Bender <djbender@instructure.com>
Product-Review: Jeremy Neander <jneander@instructure.com>
QA-Review: Jeremy Neander <jneander@instructure.com>
2017-07-31 17:20:36 +00:00
Daniel Lee 0dd41059c4 Don't restrict canvadoc iframe height
refs RD-4357

Refers to the bug visible in Speedgrader, where the document only
takes up half the height.

Test plan:
- Load up a document in Speedgrader and make sure it fills the available space

Change-Id: Ifffdeb28b1175de561e8fd80b2c46d6bc1822456
Reviewed-on: https://gerrit.instructure.com/120469
Tested-by: Jenkins
Reviewed-by: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
2017-07-25 21:21:08 +00:00
Daniel Lee be688a6fbc Allow resizing of canvadocs iframe in RCE preview
refs RD-4328

Test plan:
- Create an assignment, and in the description include a file upload
- View the assignment, and click the "preview" button
- Confirm that the document preview is resizable

Change-Id: Ifbd130815ad8e675d5dfa1cd97fc7b489e8c83b9
Reviewed-on: https://gerrit.instructure.com/119482
Tested-by: Jenkins
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2017-07-25 16:52:59 +00:00
Tyler Pickett 1c06002d4c Bump Oj gem and adjust how we're using it
Fixes: CNVS-37742

Test Plan:
* API stuff should still work

Change-Id: If45c36967ffa382b15ff865262e927cd7384d89d
Reviewed-on: https://gerrit.instructure.com/119546
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Tyler Pickett <tpickett@instructure.com>
2017-07-24 19:18:33 +00:00
Neil Gupta 0747def384 use unformatted grade to show pass/fail icon in gradebook
fixes CNVS-38233

Test plan:
* Create a complete/incomplete assignment
* Grade a student as complete
* Set your language to a non-English language (or LOLCALIZE)
* View the student in all 4 gradebooks:
  gradebook, gradezilla, SRGB, and speedgrader
* It should correctly show the student as "complete" everywhere

Change-Id: I3b241c4d7dacc3f64d1ae2bdbddc4530562d348c
Reviewed-on: https://gerrit.instructure.com/119205
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-07-21 20:47:14 +00:00
Ed Schiebel aebbb86316 Skip default error when logged out during quiz
when the user is logged out while taking a quiz, the quiz code displayes
a "you are logged out, log in" modal, which interacts poorly with the
default "you are not currently logged in" flash message.  Let's just
show the quiz one in this case.

fixes: CNVS-38109

Test plan:
  - Login as a student
  - Click 'Courses' on the left hand global nav
  - Select a course
  - Click 'Quizzes' on the left hand course nav
  - Select a quiz with multiple questions
  - Click 'Take the Quiz' button
  - Answer the first question
  - Open the Calendar in a new tab in the same browser
  - Click 'Account' on the left hand global nav
  - Click 'Logout' button
  - Go back to your first tab
  > expect to see a "You have been logged out of canvas.
  > To continue please log in" modal in the middle of the page,
  > but not the default "You are not currently logged in" alert at the
  > top of the page
  - click the Login button
  > expect to be taken to the login page, and be redirected back to the
  > current quiz question once logged in again.

Change-Id: I55d232ddb0288746fc66ca254148ac4dd0038dfd
Reviewed-on: https://gerrit.instructure.com/118468
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Kyle Follett <kfollett@instructure.com>
Tested-by: Jenkins
2017-07-19 13:38:00 +00:00
Brad Horrocks 01faca033c fix for moderated grading in DocViewer
Replace crocodoc_ids with moderated_grading_ids
Both canvadocs and crocodoc can use the ids now

refs RD-4238
Test Plan:
With a course that has one teacher, 2 TAs, and a student
- Create an assignment, check the moderated grading check box
- as the student submit the assignment
- as a TA, pull up the submission in speed grader, annotate and grade it
- as the Other TA, open the submission in speed grader
- make sure you cant see the first TAs comments

Change-Id: I886af3e21f9276866ea4be8d5de6574b32e5f122
Reviewed-on: https://gerrit.instructure.com/117360
Tested-by: Jenkins
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
2017-07-18 22:13:39 +00:00
Zach Wily c1dbd94f73 add allowfullscreen to crocodoc launches
fixes RD-4335

DocViewer supports fullscreen, and we are hijacking crocodoc sessions to
show the DocViewer, so let fullscreen happen here. We don't really need
to scope this to just hijacked sessions, since it shouldn't cause any
badness to allow fullscreen on a crocodoc launch too.

Change-Id: I711196d130536aa3f317e16fbb508ade0b8332c8
Reviewed-on: https://gerrit.instructure.com/119508
Tested-by: Jenkins
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Aaron Kc Hsu <ahsu@instructure.com>
Reviewed-by: Josh Orr <jgorr@instructure.com>
2017-07-18 19:33:30 +00:00
brian kirkby 28d63e8172 delays 'change' event creation on tinymce until remote rce loaded
fixes CNVS-38128

test plan:
- with RCS eabled create a quiz question with the type 'Fill in Multiple
  Blanks' or 'Multiple Dropdowns'
- make sure to add 'reference words' by using square brackets in the text
- save the quiz question
- edit the quiz question
- in the quiz text, add another reference word
- click down to the 'Show Possible Ansers For' dropdown
- verify that the reference word you just typed in is included in the dropdown

Change-Id: Ided01c21c34aa42e6509a1679ee80529248fcb5a
Reviewed-on: https://gerrit.instructure.com/119121
Tested-by: Jenkins
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: brian kirkby <bkirkby@instructure.com>
2017-07-17 17:52:16 +00:00
Brian Park bd7c47d3da show late deduction in submission details page
closes: CNVS-37840

Test Plan:
1. Navigate to a late submission's details page
2. Observe late deduction is displayed when:
  - Grade is viewable by the current user
  - Nonzero points_deducted present on submission

Change-Id: I6bddcd8f37fdb3033b5ee841e8935acb03bcf7fc
Reviewed-on: https://gerrit.instructure.com/118250
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-07-13 18:27:46 +00:00
wdransfield dd913d3792 Check for empty string when choosing link text
Closes PLAT-2726

Test Plan:
- Turn on the "Rich Content Editor Sidebar Enhancements"
  feature flag.
- Create a new page and in the RCE switch to HTML view
- Add an empty set of <p> tags and switch back to the
  normal editing style.
- Click in the p tag and insert an lti link via
  content item.
- Verify the link text is inserted, not &nbsp;

Change-Id: I7bccb2c22bd1c971bac754d191bfc6e06bb4936e
Reviewed-on: https://gerrit.instructure.com/118837
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Weston Dransfield <wdransfield@instructure.com>
2017-07-13 16:45:23 +00:00
Jeremy Stanley 981364a112 send browser's content_type with legacy uploads
for consistency with API uploads

test plan:
 - a ruby script uploaded from the following places should
   have content_type 'text/x-ruby-script':
   1. files page
   2. assignment submission
   3. conversation attachment

fixes CNVS-37801

Change-Id: I179029314f8c2cea864e51261a0ccf276c13d0eb
Reviewed-on: https://gerrit.instructure.com/118401
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: David Tan <dtan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2017-07-12 14:17:47 +00:00
Brian Park efed5ac493 show late deduction in speedgrader
closes: CNVS-37839

Test Plan:
1. As a teacher, navigate to SpeedGrader for an
   assignment with at least one late submission
2. Switch student to one that has a late, penalized submission
3. Observe that:
  - Unpenalized grade is displayed in input field
  - Penalty is displayed below input field
  - Modified grade is displayed  below input field
4. Repeat 1-3 for assignments of all `grading_type`s
  - Known issue: 'pass_fail' assignments do not
    display the points correctly if they have an
    existing late deduction.  To be addressed in
    future ticket.
5. Repeat with provisional grading
  - Observe thate late penalty stuff doesn't apply
    to provisional grades

Change-Id: Ie0acc835d9565faa9226c6969c70b4e8c5d0220e
Reviewed-on: https://gerrit.instructure.com/117217
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Sheldon Leibole <sheldon@siimpl.io>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-07-10 20:46:05 +00:00
wdransfield b45e96a70b Make pending report text vendor agnostic
Closes PLAT-2692

Test Plan:
- Create an originality report with no score and a
  workflow state of 'pending'.
- View the associated submission in speedgrader.
- Click the pending clock itcon and verify that a
  message that is vendor agnostic is shown.

Change-Id: Id47b9474e11da756013663a93c5b223137476f9d
Reviewed-on: https://gerrit.instructure.com/117850
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jesse Poulos <jpoulos@instructure.com>
2017-07-07 19:41:32 +00:00
brian kirkby 945fe65704 media question answers should default to thumbnail
refs CNVS-33139

test plan:
- create a quiz with a multiple choice and multiple answer questions
- for the answers, select the editor pen to bring up the tinymce editor
- make sure kaltura is setup on your account
- create a media video and/or audio recording
- update the answer
- update the question
- save the quiz
- preview the quiz
- verify that the media answers are showing up as a thumbnail

Change-Id: I6c7a64e069b3eacdd7eb5018c22933a9921d12db
Reviewed-on: https://gerrit.instructure.com/116366
Product-Review: brian kirkby <bkirkby@instructure.com>
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
Tested-by: Jenkins
QA-Review: Tucker McKnight <tmcknight@instructure.com>
2017-07-05 23:10:16 +00:00
Brian Park 4acca81789 add late and missing pills
closes: CNVS-32368

Test Plan:
* Navigate to student grades page
 - Observe new column 'Status' is present
 - Observe pill appears for missing or late submissions
* Navigate to submission details page
 - Observe pill appears for missing or late submissions
* Navigate to speedgrader
 - Observe pill appears for missing or late submissions

Change-Id: I6256c721252decb15fe9c0557afbbf395f376677
Reviewed-on: https://gerrit.instructure.com/114447
Reviewed-by: Sheldon Leibole <sheldon@siimpl.io>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Tested-by: Jenkins
Product-Review: Christi Wruck
2017-06-29 17:57:04 +00:00
Mysti Sadler 8e65abba5a Remove modules home page FF
refs FALCOR-416

Test plan
- Ensure new courses have the home page set as modules

Change-Id: I00d0d5a55b820d574557bc1de476f07c0f1e8368
Reviewed-on: https://gerrit.instructure.com/116895
Tested-by: Jenkins
Reviewed-by: Jon Willesen <jonw+gerrit@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Christi Wruck
2017-06-28 02:19:12 +00:00
Brian Park a05e102e68 restore column header focus after dialog close
fixes: CNVS-37602

Test Plan:
1. Navigate to GradeZilla
2. Open an assignment column header menu
3. Press keys while the menu is open
  - When you press TAB:
     Observe that the menu closes and the next item
     in the normal grid navigation flow is focused
  - When you press SHIFT+TAB:
     Observe that the menu closes and the previous item
     in the normal grid navigation flow is focused
  - When you press ESC:
     Observe that the menu closes and the menu trigger
     is focused
  - Other keys should behave as before
     a. up/down arrow keys focus menu items
     b. left/right arrow keys expand/collapse flyouts
  - Nested flyouts should also trigger navigation upon
    these key presses
4. Select a menu item
 - If a modal appears:
  a. Observe that the focus is placed within the modal
  b. Observe the header menu trigger is refocused
     when the modal is closed
 - If a modal doesn't appear:
  a. Observe the header menu trigger is refocused
5. Repeat 2-4 with all column header types
 - Assignment Group column headers
 - Student column headers
 - Total Grade column header

Change-Id: I7cd50a5bc2c598b5bf899f7a5d17998fc4f4ec04
Reviewed-on: https://gerrit.instructure.com/115864
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
Reviewed-by: Sheldon Leibole <sheldon@siimpl.io>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-06-23 18:55:11 +00:00
James Williams 6f532cdd21 master courses: prevent rubrics from changing assignment points
test plan:
* have a blueprint course with an assignment
 with points locked
* sync to an associated course
* add a rubric to the assignment with a different
 points possible than the assignment and
 check to use it for grading
* it should not change the assignment points

closes #MC-263

Change-Id: If403205efdddb0489e9590ac4e0770afb926d025
Reviewed-on: https://gerrit.instructure.com/116375
Tested-by: Jenkins
Reviewed-by: Mysti Sadler <mysti@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-06-22 19:25:40 +00:00
Jon Jensen ec8c2dcdd9 update _core_en.js for rails 5
Change-Id: I71d5aab71c9e16f7732b63607d7f6837067d17a6
Reviewed-on: https://gerrit.instructure.com/116556
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
2017-06-22 16:42:59 +00:00
brian kirkby 8619accabb fix typo in element selector so eportfolio preview works
fixes CNVS-37365

test plan:
- enable rcs for eportfolios
- edit an eportfolio
- while editing with RCE, select the "Preview" button
- verify the preview displays your changes above the editor

Change-Id: I9cbaf72f3906167e9a72123b92f2c5c1b6b972a5
Reviewed-on: https://gerrit.instructure.com/114425
Product-Review: brian kirkby <bkirkby@instructure.com>
Tested-by: Jenkins
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
2017-06-14 19:18:49 +00:00
Jeremy Stanley cb9f2def4f improve a11y on course settings section tab
test plan: on the settings tab in course sections,
 1. the edit / delete icons should appear as buttons
    to screen readers
 2. screenreaders should read the name of the section
    to be edited / deleted on the buttons
    a. for sections that existed when the page was loaded
    b. for sections created afterward
 3. when a section is deleted, the previous section's
    delete button should be focused
 4. when the first section in the list is deleted,
    the "Sections" tab should be focused

fixes CNVS-37151

Change-Id: Ia7cb87654cb98e66f27a6101830d2ea99086455f
Reviewed-on: https://gerrit.instructure.com/115300
Tested-by: Jenkins
Reviewed-by: Ed Schiebel <eschiebel@instructure.com>
QA-Review: David Tan <dtan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2017-06-14 17:17:22 +00:00
Brad Horrocks 89e07e5ab1 No crocodoc warnings when using canvadocs in speedgrader
Fixes RD-4152

Test plan:

not sure on how to get the crocodoc is processing warning....

for the session timeout, you could wait an hour and make sure no
messages appear

Or you could modify public/javascripts/speed_grader.js lines 1942-1946
change the 1000 to 10 so you should only have to wait 36 seconds to make
sure the page isnt reloaded and no messages appear

Change-Id: I6f04fde11e4fc869af5f0492cec3496b3a6aebc4
Reviewed-on: https://gerrit.instructure.com/114853
Tested-by: Jenkins
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
2017-06-09 19:23:53 +00:00
Nick Houle 7e3c9b0e33 Allow new Assignments to save without validation errors in modules
Fixes: SIS-2854

Test plan:
- Enable the new Sync to SIS Feature Option, set a name length
  value and check the require due date option
- Navigate to a Course
- Navigate to the Modules page of the course
- Create a new Module
- Click the '+' button to left of the newly created module
- Click 'Add [New Assignment]'
- Enter a name longer than the length you set for the account
  setting
- Click 'Add Item'
- Confirm the Module Item is created
- Confirm when clicking on the module item name it navigates you
  to the Assignment
- Confirm when editing the assignment the 'Sync to SIS' option is
  not checked

Change-Id: I4d0732ff89e3b09e910b489083ee562ffb9ef6f5
Reviewed-on: https://gerrit.instructure.com/114668
Tested-by: Jenkins
Reviewed-by: Brad Humphrey <brad@instructure.com>
QA-Review: Mark McDermott <mmcdermott@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
2017-06-09 17:58:36 +00:00
wdransfield a262310f5d Send `ext_lti_assignment_id` in assignment launches.
Closes PLAT-2618

Test Plan:
1. Create an assignment with submission type 'External Tool'
2. Do a content item selection request by clicking
   'find' and launching a tool that supports content item.
3. Verify that a param named 'ext_lti_assignment_id' is
   sent in the content item selection request set to
   the assignemnt's 'lti_context_id'.
4. Return an Lti Link through the tool via content item.
5. Save and publish the tool. View the assignment and verify
   the tool launches and also gets the 'ext_lti_assignment_id'
   parameter set to the same 'lti_context_id'

Change-Id: I1be951b298aa04fd932fb62c8411f362afc599b2
Reviewed-on: https://gerrit.instructure.com/114253
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Weston Dransfield <wdransfield@instructure.com>
2017-06-09 13:37:41 +00:00
Ryan Shaw c5a0eb5c69 convert some more AMD to es6 import/export
closes: CNVS-37361

test plan:
automated tests should pass
webpack should build without errors

Change-Id: Ie44776029fce9597ebd9454345626072e50702a6
Reviewed-on: https://gerrit.instructure.com/106053
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-06-06 19:18:31 +00:00
Rachel Bengochea f4880c240e add blueprint setting options to the course settings page
closes MC-182

Test Plan:
-Create a new course
-On the settings page, enable the course as a blueprint course
-Save the page
-check several of the general setting selections
-Save the page again (notice the settings remain selected after saving)
-Check and make sure the items locked stay locked on other pages
-Select Granular Locking
-Expand and close each tab
-Notice that each tab has the appropriate objects to lock
-Select several checkboxes
-Make sure the lock icon changes and the title updates appropriately
-Save the Page(notice the settings remain selected after saving)
-Check and make sure the items selected lock on the appropriate pages
-Create a new course
-Add students
-On the settings page, make sure the blueprint checkbox is disabled
-a message appears when hovering over the disabled checkbox

Change-Id: I06f1783881a4ce875be3e6bd9129d8302f1ba2de
Reviewed-on: https://gerrit.instructure.com/112165
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Pert Eilers <peilers@instructure.com>
2017-06-02 23:07:51 +00:00
Nick Houle cbf234a87d Fix Quiz due date and name too long validation issues
Fixes: SIS-2859, SIS-2856

Test plan:
- Turn on `Enable new SIS integration settings` feature option,
  check name length setting and require due date setting
- Navigate to a course
- Create a Quiz with a name longer than the value you set, with
  `Sync to SIS` checked and no due date
- Confirm both name too long and due date required validations
  show
- Resolve the errors and confirm you can save the Quiz

Change-Id: Ia92254ef5338f523ffedbedf6e652e266a628625
Reviewed-on: https://gerrit.instructure.com/112550
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: Adrian Russell <arussell@instructure.com>
Product-Review: Oxana
2017-06-02 16:14:35 +00:00
Shahbaz Javeed 7fcf3d6647 allow KO navigation within the teacher notes dialog
closes CNVS-37070

test plan:
* Create a course with one assignment and two enrolled students
* Go to Gradezilla
* Enable Notes from the View menu
* Navigate to the notes column using the keyboard
* Ensure that you can navigate between the textarea and the two
  buttons labeled "Save" and "Cancel" by pressing Tab
  and Shift-Tab on the keyboard
* Ensure that you are taken to the previous cell when you press
  Shift-Tab while on the textarea
* Ensure that you are taken to the next cell when you press Tab
  while on the "Cancel" button

Change-Id: Iadf24d07ca1421b2cb3ea695052ec58b5d196548
Reviewed-on: https://gerrit.instructure.com/113371
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Christi Wruck
2017-05-31 22:02:31 +00:00
Simon Williams ba90778825 upgrade mediaelement.js to instructure/mediaelement#1a177ed2cc frd
I didn't have the right built files in the last commit :/

refs CNVS-34022

test plan: should include general improvements and bugfixes from
upgrade, but no core functionality should change.
- video and audio player
- speed controls
- quality controls
- caption track controls (including upload and delete)
- note: this does not yet fix all a11y issues

Change-Id: I75ebd94bfbc8276fdca7e0bbd5c678f5a3400e87
Reviewed-on: https://gerrit.instructure.com/113243
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2017-05-31 15:39:58 +00:00
Gary Mei ff22363d1e Focus close button when edit module item
Closes CNVS-36812

Test plan
 - Create a module
 - Add an item to the module
 - Turn on screenreader
 - Click edit on the item that you just added to the module
 - The close button on the modal that pops up should be in focus

Change-Id: I0f952250e173a743fe89d9b1b17345567dbf00f5
Reviewed-on: https://gerrit.instructure.com/112062
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: David Tan <dtan@instructure.com>
Tested-by: Jenkins
Product-Review: Nathan Rogowski <nathan@instructure.com>
2017-05-26 15:54:31 +00:00
Ryan Shaw e0c0f5944f remove jsx/shared/dig in favor of _.dig
Lodash already has a function that does the same
Thing we were trying to do here. We generally
Try to use lodash’s method instead of making
Our own if one exists.

Test plan:
* these blueprint courses pages should still work

Change-Id: Ib85fafcfeb0933cf4f7999bdafcd41a79ed0a774
Reviewed-on: https://gerrit.instructure.com/112916
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
Tested-by: Jenkins
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-05-25 16:23:47 +00:00
Ryan Shaw 09726a07c2 Get jquery-ui-touch-punch from NPM, not vendor
closes: CNVS-37135

test plan:
try to drag drop things (like on the discussions
index page) on an iPad or other touch interface

make sure it still works

Change-Id: I290d5adc2a956edda367b95de1184224d5f1e66a
Reviewed-on: https://gerrit.instructure.com/113066
Tested-by: Jenkins
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-05-25 16:23:02 +00:00
Ryan Shaw dde014778c convert public/javascript that export something to import/export
These files can only be converted to import/export
if we pass them through babel (so we can use the
interopRequireDefault and “addModuleExports” stuff
babel provides) to make it work with our coffeescript.

closes: CNVS-35466

test plan:
* nothing should change
* the build should pass
* pages that use this should still work

Change-Id: I994e84e26f081c3f5670c64027a285c6a0419529
Reviewed-on: https://gerrit.instructure.com/106265
Tested-by: Jenkins
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-05-25 16:22:35 +00:00