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>
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>
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>
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>
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>
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
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>
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>
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>
test plan:
* create a custom teacher role with "Manage assignments/quizzes"
disabled
* a teacher with that role should be able to see and preview
a quiz
closes #CNVS-30574
Change-Id: Ib036b2f352c63c63fc4454e08d80d21f34415ce0
Reviewed-on: https://gerrit.instructure.com/86119
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
refs CNVS-28647
Test Plan:
- Enable course images feature flag
- Go to course settings
- Click the "Change Image" button
- Drag an image file to the drag-n-drop zone
- The file will upload and the modal will close
- The course image setting will now show the new
image.
- Save the course settings
- The new image should persist.
Change-Id: I9922d3ede6fdd17d7503f8de78035245decfa320
Reviewed-on: https://gerrit.instructure.com/77177
Tested-by: Jenkins
Reviewed-by: Matt Zabriskie <mzabriskie@instructure.com>
QA-Review: Pierce Arner <pierce@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
fixes: CNVS-30679
in new UI, if you had custom CSS/JS for siteadmin
theme, but you didn't create any themes for your
root accounts or child accounts. when you loaded
a page, it would not include the site admin's custom
css/js
test plan:
* make sure no brand configs are applied to the root
account or the sub account you are looking at
* create a theme for the site admin that has custom
css/js.
* load a page
* it should include the css/js for that theme
this should have already worked, but good to confirm
that it still does:
* now, with that theme applied to site_admin,
make a theme for your root and child accounts
and give them some custom css/js too
* load a page
* it should include js/css from
first, the site admin account
second, the root account
last, the child account
Change-Id: I65e676b9b015959995d205e949021ac1c7211381
Reviewed-on: https://gerrit.instructure.com/86544
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
This reverts commit 78268a8821.
fixes CNVS-30696
test plan:
- add a custom account js include
- make sure it loads properly all the time
Change-Id: Ie708c17c7d27c6caaf46a79df115557737701286
Reviewed-on: https://gerrit.instructure.com/86596
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
closes CNVS-28646
Test Plan:
- Enable course images feature flag
- Set a course image in Canvas, currently only via API these
instructions should work:
Send a PUT request to /api/v1/courses/XX containing
course[image_url]=https://farm2.staticflickr.com/1467/26130879670_eb41e73f3c_z.jpg
- Go to the course settings page, you should see an image there :)
Change-Id: I7ef6f6e3b69c418b7d1ae868e672486a2de0c873
Reviewed-on: https://gerrit.instructure.com/77020
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins
Reviewed-by: Matt Zabriskie <mzabriskie@instructure.com>
QA-Review: Pierce Arner <pierce@instructure.com>
fixes CNVS-30098
The course/:course_id/quizzes/:quiz_id/submissions api returns
different things in different cases and the mobile teams want a way to
be able to easily get the submission for the current user so they don't
have to do client-side filtering on all of the apps. Let's add that as
course/:course_id/quizzes/:quiz_id/submission that'll only ever give
any one submission for you.
Also update the docs for the existing API so it is more clear what it
does.
test plan:
- request the new API as a student without a quiz submission and verify
you are returned an empty set of quiz submissions
- request the new API as a student with a quiz submission that is not
yet submitted and verify that you are returned a single quiz
submission with workflow_state = untaken
- reuqest the new API as a student with a quiz submission that is
submitted and verify that you are returned a single quiz submission
with workfow_state = complete
- request the new API as a student with a quiz submission that has many
submitted attempts and verify that you are returned a single quiz
submission with workflow_state = complete and attempt number is the
latest attempt
- request the new API as a teacher or admin and verify that you are
returned an empty set of quiz submissions
- request the new API as a teacher or admin who is also a student with a
quiz submission and verify that you are returned only your one quiz
submission
Change-Id: Ib364e9c4be0f196c10892dafe5bad75c86acbdbc
Reviewed-on: https://gerrit.instructure.com/83846
Reviewed-by: Davis Lynn McClellan <dmcclellan@instructure.com>
Tested-by: Jenkins
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Brandon Pluim <bpluim@instructure.com>
test plan:
- have a course with only one section
- create an assignment and set up per-student overrides
- add the assignment to a module
- ensure that, as a teacher, the modules page shows
"Multiple Due Dates" for the assignment
fixes CNVS-30620
Change-Id: I8244cac632511fcb789673270e98afc68b0378ef
Reviewed-on: https://gerrit.instructure.com/86447
Tested-by: Jenkins
Reviewed-by: James Williams <jamesw@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
add spec to test link to grading standard page from terms page
Change-Id: Ib092d0f5242accc2f8fe87faaaf71e9ee8769d8c
Reviewed-on: https://gerrit.instructure.com/86474
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Reviewed-by: KC Naegle <knaegle@instructure.com>
Product-Review: KC Naegle <knaegle@instructure.com>
test plan:
- add a "course_format" column to courses.csv
- put "on_campus", "online", and "blended" in rows
- perform a SIS import
- ensure in course settings that the setting was
imported properly
- ensure the setting is updated after a re-import
closes CNVS-30561
Change-Id: I0153c91c897cdffeb9021b65127006961989494e
Reviewed-on: https://gerrit.instructure.com/85967
Tested-by: Jenkins
Reviewed-by: James Williams <jamesw@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
once all of the enrollment states have been calculated,
we probably won't need all the dates to know what our current
state is
Change-Id: I489c43d4daeea5c431f468cbcf920d34a878e2b1
Reviewed-on: https://gerrit.instructure.com/83878
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
Add some documentation for Docker for Mac now that it is out of beta and
is available in a stable form. Also add some info on dory for linux.
Test Plan:
None. Documentation only.
Change-Id: I38cee842dcc7a8fa24a1606d5fd684777b8c9690
Reviewed-on: https://gerrit.instructure.com/86507
Tested-by: Jenkins
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Andy VanWagoner <andy@instructure.com>
Reviewed-by: Andy VanWagoner <andy@instructure.com>
With two files and only one small spec in coffeescript, this commit
unifies everything under just the javascript version and removes the
coffeescript.
Change-Id: I4b4dd43a10e297ab79d0d6c39450d5ea12c5cf6f
Reviewed-on: https://gerrit.instructure.com/86358
Tested-by: Jenkins
Reviewed-by: Matthew Sessions <msessions@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Clay Diffrient <cdiffrient@instructure.com>
closes CNVS-30441
Test Plan:
- Enable conferences
- Go to conferences
- Click the "+ Conferences" button
- "New Conference" should be displayed in the title bar of the modal
- Edit the collaboration you've just added
- "Edit 'your collaboration title'" should be displayed in the title bar
- A screenreader should also read these properly
Change-Id: If8cc4abd7117b065bc633c20a3b49d691b659b67
Reviewed-on: https://gerrit.instructure.com/86337
Reviewed-by: Matthew Sessions <msessions@instructure.com>
Tested-by: Jenkins
QA-Review: David Tan <dtan@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
test plan:
- render docs and notice calendar_event[context_code] in
the "Update a calendar event" action
- exercise this option to move events between calendars
(course / group / user)
- ensure you get an appropriate error if you attempt to
move a section-specific event or a Scheduler appointment
closes CNVS-30524
Change-Id: I4bb2820bc5f0507324f3f314afb2945042f30161
Reviewed-on: https://gerrit.instructure.com/85766
Tested-by: Jenkins
Reviewed-by: James Williams <jamesw@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
supports cors in cyoe
refs: CYOE-245
Test plan:
1. Parse CYOE jwt, verify that domain is included in the
main jwt (previously only in the embedded canvas jwt)
Change-Id: I5a9949dd01271322cbd6c6f0819ea5d63a7222a0
Reviewed-on: https://gerrit.instructure.com/86172
Tested-by: Jenkins
QA-Review: Alex Morris <amorris@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
Fixes CNVS-30503
Test plan:
- Enable the Recurring Calendar Events feature flag on an account
- Masquerade as a user in that account
- Go to the calendar
- Click the + button
- Make sure the user's personal calendar is selected in the dropdown
- Click "More Options"
- Make sure a "Repeat" checkbox shows up
Change-Id: Iff9c9600a309d1bb78c47369b0d8c9da5b89d7ae
Reviewed-on: https://gerrit.instructure.com/85684
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Alex Boyd <aboyd@instructure.com>
refs #CNVS-30511
Change-Id: Ia75f7265c3771a318e99548d45ff2bac696fa02c
Reviewed-on: https://gerrit.instructure.com/86346
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
fixes CNVS-30486
test plan:
- enable the rich content editor and sidebar feature flag
- set the syllabus to the course home page
- edit the syllabus from the home page
- the sidebar should correctly toggle to the content editor sidebar
Change-Id: I5c8cd71979336b9e9fc3e900013970ecace2c829
Reviewed-on: https://gerrit.instructure.com/85726
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
fixes CNVS-28806
Change-Id: I890371f0f65499d4be09f7a5576139e6f71519f6
Reviewed-on: https://gerrit.instructure.com/83251
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
fixes CNVS-30455
test plan
- create a calendar event
- navigate to /calendar?event_id=1234 using the id of the event
you created instead of 1234
- ensure that the event detail tooltip doesn't jump to the top
left of the window
no automated tests because this is a horrible frontend bug to do
with positioning and it would be a sin to write a selenium spec
for it.
Change-Id: Ic16bd769bc845768e484f2b677c14fc03b2bbfb8
Reviewed-on: https://gerrit.instructure.com/86239
Tested-by: Jenkins
Reviewed-by: Matthew Sessions <msessions@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
fixes: CNVS-30540
test plan:
- the aria-label for tool-tips in gradebook are no
longer incorrectly htmlEscaped
Change-Id: I3a78e91c96f652b5f6d4acfab1efb91684cf15be
Reviewed-on: https://gerrit.instructure.com/85890
Reviewed-by: Nicholas Pitrak <npitrak@instructure.com>
Tested-by: Jenkins
QA-Review: Amber Taniuchi <amber@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
when 'current_grading_period_scores' are requested from
the courses API, there will now be a
'multiple_grading_periods_enabled' key returned which
indicates whether or not the course has the multiple
grading periods feature enabled.
closes CNVS-30327
test plan:
- in a course with multiple grading periods enabled,
hit the courses api index with the
current_grading_period_scores flag. for example:
GET api/v1/courses/2?include[]=current_grading_period_scores
- verify the response has a 'multiple_grading_periods_enabled'
key, and verify the value is true
- disable the multiple grading periods feature for the course
- hit the courses api index with the current_grading_period_scores
flag again
- verify the response has a 'multiple_grading_periods_enabled'
key, and verify the value is false
- hit the courses api index without the current_grading_period_scores
flag. for example:
GET api/v1/courses/2
- verify the response does not have a
'multiple_grading_periods_enabled' key
Change-Id: I244aadb6fa9ad86f9cd866a3790501f447bd5037
Reviewed-on: https://gerrit.instructure.com/85496
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
closes CNVS-25155
Test plan:
* set up grading periods
* run the "MGP Grade Export" report
* try it with all terms and a specific term
* make sure the grading period grades are correct
Change-Id: Id81615396ccd8aa917e382724e33bc488dec8b93
Reviewed-on: https://gerrit.instructure.com/84003
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Tested-by: Jenkins
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Christi Wruck
fixes CNVS-30433
and match them exactly
test plan:
* edit an existing developer key
* it should list both a legacy redirect URI, and a place
to put multiple redirect URIs
* add some URIs to it and save
* reload the page, and edit again
* they should be there
* add a new developer key
* it should not have a place to put legacy redirect URI
* save, refresh, edit, and it still shouldn't
Change-Id: Ie61c9b4026ca675df8f64d660480e52fafff0c57
Reviewed-on: https://gerrit.instructure.com/76990
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
James Williams
