Commit Graph

26579 Commits

Author SHA1 Message Date
James Williams 2d432be283 point thrift_client to github
workaround for file permissions issues (no read access for other)

Change-Id: Ifafa8a6db10fe7c85e192b2bd92bf4431b328ed6
Reviewed-on: https://gerrit.instructure.com/121845
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-08-07 20:43:14 +00:00
Spencer Olson 3f0380d701 grade details tray: wire up radio options
closes CNVS-32373
closes CNVS-37561

Test Plan:
1. Start a rails server with GRADEBOOK_DEVELOPMENT enabled. Navigate to
   the New Gradebook as a teacher.
2. Set up a late policy and a missing policy.
3. Open the Grade Details Tray for a submission.
4. Verify the "None" radio option behaves in the following ways:
   a. If the submission is not late, missing, or excused, when you open
      the tray the "None" option is selected.
   b. If selecting the "None" option, the color in the submission
      cell changes to white.
   c. If changing from the "Late" option to the "None" option, any
      points deducted are removed. For instance, if a late submission
      has a score of 6 (raw score of 8 and 2 points deducted)
      and the "None" option is selected, the score in the submission
      cell should show 8 and the points deducted text should go away on
      the Grade Details Tray.
   d. If changing from the "Excused" option to the "None" option, the
      score changes to '-' in the submission cell.
5. Verify the "Late" radio option behaves in the following ways:
   a. If the submission is late, when you open the tray the "Late"
      option is selected.
   b. If the submission is late, when you open the tray the input
      under the "Late" option has a default value that reflects how late
      the submission is and the text next to the input ("Day(s)" or
      "Hour(s)") reflects the set interval on the late policy.
   c. If you change the interval on the late policy (from "Day" to
      "Hour", for instance), when you open the Grade Details Tray for a
      late submission, the text next to the input reflects the new
      interval, and the default value changes according to the interval.
      For instance, if a late submission initially showed a late value
      of "2 Day(s)" and then the late policy was changed to use "Hour"
      intervals, the submission should now show as "48 Hour(s)" late in
      the Grade Details Tray. This should not require a page reload.
   d. If selecting the "Late" option, the color in the submission cell
      changes to reflect the color the user has set for late
      submissions.
   e. If selecting the "Late" option, the default value in the input is
      0.
   f. If changing the value in the input under the "Late" option, the
      points deducted are recalculated (if a late policy is in place)
      and the score is adjusted. The new score is reflected in the
      submission cell, and the points deducted are reflected in the
      Grade Details Tray.
   g. If changing from the "Excused" option to the "Late" option, the
      score changes to '-' in the submission cell.
6. Verify the "Missing" radio option behaves in the following ways:
   a. If the submission is missing, when you open the tray the "Missing"
      option is selected.
   b. If selecting the "Missing" option, the color in the submission
      cell changes to reflect the color the user has set for missing
      submissions.
   c. If selecting the "Missing" option and the score is currently '-'
      or 'EX', the score is set according to the missing policy. If, for
      instance, the missing policy is set to award 0% for missing
      submissions, changing to the "Missing" option on a submission
      with a score of '-' or 'EX' should change the grade to 0.
   d. If changing from the "Late" option to the "Missing" option, any
      points deducted are removed. For instance, if a late submission
      has a score of 6 (raw score of 8 and 2 points deducted)
      and the "Missing" option is selected, the score in the submission
      cell should show 8 and the points deducted text should go away on
      the Grade Details Tray.
7. Verify the "Excused" radio option behaves in the following ways:
   a. If the submission is excused, when you open the tray the "Excused"
      option is selected.
   b. If selecting the "Excused" option, the color in the submission
      cell changes to reflect the color the user has set for excused
      submissions.
   c. If selecting the "Excused" option, the score in the submission
      cell changes to 'EX'.
   d. If changing from the "Late" option to the "Excused" option, any
      points deducted are removed. For instance, if a late submission
      has a score of 6 (raw score of 8 and 2 points deducted)
      and the "Excused" option is selected, the score in the submission
      cell should show 'EX' and the points deducted text should go away
      on the Grade Details Tray.

Change-Id: I5336e581cdbc1633752f0e81bf3f7daf5f90d537
Reviewed-on: https://gerrit.instructure.com/119573
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-08-07 20:02:17 +00:00
Derek Bender 075cecbe68 update yarn.lock
Change-Id: Id2b6834c1071cc695a31c19b9e6c6462c58352f0
Reviewed-on: https://gerrit.instructure.com/121733
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-08-07 18:42:40 +00:00
wdransfield 3ee5623ce6 Add DeveloperKey/vendor code association for LTI2
refs PLAT-2708

Test Plan:
- Create a developer key through the Canvas UI and
  verify that a new vendor code text input is
  available and optional.
- Verify each of the following:
  * If a vendor is associated with a devloper key they
    must use one of the associated developer keys
    when registering.
  * If a vendor is associated with a developer key
    they may not register without using a
    developer key.
  * If a vendor is associated with a developer key
    they may not use a developer key other than
    one they are associated with to register.
  * If a vendor is not associated with a developer key
    they must register without a developer key.

Change-Id: I9c9974706f542c1442988634790656da1c407cb8
Reviewed-on: https://gerrit.instructure.com/118592
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins
Product-Review: Jesse Poulos <jpoulos@instructure.com>
2017-08-07 16:32:48 +00:00
James Williams 2d27a1369f master courses: re-copy assignment when rubric status changes
test plan:
* copy an assignment from a blueprint to another course
* add a rubric to the original assignment
* resync
* the copied assignment should have a rubric

closes #CNVS-38470

Change-Id: I32fc7ca26cac22817c91c3ec5af342562ac66e2d
Reviewed-on: https://gerrit.instructure.com/121391
Tested-by: Jenkins
Reviewed-by: Jon Willesen <jonw+gerrit@instructure.com>
Reviewed-by: Aaron Kc Hsu <ahsu@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: David Mirabile <dmirabile-c@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-07 16:27:09 +00:00
Simon Williams 80acdad108 set message from_name as course/group name when possible
fixes CNVS-38237

test plan:
- generate messages at the course level, like new assignment,
discussion, quiz, graded, etc.
- it should use the course name as the from_name

Change-Id: I5f51abd5a51f43fefbadb4cb0763c4480a1c869c
Reviewed-on: https://gerrit.instructure.com/120319
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: David Mirabile <dmirabile-c@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2017-08-07 16:02:56 +00:00
Ed Schiebel 203b43350a Don't show spinner until actually searching
The progress spinner was displayed as the user typed into the text box
in the associations modal course search text box, even though we don't
actually search until at least 3 chars are entered.

fixes MC-286

Test plan:
  - create a blueprint master course and some other courses
  - go to the master course, open the sidebar and open the Associations
    modal
  - change the term
  > expect to see a spinner
  - change the sub account
  > expect to see a spinner
  - start typing into the text box
  > expect no spinner until you type the 3rd and subsequent characters
  - start deleting from the text box
  > expect a spinner until you are down to 2 characters, then no spinner
  > for 1 or 0.

Change-Id: I9008cd366f031305f1edbd98de147304e6ed1008
Reviewed-on: https://gerrit.instructure.com/117069
Tested-by: Jenkins
Reviewed-by: Jon Willesen <jonw+gerrit@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2017-08-07 13:04:37 +00:00
Cody Cutrer 0227bc297d redirect to Canvas login page after resetting Canvas password
refs CNVS-38441

in case Canvas auth isn't the primary

test plan:
 * configure CAS as primary auth provider, with Canvas second
 * add a user with Canvas auth credentials
 * go to /login/canvas, and do forgot password flow to reset
   the user's password
 * after resetting the password, it should return you to
   /login/canvas; not forward you to CAS

Change-Id: I67d4360baa1d5f2a3d68183b68eee19b5383d3a2
Reviewed-on: https://gerrit.instructure.com/121056
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2017-08-05 13:57:41 +00:00
Transifreq bff5ff3f6b update da translation
Change-Id: Ib859377f7793e7c179eb8e1b5484a734b6bd243f
2017-08-05 05:12:57 -06: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
Pam Hiett a2cb479cb3 Remove color functions being used on conversations "read" state
Fixes: CNVS-38395

test plan:
- navigate to inbox from the left-hand nav (in order to test this
  may need to mark an already read message as un-read) so the two
  states can be compared
  - the 1px border has been removed for all states to bring the
    design in-line with what product would like to see
  - focus border has been added

Change-Id: Ica93da20cbe35e57583c69ac731ab508730ff1c8
Reviewed-on: https://gerrit.instructure.com/120771
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Stephen Jensen <sejensen@instructure.com>
2017-08-04 21:59:42 +00:00
Augusto Callejas 8f15d1752b Use consistent ordering of assignments for paging
closes OUT-1420

test plan:
  - using the canvas api, create 41 assignments in a given course using
    the following payload:
    {
      "assignment":
      {
        "name":"assignment",
        "position":0,
        "points_possible":5.0,
        "grading_type":"points",
        "submission_types":["external_tool"],
        "published":false
      }
    }
  - using the canvas api, query for all assignments in the given course
    with page size of 10
  - confirm that 41 unique assignment ids are returned across all pages

Change-Id: Iecb76e0e0a6201b8beaad313402ecf7a50cfd9b9
Reviewed-on: https://gerrit.instructure.com/121526
Reviewed-by: Michael Brewer-Davis <mbd@instructure.com>
Tested-by: Jenkins
QA-Review: Andrew Porter <hporter-c@instructure.com>
Product-Review: Michael Brewer-Davis <mbd@instructure.com>
2017-08-04 20:49:21 +00:00
Spencer Olson cce05c3b7d improve speedgrader performance
Decrease SpeedGrader#json load time by preloading info.

closes GRADE-2

Test Plan:

1. Go to SpeedGrader for an assignment that has multiple submissions
   and at least one resubmission from a student.
2. Verify the page loads.

Change-Id: I94af7e6fad64351fb017bccc8c010e300112b0de
Reviewed-on: https://gerrit.instructure.com/121073
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-08-04 20:01:27 +00:00
Steven Burnett b9b32ac720 add param for workflow_state to submissions_api
Test Plan:
- hit api/v1/courses/1/students/submissions?student_ids[]=all&per_page=100
 notice it returns submissions for all users in course
- hit the endpoint again with the workflow_state param
- notice it filters those submissions
- repeat with courses with groups and group submissions

Change-Id: I5ef638d151d11167a1ccbf0bebc14b7549a666a0
Reviewed-on: https://gerrit.instructure.com/120849
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2017-08-04 19:41:21 +00:00
James Williams a6812f9579 touch modules before view if they've recently been unlocked
test plan:
* create a module to be unlocked shortly (like a minute)
* view the modules page before the unlock time passes
* view the modules page after the unlock time passes
* it shouldn't have cached the old view that still
 shows "will unlock at X"

closes #CNVS-38425

Change-Id: Id6284036cb88d5501590b2695c2097c9185e09b8
Reviewed-on: https://gerrit.instructure.com/121096
Tested-by: Jenkins
Reviewed-by: Jon Willesen <jonw+gerrit@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-04 18:44:05 +00:00
Han Yan 95795fa65f Instructor assigns rubric to whole quiz
closes QUIZ-394

test plan:
- create a QUIZ2 quiz
- edit the quiz
- at the bottom of editing page, a user can append rubric
- this rubrics editing should not be available for traditional quiz

Change-Id: I28d18a5bae1a91a25f04df3e970b07aaaf109dfc
Reviewed-on: https://gerrit.instructure.com/120033
Tested-by: Jenkins
Reviewed-by: Omar Khan <okhan@instructure.com>
QA-Review: Omar Khan <okhan@instructure.com>
Product-Review: Kevin Dougherty <jdougherty@instructure.com>
2017-08-04 18:32:18 +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
Ed Schiebel f62f55b5f2 Fix page title font size
The ticket specifies the Module page, but the font size was 15px on all
the pages that have the same general layout (sections with a button for
collapsing|expanding): Assignments, Discussions, Quizzes,
Modules, and Conferences.

fixes CNVS-38263

Test Plan:
  - load each of these pages in a course
  > expect the font-size of the toggling section heading to be 16px

Change-Id: I4360e22da6a5c397b75a6d723e82dad23c6cd619
Reviewed-on: https://gerrit.instructure.com/119476
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Tested-by: Jenkins
QA-Review: David Tan <dtan@instructure.com>
Product-Review: Pert Eilers <peilers@instructure.com>
2017-08-04 15:24:03 +00:00
James Williams ad05fdbf8b master courses: allow blueprint associations via sis imports
test plan:
* with blueprint courses enabled,
* create a blueprint course with an sis id
* create a course by uploading a sis batch with a
courses.csv file, adding a `blueprint_course_id` column
set to the blueprint course's sis id
* it should add the sis imported course as an
 associated course

closes #CNVS-37739

Change-Id: I9b0bced1a3e1f672effc69c10e929e7ee4cd258f
Reviewed-on: https://gerrit.instructure.com/116987
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-04 13:27:45 +00:00
Transifreq 1f85000b4b update da translation
Change-Id: Iaa9ef2a2e74ed140c09f0341f91f951e7c939ef3
2017-08-04 05:09:05 -06: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
James Williams ff054c45b9 add course_format to sis export
test plan:
* have a course with a course format
("On-Campus", "Online", etc)
* perform a sis export
* the courses.csv file should list the format

closes #CNVS-37731

Change-Id: I5f3e3ae8eabad2b6d53d8cdc4c3c86c08a0ac00b
Reviewed-on: https://gerrit.instructure.com/116624
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-04 00:05:20 +00:00
Ryan Shaw 5b3953ba0e bump canvas-rce to share deps for smaller bundles
Refs: QUIZ-2556

have canvas-rce share the same lodash, prop-types, 
format-message, & redux that's already on the page, 
so bundles are smaller.

test plan:
* check to make sure the service version of RCE works right
* the webpack bundle for it should be smaller

Change-Id: I9e9cb96524760987138d4a9ef24073a854889366
Reviewed-on: https://gerrit.instructure.com/121276
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-08-03 22:26:43 +00:00
Shahbaz Javeed f9413f40a1 submissions for offline assignments cannot be missing
This commit accomplishes 4 things:
  1. Submissions for offline assignments are no longer defined as
     missing after the due date passes.
  2. Submissions for offline assignments are no longer defined as
     missing if the teacher awards a grade of 0.
  3. An excused submission can no longer be defined as missing.
  4. An excused submission can no longer be defined as late.

closes GRADE-123

Test Plan:
* Create a course with at least one student
* Enable the New Gradebook
* Create an offline assignment with a due date in the past
  (Assignment 1)
* Create another offline assignment with a due date in the past
  (Assignment 2)
* Create an online assignment with a due date in the past
  (Assignment 3)
* Create another online assignment with a due date in the past
  (Assignment 4)

1. Submissions for offline assignments after due date passes
  a. Masquerade as the student and go to the student grades page.
     Verify there is not a 'MISSING' label next to the submission for
     Assignment 1.

2. Submissions for offline assignments after due date with score of 0
  a. As the teacher, go to the gradebook and give the student a grade
     of 0 for Assignment 2.
  b. Verify the submission cell in the gradebook is _not_ highlighted
     with the color for missing submissions.
  c. Masquerade as the student and go to the student grades page.
     Verify there is not a 'MISSING' label next to the submission for
     Assignment 2.

3. Missing submission marked as excused
  a. As the teacher, go to the gradebook. Verify the submission cell is
     highlighted with the color for missing submissions. Give the
     student a grade of 'EX' for Assignment 3.
  b. Verify the submission cell in the gradebook is _not_ highlighted
     with the color for missing submissions.
  c. Masquerade as the student and go to the student grades page.
     Verify there is not a 'MISSING' label next to the submission for
     Assignment 3.

4. Late submission marked as excused
  a. Masquerade as the student and submit to Assignment 4.
  b. As the teacher, go to the gradebook. Give the student a grade for
     Assignment 4 and verify the submission cell is highlighted with the
     color for late submissions. Then give the student a grade of 'EX'
     for Assignment 4.
  c. Verify the submission cell in the gradebook is _not_ highlighted
     with the color for late submissions.
  d. Masquerade as the student and go to the student grades page.
     Verify there is not a'LATE' label next to the submission for
     Assignment 4.

Change-Id: I6e942ce7c6cf264e2dbb1ca146fd83933b78a1fd
Reviewed-on: https://gerrit.instructure.com/120358
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-08-03 21:50:02 +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
brian kirkby 01d1fec6d4 css hack to draw pretty outline on focused mejs-audio comment element
fixes CNVS-22375

test plan:
- add an audio comment on a discussion
- open the audio comment
- verify that the outline around the focused element is the width/height of
  the audio controls
- rejoice!

Change-Id: I41c792a4cd7b4bd49c9fc402ab3e14e40085f25b
Reviewed-on: https://gerrit.instructure.com/119923
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 20:31:11 +00:00
Pam Hiett 556fa2e641 [Design Alignment] - Updated Mobile Login Screens
Fixes: CNVS-38171

test plan:
- using x-code simulator navigate to local canvas login screen
- the layout should no longer have a patterned background
- enter a false email/password... the error message should now
  display under the log in button above the forgot password text
  also test the view horizontal or on a tablet to ensure the
  the inputs have a restricted width and do not stretch the
  entire screen ;)
- *note the mock-up on the ticket shows an option to remember
  auth using the toggle (current code did not show that option
  therefore may need to be addressed with a new ticket)

Change-Id: I04d4be4e783e78f29dc60269539caa3f93d8b1df
Reviewed-on: https://gerrit.instructure.com/118866
Tested-by: Jenkins
Product-Review: Matthew Rice <mrice@instructure.com>
Reviewed-by: Matthew Rice <mrice@instructure.com>
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
QA-Review: Taylor Wilson <twilson@instructure.com>
2017-08-03 16:54:51 +00:00
Gary Mei f8ed2153d7 allow gb history search to take multiple input
closes GRADE-126

Test Plan
1. Generate a grade change and keep in mind the grader, student,
    assignment, and date.
2. Search in history page using all those parameters.
3. Notice that only grade change events that satisfy all criteria
    entered show up.
4. Search using any combination of parameters.
5. Notice that only grade change events that satisfy all criteria
    entered show up.

Change-Id: Ic6c7b87e96d7adf2f74569effe72547eb235dd17
Reviewed-on: https://gerrit.instructure.com/119922
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-03 16:52:11 +00:00
James Williams a06e73cc3a redirect back to settings page on copy/conclude/delete cancel
closes #CNVS-38454

Change-Id: Ic247f073b687fa2adb7974bb67054d93ecd17273
Reviewed-on: https://gerrit.instructure.com/121238
Tested-by: Jenkins
Reviewed-by: Jon Willesen <jonw+gerrit@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-08-03 16:29:07 +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
Ed Schiebel b1012f5849 Fix rogue tutorial tray close button
fixes FALCOR-519

Test plan:
  - as a teacher, go to a course's home page
  - open the tutorial sidebar
  > Expect it to have the ->| looking button to close, but ont the 'x'
    close button

Change-Id: I9f21f619c9831d800228aae7f33afabdc216ffb2
Reviewed-on: https://gerrit.instructure.com/119436
Reviewed-by: Jon Willesen <jonw+gerrit@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Tested-by: Jenkins
Product-Review: Steven Burnett <sburnett@instructure.com>
2017-08-03 14:27:53 +00:00
James Williams d8f5ef852a only fetch active announcements for public feed
closes #CNVS-38388

Change-Id: I66b21ba08980a26652fa8d91a6dc3f09ac3b266f
Reviewed-on: https://gerrit.instructure.com/120684
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-08-03 13:53:10 +00:00
James Williams 5dc376bfae prevent multiple listing in todo for moderated assignment
test plan:
* have multiple students submitted to a moderated grading
 assignment
* review one of the submissions
* the assignment should only appear once in the todo list

closes #CNVS-38312

Change-Id: Id5e2864aed0b2d2bec5718aa09c43239f58fba58
Reviewed-on: https://gerrit.instructure.com/119961
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-03 12:24:07 +00:00
Transifreq 1022cb7e4a update da translation
Change-Id: I4be29760890903c5310bfe1c57ac2ea0a26fe64f
2017-08-03 05:12:00 -06:00
Rob Orton 929755a27c soft delete admins on user importer destroy
refs CNVS-38231

test plan
 - run sis import destroying a user that is an admin
 - the admin object should exist in console with a deleted state

Change-Id: I049a721499764c7fafa3c3fed38fc9a842ff03b3
Reviewed-on: https://gerrit.instructure.com/121157
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2017-08-02 22:45:41 +00:00
Cameron Matheson 7a821f6f32 graphql: add submission type
closes CNVS-37581

Test plan: list the submissions in a course (make sure to test the
  studentIds and orderBy params)

Change-Id: Ica59cb08981ce37fb7e61e83fe891edda73a0b40
Reviewed-on: https://gerrit.instructure.com/121084
Tested-by: Jenkins
Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
QA-Review: Collin Parrish <cparrish@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2017-08-02 21:25:52 +00:00
Ryan Shaw f433ba9643 Fix High Contrast colors for buttons
Fixes: CNVS-38450

In my commit that started using css variables
for our buttons, I accidentally broke the styling
for high contrast buttons. This fixes that.


Test plan:
* open a browser window to /styleguide with this checked out
  and another window with styleguide on beta.
* make sure the buttons from each look exactly the same
* go to a page that renders the course nav, make sure
  The highlighted tab looks exactly the same in both windows
* also check that these things are right: https://cl.ly/2y110X0L0K1i
* now turn on high contrast in both windows,
* check all the same things to make sure they are the same
  in both windows
* give high contrast mode in general a lot of scrutiny.
  If anything looks different from how it does on beta, I need
  To fix that too.

Change-Id: I4237cc2f190232a84cc7b9364f3e55f9df863f11
Reviewed-on: https://gerrit.instructure.com/121163
Reviewed-by: Chris Hart <chart@instructure.com>
Tested-by: Jenkins
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2017-08-02 20:48:35 +00:00
Brian Park 4cf34158ae show pass_fail submission download link in gradebook
fixes: CNVS-38047

Test Plan:
1. Set up a pass_fail assignment that accepts file submissions
2. Make a file submission to assignment from step 1
3. Navigate to OG gradebook and click on the submission details
  - Observe that file submission link is visible
4. Change grade on the submission (to complete/incomplete)
  - Observe that file submission link is still visible

Change-Id: I666e42c1b2c8e1ecd5df71cd536b325e2d0138bf
Reviewed-on: https://gerrit.instructure.com/119899
Tested-by: Jenkins
QA-Review: Indira Pai <ipai@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-08-02 19:54:19 +00:00
Neil Gupta 700230c9e1 Add SpeedGrader to New Gradebook Grade Detail Tray
Fixes GRADE-112

Test plan:
* Open grade detail tray in new gradebook
* You should see a SpeedGrader icon above the present that directs
  to that student in SpeedGrader

Change-Id: I94b8fd6477e2ca4e6b1f340e633f5b7a87dd8a44
Reviewed-on: https://gerrit.instructure.com/120827
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-08-02 19:47:53 +00:00
Neil Gupta 8e0ab7da89 Show wider grading scheme input fields
Fixes GRADE-120

Test plan:
* Create a course
* Edit its grading schemes

The grading scheme inputs should be wide enough to see more than 3
characters at once.

Change-Id: I126e5c41e9eb7d3ae1208f99cf9e005592bb20d3
Reviewed-on: https://gerrit.instructure.com/120944
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Neil Gupta <ngupta@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-08-02 19:47:47 +00:00
Pam Hiett 3f680904bf Update color functions in /stylesheets/pages/login/_ic-login.scss
Fixes: CNVS-38401

test plan:
- as a user navigate to the login screen of canvas
- the "Log In" button should hover with a lightened version
  of the outline color of said button (** need to make sure
  the button displays/acts correctly no matter what theme
  variations are being used)
  example: https://screencast.com/t/I8EHMi5ub

Change-Id: Ied04496d00f2427d21ff94ce205eb0eb7dd48ef1
Reviewed-on: https://gerrit.instructure.com/121001
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
2017-08-02 17:12:02 +00:00
Chris Hart b72ad7cf55 Fix broken :focus states in Files Preview modal
Fixes: CNVS-38433

Test plan:
Go to the Files page for any course with uploaded files,
and click on a file in the list to activate the preview
modal:

Focus states before fix: https://cl.ly/2r2V0G412J0B

Focus states after fix: https://cl.ly/1l40042X083T

Change-Id: I232dc9e111b33f144589dfc6960df42ff5eb40f7
Reviewed-on: https://gerrit.instructure.com/121031
Tested-by: Jenkins
Reviewed-by: Pam Hiett <phiett@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Pam Hiett <phiett@instructure.com>
2017-08-02 17:11:20 +00:00
David Mirabile b50f3a3917 spec: fix a broken calendar spec
Change-Id: Ie76f4a002241ffb463d40324800284201a750252
Reviewed-on: https://gerrit.instructure.com/121249
Tested-by: Jenkins
Reviewed-by: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: David Mirabile <dmirabile-c@instructure.com>
QA-Review: David Mirabile <dmirabile-c@instructure.com>
2017-08-02 16:54:25 +00:00
Caleb Guanzon d16850c334 do not show crocodoc firefox warning when docviewer is used
refs RD-4363

TEST PLAN:
- must have canvas and docviewer both up and running
- with the crocodoc plugin enabled and canvadocs disabled
- submit a file upload assignment and view it as a teacher
   in speedgrader in firefox
- you see the crocodoc ff warning
- repeat with crocodoc on, canvadocs on, but no checkboxes
   checked
- you still see the crocodoc ff warning (since the submission
   displays in crocodoc still)
- repeat with crocodoc on, canvadocs on and both checkboxes checked
- you do not see the crocodoc warning
- repeat with crocodoc off and canvadocs on with both checkboxes
   checked
- you do not see the crocodoc warning

Change-Id: I1da6aec83bbd1ab10f93327196e6a6d9fd8cf5f0
Reviewed-on: https://gerrit.instructure.com/121136
Tested-by: Jenkins
Reviewed-by: Aaron Shafovaloff <ashafovaloff@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
QA-Review: <sganesan@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2017-08-02 16:03:00 +00:00
Cody Cutrer c3e4d6630e don't allow vanilla polymorphic: true
Change-Id: I7bde198887b111ac0883fe923eb45bd690426e7e
Reviewed-on: https://gerrit.instructure.com/121040
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2017-08-02 15:13:53 +00:00
Spencer Olson d8ce0c5a40 spec: fix fragile submission spec
Change-Id: I4f463165b6d7f15973dd943841bd9a092e7921f4
Reviewed-on: https://gerrit.instructure.com/121197
Tested-by: Jenkins
Reviewed-by: Derek Bender <djbender@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
QA-Review: Spencer Olson <solson@instructure.com>
2017-08-02 14:51:28 +00:00
Gary Mei 65817d62b8 use autocomplete for assignment field
closes CNVS-36346

Assignment searching by name instead of id.

Test Plan
1. Grade some assignments.
2. Search by the assignment's name in Assignment field.
3. Notice that the autocomplete component shows names.
4. Notice also that the name options are scoped to that course.
4. Select a name and click the Find button.
5. Notice that the results are for that assignment.

Change-Id: I6a8cf3afc7bd3e27559f6238a356e182d3a026c5
Reviewed-on: https://gerrit.instructure.com/119494
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-08-02 14:23:06 +00:00
Transifreq ad5402fbd6 update is translation
Change-Id: If86c621c39e44b1aad4dfa777a5ae4d4680f44c2
2017-08-02 05:15:02 -06:00
Transifreq 2040d4c226 update da translation
Change-Id: I1318ce9cde9a28958f4f9e439a6fb4f9403e0574
2017-08-02 05:07:54 -06:00
Cody Cutrer ff5b0d3a9d fix return value of delete_all with joins
Change-Id: I648cf30f067d181d7cca757ff27d481966dfeea3
Reviewed-on: https://gerrit.instructure.com/121155
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2017-08-01 21:06:40 +00:00