fixes CNVS-21903
When in tinymce, if you had a table with a link inside of it and you
selected the link, then selected something from the wikisidebar it
would remove all of the styles and surrounding html from the link. This
commit ensures that the link changes but html and styles continue to be
preserved.
Test Plan
Open up tinymce where there is a wikisidebar (pages for instance)
Create a table in the text editor
Insert a link into a table row/column
Add surrounding <span> or <div> tags to the link via html editing tool
Use the wikisidebar to modify the link by selecting it with your cursor
and then clicking on a link in the wikisidebar.
Check the html in tinymce. Ensure that the span/div and all styles are
still there.
Change-Id: I290f0fc24e61475f50492ffbde35d5f720b48c4f
Reviewed-on: https://gerrit.instructure.com/59196
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
they work on rerun, but it would be better to fix them right away
refs #CNVS-21596
Change-Id: Ib66c45dc368e1832940bff6e4ee5305312be894d
Reviewed-on: https://gerrit.instructure.com/59828
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-22252
to ameliorate race conditions between saving and re-filling of cache
Change-Id: I7cee9a447a444e1bd84fc0fa2c16d40b35db3e69
Reviewed-on: https://gerrit.instructure.com/59637
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nick Nelson <nick@instructure.com>
fixes CNVS-15622
test plan:
- go to a video with closed captions
- make it full screen
- multi line captions dont overlap
and font size is reasonable
- make it small again
- multi line captions spacing
and font size are reasonable
Change-Id: I0908d2617ceb409adecffa285d2cde9e2c9e6a57
Reviewed-on: https://gerrit.instructure.com/58829
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
fixes: CNVS-22211
test plan:
* make changes in theme editor,
* the banner at the top of the page should say this
new message
Change-Id: Ib1b15540446b6df01fe7987f9f5e8bd955b208b0
Reviewed-on: https://gerrit.instructure.com/59451
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
closes #CNVS-22242
Change-Id: Ie3fc503ae2439ffc63f90ba35dabc07ef4716d1f
Reviewed-on: https://gerrit.instructure.com/59815
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 reverts commit 65844abf61.
Change-Id: Iec80658f26122ef3355becd281004d8830220ecb
Reviewed-on: https://gerrit.instructure.com/59834
Reviewed-by: James Williams <jamesw@instructure.com>
Tested-by: Jenkins
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
refs #CNVS-21596
Change-Id: I6163197b1aad43682fcc5e366d2733683c37d003
Reviewed-on: https://gerrit.instructure.com/59766
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
make sure to remove this once we're on rails 4
refs #CNVS-21596
Change-Id: I1b6ddef79ab2bae44a81e3e53112725b9c229aff
Reviewed-on: https://gerrit.instructure.com/59737
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-21596
Change-Id: I341418b7387ca8c09d1248466bd24d088495d1a6
Reviewed-on: https://gerrit.instructure.com/59615
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
%d returns a zero-padded date, meaning this breaks during
the first 9 days of the month (e.g. "Aug 03" vs "Aug 3")
Change-Id: Id518ab9be84a394b25d43fad96f53a1de93841bb
Reviewed-on: https://gerrit.instructure.com/59817
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
Fixes CNVS-21982
Test Plan:
1. As a student enrolled in a course, view the course
enrollments from the drop down menu and ensure that
the 'Enrolled As:' text under the course name is large
enough to meet A11y standards
Change-Id: I3a1bb5652bd1c042009cf8af9490b8ea737b7401
Reviewed-on: https://gerrit.instructure.com/59163
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Nick Nelson <nick@instructure.com>
Fixes CNVS-21984
Test Plan:
1. Navigate to Courses show page as a teacher for unpublished course
2. Inspect Element and ensure that the #course_status div has an <h3>
tag in the div instead of <h4>
3. Ensure styles for this specific header are same as previous version
with <h4> tag
Change-Id: I5c3a86e76d46cd9655b55b317adfd29a113e41cf
Reviewed-on: https://gerrit.instructure.com/59173
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Brock Cooper <bcooper@instructure.com>
Fixes: CNVS-22090
This change involves the location of the
"Switch to Individual View" link on the
gradebook page in both the NUI and legacy
Canvas.
Test Plan:
- Navigate to the gradebook page.
- Previously "Switch to Individual View" was
part of the breadcrumb as can be seen here:
NUI: http://screencast.com/t/OYLhED9MRo
Legacy: http://screencast.com/t/zhrnyd5HF
- We have made the following changes
* Instead of a link, it is now a button.
* It is now located in the gradebook header
on the the right side
http://www.screencast.com/t/tby7EmuP7ldK
- Clicking on the button should take you to
the corresponding 'Gradebook: Individual
View' page.
- In both legacy Canvas and the NUI the
behavior should be the same.
- NOTE: Because the 'Individual View' link was
previously in the breadcrumb, the corresponding
gradebook2_srgb_spec was failing because it was
still looking for the 'ellipsible' class (a
class associated with breadcrumb elements)
Because the link has now been removed from the
breadcrumb, the 'ellipsible' class was also
removed in order to update the spec.
Change-Id: Id53ca2b81904447aa57b8ce527598d08f458056b
Reviewed-on: https://gerrit.instructure.com/59292
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Fixes: CNVS-21906
Test plan:
- Make sure the Use New Styles feature flag is
set to ON
- Open Theme Editor from your admin account
- Make sure Canvas iframe on right side now
opens on this page ...
http://cl.ly/image/2c3k1R3V3U0T
... instead of on the Dashboard
- Theme editor should work the same
as before this change
Change-Id: Ifa38134ba186bc49c12062ae914a004b3664d189
Reviewed-on: https://gerrit.instructure.com/59007
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Myller de Araujo <myller@instructure.com>
Test plan
The following routes should resolve:
/api/sis/accounts/sis_account_id:123/assignments
/api/sis/courses/sis_course_id:456/assignments
fixes SIS-1310
Change-Id: I0a8057989d9387ba447d3f3a01dc8c232933e828
Reviewed-on: https://gerrit.instructure.com/59455
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
Tested-by: Jenkins
Reviewed-by: Nick Houle <nhoule@instructure.com>
QA-Review: Kausty Saxena <kausty@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
fixes CNVS-22245
test plan:
- render the api documentation, and look at the discussion topic section
- verify that in the update method, 'pinned' is listed as a param
- verify that in the create method, 'pinned', 'allow_rating',
'only_graders_can_rate', and 'sort_by_rating' are listed
- verify that all the newly listed params are functional
Change-Id: I0f055d975c4a0be1a4edce735c70d8b4e176f6a2
Reviewed-on: https://gerrit.instructure.com/59614
Tested-by: Jenkins
Reviewed-by: Cameron Sutter <csutter@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
closes: CNVS-22232
Test Plan:
- Go to Theme Editor
- In hex code box do something like "#0" and cause the red error box to appear
- Add something longer in there ("#92837498798324") to make it a longer
error string
- These should now be working xbrowser without cutting off the box
Old: see ticket
New: http://cl.ly/image/3o2c2c273b18
Change-Id: I941dafc250cb41af632924303f76bde245e6860f
Reviewed-on: https://gerrit.instructure.com/59742
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
closes: CNVS-22285
since we took out all usage of the $is-k12 sass variable
when we removed the legacy k12 stuff we did, there
is no actual difference between the new_styles
and k12 variants. so we don't need to generate
2 different files for now (since their output will
be exactly the same).
this will cut the css generation time in half
when deploying and when generating a preview in
theme editor since instead of outputting 2 css files
(1 for new_styles_normal_contrast and 1 for
k12_normal_contrast) for every css bundle for every
theme, we just make one (new_styles_normal_contrast)
In the future, ui/ux might want to reintroduce
a sass variable like $is-k12 to do different things
if they are a k12 school. But when/if we do that,
we can just save it as part of the variables saved
in the school's brand_config from the theme editor.
that will be possible because when you turn on the
k12 feature flag, it defaults to using the
predefined 'K12 Theme' brand_config so *all* k12
schools will have a brand_config
test plan:
make sure canvas looks the same as it did before if
you have the k12 feature flag turned on
Change-Id: I197c30b9c5ed5150a3683f836008cbdbce78b09d
Reviewed-on: https://gerrit.instructure.com/59743
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Test Plan: Run specs
The only changes made to these specs is the pointer to shared examples.
No other refactoring was done.
Change-Id: Iff8f35a975fafbf994f995577b39de9e646db6fa
Reviewed-on: https://gerrit.instructure.com/59658
Tested-by: Jenkins
Reviewed-by: Heath Hales <hhales@instructure.com>
Reviewed-by: Adrian Foong <afoong@instructure.com>
Product-Review: Ben Bolton <bbolton@instructure.com>
QA-Review: Ben Bolton <bbolton@instructure.com>
Fixes: CNVS-22148
Test Plan:
- In Safari, with VoiceOver enabled,
navigate to the settings for the
account.
- Click on the Open Theme Editor
button on the right.
- The icon in the top left should
now be ignored completely by
VoiceOver and focus should now
start on the theme editor's
heading.
Change-Id: Ic58819a60f569c882ce8adb4dadc84c235c76231
Reviewed-on: https://gerrit.instructure.com/59441
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
This will make the page a little faster, but unfortunately the bulk of
the time comes from counting active users in each term, and whether we
do that as N queries or 1, the overall time is about the same. To
really get this page to perform well, we need to look into storing these
counts somewhere that don't have to be calculated every time.
fixes CNVS-21524
test plan:
- set up several enrollment terms with different numbers of courses and
users in each.
- to go the root account enrollment terms page, and make sure the counts
of active courses and users is accurate.
- try deleting some of the courses and users and make sure counts update
appropriately.
- basic regression test of functionality around saving/editing
enrollment term start/end date overrides
Change-Id: I35fb637ddd91db64c4a5890d58a622f5affa3923
Reviewed-on: https://gerrit.instructure.com/56439
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
closes: CNVS-22128
fixes: CNVS-22266
before, we just revved everything in public
even though it was never included into the page.
that took forever, especially for things like
the entire bower directory.
this only revs the things we actually include on
the page
test plan:
* rm -rf public/dist
* compile_assets
* notice that gulp rev takes ~800ms instead of forever
* browse canvas in both prod (so it uses optimized js)
and non-optimized
* look at the browser console and make sure you don't
see any 404s
* specifically look at:
analytics: https://jeremyp.beta.instructure.com/accounts/90336
icons in tinymce toolbar
quizzes (specifically the quiz statistics client app stuff ahmad did)
Change-Id: Ia67e79de4f4be23de069d43427af1a3377d72fd2
Reviewed-on: https://gerrit.instructure.com/59183
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
fixes: CNVS-22177
test plan:
* go to the theme editor and try to upload a
"Mobile Homescreen Icon"
* the helper text should tell you can only use pngs
* and the file picker should only be able to pick
png files
Change-Id: I9ef7402bd08fdb70512604eefce5e0da1ae8abbb
Reviewed-on: https://gerrit.instructure.com/59406
Tested-by: Jenkins
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
fixes CNVS-22149
fixes CNVS-22150
test plan:
- go to theme editor with a screenreader
- input an invalid color
- when the red error box pops up the
screenreader reads that the color
is invalid
- red error boxes are tabbable
(though you'll skip past them at
first, you can tab back)
Change-Id: I84a33a35039fdc064ba2dc51005d777851c493ee
Reviewed-on: https://gerrit.instructure.com/59484
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Tested-by: Jenkins
Product-Review: Aaron Cannon <acannon@instructure.com>
fixes PLAT-1025
Test Plan
- Add the lti test tool to a course (https://github.com/westonkd/lti_tool_provider_example content-item-redo branch)
- Go to course settings and choose 'import content into course'
- Select the newly installed tool as the content type and click 'find a course'
- Add a content-item by clicking the green '+' icon and click submit.
- Proceed to import the course and make sure it worked.
Change-Id: Ida28af9350efd27d84bef6e8aa9c36546c95d690
Reviewed-on: https://gerrit.instructure.com/55711
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Weston Dransfield <wdransfield@instructure.com>
refs #CNVS-21596
Change-Id: Ia4eac582175dee362d0b8bbb3006bc8d400f1b07
Reviewed-on: https://gerrit.instructure.com/59502
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
fixes CNVS-22124
Test Plan:
* Add multiple tools to a course with "course_navigation[default]"
set to "disabled" (using create external_tool api)
* Update one of the tools with "hidden=false" with tabs
* Go to the course's settings page -> navigation tab
* Only the tab you marked as "hidden=false" should be unhidden
for the external tools you created
Change-Id: I106996778284a3b69d5f82f4c772497524681285
Reviewed-on: https://gerrit.instructure.com/59496
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
fixes: CNVS-22248
High contrast mode is overriding everything, but our primary button,
because this is getting a default hex instead of a variable now. This
will fix it to get the appropriate color when high-contrast mode is on.
Test plan:
- (with default canvas theme) Turn on High-contrast mode.
- go to /stylguide#buttons
- Your primary button is now passing contrast (4:5) and should be a darker
blue: example: http://cl.ly/image/211k332A3r2H
- (with edited theme)
- If you are in high-contrast, they should remain the same blue color
- If you are in regualr ui, they should change to whatever you choose in Theme
editor for primary button
Change-Id: Ic6a41cc8e7fbb8093c0dcbd91b5ddce8832d9f1f
Reviewed-on: https://gerrit.instructure.com/59627
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
refs PFS-2327
test plan
* make api calls to the following and verify results:
* /api/v1/courses/:course_id/grading_standards
* /api/v1/accounts/:account_id/grading_standards
Change-Id: Iff552e1f30e7b812d77d7138f6ab2f2a142837cc
Reviewed-on: https://gerrit.instructure.com/59120
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Tested-by: Jenkins
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Tyson Brown <tbrown@instructure.com>
fixes CNVS-22230
test plan:
* Try to preview a theme with one color. The colors that were not set should be the defaults (not transparent).
* Enter an invalid color, verify that the error message appears and the value is not set to 'transparent'
The above scenarios should now work fine on all supported browsers
Change-Id: I87be354d10c8c109dc0f5bbfb0d69bcd5ad8fa80
Reviewed-on: https://gerrit.instructure.com/59638
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Test Plan:
- Run specs
Change-Id: Ifef25824400e17420534faad94941e6cfc337f3d
Reviewed-on: https://gerrit.instructure.com/59619
Tested-by: Jenkins
Reviewed-by: Taylor Wilson <twilson@instructure.com>
Product-Review: Steven Shepherd <sshepherd@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Change-Id: I68aa54c23adf974c1181d84399ded892c0a93438
Reviewed-on: https://gerrit.instructure.com/59606
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Fixes CNVS-21998
Test plan:
- visit the course settings page, navigation tab.
- Verify that the appearance is unchanged.
- Using a screen reader, ensure that headings appear before each list with
text which describes what that list is for.
Change-Id: Ib8d70e01ad4d5886d7652f74426aadc74f645718
Reviewed-on: https://gerrit.instructure.com/58841
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
Reviewed-by: Sterling Cobb <sterling@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
fixes: CNVS-22218
IE10 has some buggy behavior when posting forms
using FormData. see more here
https://blog.yorkxin.org/posts/2014/02/06/ajax-with-formdata-is-broken-on-ie10-ie11/
test plan:
* open theme editor in ie10 or ie11
* change something
* press "preview changes"
* it should work
Change-Id: If148e911395601212199f12eae6ae884d8b94509
Reviewed-on: https://gerrit.instructure.com/59588
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
refs #CNVS-21596
Change-Id: I1671c8e1bff167ac1ec39da4511b05c1b9cfea60
Reviewed-on: https://gerrit.instructure.com/59657
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-22184
test plan:
- go to several pages with tinyMCE
- none of them have a "p" at
the bottom (or h1/h2/em/div etc)
- they work normally
Change-Id: I3e1e517673daa423b9b89e1560faecab435fad31
Reviewed-on: https://gerrit.instructure.com/59405
Product-Review: Cosme Salazar <cosme@instructure.com>
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: August Thornton <august@instructure.com>
HTML in the answer text field is saved raw. If the question is then
edited by some one else and they edit the answer using tinyMCE, they can
accidentally inject unknown html/js into their DOM. Fixed by escaping
the string in the answer_text input thus the content always shows up as
plain text in tinyMCE.
Fixes CNVS-22213
Test plan:
- Create quiz
- Set answer text to `<script>alert("XSS")</script>` using the
answer_text text input field
- Click the `pencil` edit icon
- You should see the `<script>` html in the tinyMCE rich text editor
- Click `Done`
- You should not see a js alert.
Change-Id: I05c6d57159a02c098ef3d6320eb7768d4a0658a3
Reviewed-on: https://gerrit.instructure.com/59569
Tested-by: Jenkins
Reviewed-by: Matt Berns <mberns@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Cameron Sutter <csutter@instructure.com>
Added a spec for dashcards. Included nav elements and
color customization.
Refactored one of Dereks helper specs into color_common.rb.
Added a test to the discussions_edit spec. It handles the warning
when navigating away from the page.
Fixed formatting and white space.
Change-Id: I99d397108aecd6320ba614d382d149a0b15ff48e
Reviewed-on: https://gerrit.instructure.com/59509
Reviewed-by: Derek Hansen <dhansen@instructure.com>
Tested-by: Jenkins
Product-Review: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
* refactored authentication specs out of accounts_spec
* created new accounts_auth_configs_spec with update tests
* created new accounts_auth_configs_common helper file
Change-Id: I2e9fc333c152bbfcd526dd378c30e635f0f035e5
Reviewed-on: https://gerrit.instructure.com/59271
Tested-by: Jenkins
Reviewed-by: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
MFairbourn