Change-Id: Ibdbca9847de64e79f472df8d3ff886e3b9c4a4ba
Reviewed-on: https://gerrit.instructure.com/122503
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
refs CNVS-38321
test plan:
* go to account settings
* open the time zone dropdown
* there shouldn't be a bunch of zones at the top without translations
Change-Id: Ib3d641f641c0773e510eb36f3e85fba3c257a036
Reviewed-on: https://gerrit.instructure.com/122163
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
it's a new named time zone
fixes CNVS-38321
Change-Id: Ie5424a164ad3e67d34a20c5d33850efb8c2886ec
Reviewed-on: https://gerrit.instructure.com/122177
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
closes QUIZ-2232
test plan:
- As a teacher, navigate to the Assignments page of a course
- Click on the "+Quiz/Test" button
- Tab to the cog menu in the top right corner
- "Not Published" label should not be tabbed
Change-Id: Icb00788f0df73b59819e6c09bdd66dfc0041d628
Reviewed-on: https://gerrit.instructure.com/121847
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Omar Khan <okhan@instructure.com>
Product-Review: Han Yan <hyan@instructure.com>
closes OUT-1431
notes:
this upgrade is necessary to avoid imports from failing on Rails 5.
test plan:
- confirm that importing standards from Academic Benchmarks v3 succeeds
Change-Id: I8daac14a2ec6100d5cc97d5a76433808d742bc44
Reviewed-on: https://gerrit.instructure.com/122487
Tested-by: Jenkins
Reviewed-by: Michael Brewer-Davis <mbd@instructure.com>
QA-Review: Andrew Porter <hporter-c@instructure.com>
Product-Review: Michael Brewer-Davis <mbd@instructure.com>
Change-Id: I2139b75e78b02fba2232cc78ccce527b20eea3da
Reviewed-on: https://gerrit.instructure.com/122325
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
also remove a method that doesn't do anything
should make things faster maybe?
Change-Id: Ie3849b6faa539317338c6f55a0f7be86b8a20c3d
Reviewed-on: https://gerrit.instructure.com/122440
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 the ability to select a role in User Search and
only see users enrolled as that role
closes CNVS-33428
test plan:
- turn on Account Course and User Search feature flag
- go to /accounts/1/search/people
- make sure the new role selector works
- make sure the correct users show up
- make sure keyboard navigation/a11y are good
Change-Id: Ib0620deb4618e06ce202ab41981e1301b3c8d256
Reviewed-on: https://gerrit.instructure.com/119365
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Andrew Katsanevas <akatsanevas@instructure.com>
the issue is that our js_env helper short circuits if request.type.html?
is false, which apparently it is for */*, even though respond_to then
resolves it to html.
fixes CNVS-38332
test plan:
- request the announcements index page, passing a */* accept header
- it should respond without error
Change-Id: Ib9e2f48b5ff6419a1de5ef2af76b30a54b5c92db
Reviewed-on: https://gerrit.instructure.com/120096
Reviewed-by: James Williams <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
at some point we started loading/caching the cassandra config before
forking, which made every worker share the same keyspaces, causing
various specs to fail during the initial run
test plan:
* the build should be more stable
Change-Id: I804178152c165d72f3665ce1103c8af4736a9aa6
Reviewed-on: https://gerrit.instructure.com/122252
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Change-Id: I93e7764dc0a400ab0e422b824c6cb954dc135351
Reviewed-on: https://gerrit.instructure.com/122466
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Change-Id: Ic66c2b859214bc9ab3f09f873f4deb2deab2637f
Reviewed-on: https://gerrit.instructure.com/122131
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
don't need to serialize a whole user AR object just for a name
closes CNVS-38377
test plan: make sure all scheduler notifications from appointment groups
still work
Change-Id: Ie2343b90ec189ca30ce9ae2f9dd35a529e57d9ff
Reviewed-on: https://gerrit.instructure.com/120519
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
fixes: CNVS-38329
test plan:
- create a master course with a discussion and sync to a child course
- go to the master course discussions page
> expect the lock, publich and subscribe buttons to be on a single
> line
- go to the child course's discussions page
> ditto
Change-Id: I5b0109f25776bc7cca5c238399391e34ba1d5e2c
Reviewed-on: https://gerrit.instructure.com/120080
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: David Mirabile <dmirabile-c@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
Tested-by: Jenkins
fixes GRADE-75
test plan:
* Create a Quizzes.Next quiz
* Complete the quiz as 2 different students
* As the teacher, access the quiz in speed grader
* Adjust the fudge points for the first student
* Navigate to the second student and then back to the first student
* The quiz should still be visible
Change-Id: I4cd9d743f8a2c0c5b511f8f5615c8ed0edc81991
Reviewed-on: https://gerrit.instructure.com/122041
Reviewed-by: Brian Park <brian@siimpl.io>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Tested-by: Jenkins
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
Change-Id: I9a8764caf8e6d435a79b1b61db5526258ace63a2
Reviewed-on: https://gerrit.instructure.com/122358
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
this will help speed up ContextModuleProgression#evaluate a bit more.
test plan: basic regression test of evaluate (tests should pass)
Change-Id: Id85c6c182a59b4f6afeb91e6a52137fd75d9518d
Reviewed-on: https://gerrit.instructure.com/122169
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
update: code review
update: add a force click function to the code
update: update the comments on the force click function
Change-Id: I6a7b2a631a6039cf86d721310038a76a2e72c17f
Reviewed-on: https://gerrit.instructure.com/121602
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Closes: CNVS-38601
This change makes it so if you have a database
connection, it will look at the db for the brand_configs
that exist there and generate them all when you
compile_assets. It should prevent people in dev
mode from getting the vanilla white page
that you get when you get a 404 for the css file
That has all of your brand_configs css variables.
Test plan:
* set up a custom theme for yourself in canvas
* rm -rf public/dist
* check this out
* run bin/rake canvas:compile_assets
* load a page,
* you should not get a 404 for a css file or js file
with your brand_variables
* the page should be themed and not be a vanilla white page
Change-Id: I796ac99c06aafe5d7d229e457988094a7b48e8bd
Reviewed-on: https://gerrit.instructure.com/122155
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
This came out of hack night at InstCon
Test plan:
* Create a grading standard via the api
* Using the id that is returned from that request retrieve the grading
standard using the following endpoint:
/api/v1/courses/:course_id/grading_standards/:grading_standard_id
* Try and retrieve a grading standard with an id that doesn't exist
* Ensure that you get a 404
* Try to retrieve a grading standard with a user that doesn't have
permission to do that in the context
* Ensure that you get a permission related response
Change-Id: Id7f5652c9735078c4d7a29f3c3e6790eb51e7311
Reviewed-on: https://gerrit.instructure.com/120685
Tested-by: Jenkins
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
Change-Id: Id0e0ad36c03cb52eb9ec158318a456386b169679
Reviewed-on: https://gerrit.instructure.com/122209
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
Fixes: CNVS-38514
test plan:
- as a user navigate to dashboard
- if *not* HC ensure the "To Do" links are not underlined by
default.... but do underline upon hover
- now go to user settings and turn on HC to ensure the same
links are now underlined by default and do not upon hover
- lastly, turn off HC mode for user settings but turn on
"underline links" to ensure the same "To Do" links
underline properly
Change-Id: Ic181a8067bd2abf5ca194314e0e0347ef6663427
Reviewed-on: https://gerrit.instructure.com/121806
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Stephen Jensen <sejensen@instructure.com>
closes: GRADE-133
Test Plan:
1. Navigate to gradezilla
2. Change some late policy values in settings cog menu
3. Observe that upon clicking 'Update' in the menu,
all late and missing assignments are updated to show
the new grades.
- Late submission deductions are applied when enabled
- Late submission deductions are updated when penalty
value is changed
- Late submission deductions persist when late
deductions are turned off
- Missing submission grades populated when policy set
- Does not affect existing grades!
- Missing submission grades unchanged when policy unset
- Submissions in closed grading periods are unaffected
by any late or missing policy changes
Change-Id: I6d0f759a1653ab58a749a9d7b0b95eff453a432c
Reviewed-on: https://gerrit.instructure.com/119148
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
Reviewed-by: Neil Gupta <ngupta@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
fixes: GRADE-3
depends-on: GRADE-133
Test Plan:
1. As teacher/admin, navigate to Gradezilla
2. Set up a late policy
3. Find or locate a late submission
4. Grade the late submission
- Observe late penalty is applied
5. Re-grade the submission as its adjusted grade, e.g.:
- 90/100 is penalized to 80/100
- submission is regraded as 80/100
6. Observe the late deduction is applied to the new grade
7. Repeat 3-6 with SpeedGrader, Submission Details Page
Change-Id: I392e5adeeef9354f7a8953f267d13b984b048530
Reviewed-on: https://gerrit.instructure.com/121200
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
Change-Id: I60ec3b519219fcb5256a132c05f63538600df73f
Reviewed-on: https://gerrit.instructure.com/121760
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
use content_tag_for on creation so we can populate the
@content_tag_index for reuse in the migration
closes #CNVS-38017
Change-Id: Ia1b9fd773f55b4e3dcd068c740896ff0ec6d43e0
Reviewed-on: https://gerrit.instructure.com/122108
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
this was caused by jquery's data() function converting strings to
integers. e.g. "01" -> 1
fixes: GRADE-169
test plan:
- Given an assignment created with an override
- When clicking save after editing the title of the assignment
- Then the assignment is saved and there are no javascript
errors in the console
Change-Id: Idf8f41b72488edf5c76fd201fa1c4fa922ee1446
Reviewed-on: https://gerrit.instructure.com/121879
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
This method is already defined by YARD, but we don't include YARD in our
production dependencies, so we have to reimplement it.
Test plan: check that production builds work
Change-Id: I1dc383b8ca5414a57151ac409795e53932f9cd8a
Reviewed-on: https://gerrit.instructure.com/122078
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins
Change-Id: Ic20d7c2c814217ff777427f4e3da6a82d5ea5c0d
Reviewed-on: https://gerrit.instructure.com/122113
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
also include the user in the error for observing self
fixes CNVS-38574
test plan
- user observer importer should work
Change-Id: I27e3b79076724eba2bff61bc74d4018e782e319a
Reviewed-on: https://gerrit.instructure.com/122059
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
fixes CNVS-38441
test plan:
* configure CAS as a primary auth provider
* add and login as a Canvas auth user
* when you logout, it should return you to /login/canvas, not to the
CAS server
Change-Id: I9d839b7efdc81f307adfbd6d3c128faee64361d4
Reviewed-on: https://gerrit.instructure.com/121054
Tested-by: Jenkins
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
On the OAuth2 screen, make user profile link
open in new tab, rather than within the iframe.
closes CNVS-37023
test plan:
- create a developer key
- go to /login/oauth2/auth?client_id=<your_dev_key_id>&response_type=code&redirect_uri=urn:ietf:wg:oauth:2.0:oob
- click the "You are authorizing this app as <user_link>"
- make sure it opens in a new tab
Change-Id: Ic9e8997c922024167e649dd20a3308f5f2fdeaf0
Reviewed-on: https://gerrit.instructure.com/121631
Tested-by: Jenkins
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
Product-Review: Brent Burgoyne <bburgoyne@instructure.com>
fixes CNVS-38446
refactor InCommon to be a common base class for both, and in our
special casing of InCommon refactor to iterate the children
classes
test plan:
* add a SAML config with either InCommon or UK Federation special
metadata URIs, and a valid entity ID for a school that's part of
one or the other
* the rest of the metadata should populate without error
Change-Id: Ie2d37e942cc35333ee16d1f0b3cbb2dc81f53767
Reviewed-on: https://gerrit.instructure.com/121421
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
refs FALCOR-544
refs FALCOR-539
Test plan
- Create some grading items and some discussions/announcements
- Ensure they are not showing up with the new_activity flag
- in the API yet
- Ensure they do not show new_activity for submissions
- Grade or add feedback to the grading items
- Reply to the discussion/announcements
- Ensure that the api now does show new_activity
Change-Id: I8cf448c3296c21057aba9a9006b8efd8044986bd
Reviewed-on: https://gerrit.instructure.com/120658
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: David Mirabile <dmirabile-c@instructure.com>
Product-Review: Christi Wruck
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>
Closes: CNVS-38435
Test plan:
* check the places where these variables are used
* they should look exactly how they did before
* especially test these things in high contrast mode
Change-Id: Idfb5a9f240d2710af1891eeb8a478678ac4c38bd
Reviewed-on: https://gerrit.instructure.com/120896
Tested-by: Jenkins
Reviewed-by: Pam Hiett <phiett@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
James Williams