Commit Graph

26827 Commits

Author SHA1 Message Date
wdransfield 56a10fe5a0 Fix regression in subscriptions api controller
Closes: CNVS-38885

Test Plan:
Verify the lti subscription index endpoint returns
an array of subscriptions with pagination headers.

Change-Id: Ifa81263ccb9e762c5021c3c5334fa3055d6afbc9
Reviewed-on: https://gerrit.instructure.com/124184
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
Reviewed-by: August Thornton <august@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Weston Dransfield <wdransfield@instructure.com>
2017-08-28 21:32:05 +00:00
James Williams 7ec5084fa4 don't show creation_pending in future list if disallowed
test plan:
* have an account with students restricted from viewing
 future courses and restricted from seeing future courses
 in the enrollments list
* have a student added to an unpublished course
* they should not be able to see the course
 in their "/courses" list

closes #CNVS-38833

Change-Id: If02ad835861f3d6f4ebc05731bb8a0c8c38e93db
Reviewed-on: https://gerrit.instructure.com/123968
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-28 20:50:26 +00:00
Anju Reddy 130eed0546 spec: add speedgrader spec for new status pills
Change-Id: Ibeed7db4ee06a78717c0d010e3797b805c0749cc
Reviewed-on: https://gerrit.instructure.com/123790
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Anju Reddy <areddy@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
2017-08-28 15:57:00 +00:00
Shahbaz Javeed e966615880 ensure graded assignments aren't gradable after removal from overrides
closes GRADE-124

test plan:
* Create a differentiated assignment
* Submit the assignment from two students
* Assign grades to all but one student
* Unassign the assignment from a graded student and the ungraded
  student
* Go back to gradebook
* Verify that the cell for the graded student is grayed out and not
  editable
* Verify that the cell for the ungraded student is grayed out and
  not editable

Change-Id: I93c9a2f4dec0888d56ba39682bc2184196f25bba
Reviewed-on: https://gerrit.instructure.com/122731
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Matt Taylor <mtaylor@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Tested-by: Jenkins
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-08-28 15:56:43 +00:00
James Williams 12f57bbdfb don't fetch assignments for assignment group discussion option
test plan:
* the drop-down for assignment groups when creating
 a graded discussion should appear normally

closes #CNVS-38774

Change-Id: I68dda521ea2695b5e0f4f7526eade15ccebe82eb
Reviewed-on: https://gerrit.instructure.com/123884
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-28 15:51:07 +00:00
James Williams cdcda70806 master courses: sync deletions in quiz questions
test plan:
* have a quiz in a blueprint course
* sync the quiz to an associated course
* delete a quiz question on the blueprint side
* re-syncing should delete the associated question
 as well (unless the associated quiz has been
 changed)

closes #CNVS-38704

Change-Id: Ib4de42f0ceb0d6d434db58bfdbc3605f63976d86
Reviewed-on: https://gerrit.instructure.com/123520
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: David Tan <dtan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-28 15:26:42 +00:00
James Williams 5228fe9bb8 clear discussion availability dates with null assignment dates
test plan:
* save a discussion topic with availability dates set
* edit it to set it to a graded topic but leave the
 assignment dates blank
* the original availability dates for the topic should
 not persist on the discussions index

closes #CNVS-38362

Change-Id: I28c565cb23c7fa2da3b16449ae189f44040b88c1
Reviewed-on: https://gerrit.instructure.com/123990
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-28 14:54:39 +00:00
Simon Williams cda3a3e6c4 use css var polyfill for ms edge >= 15
fixes CNVS-38866

test plan:
- all css vars work in ms edge 15

Change-Id: Ife2aa8f5aba8eeaeb4407f346b05681327cfa550
Reviewed-on: https://gerrit.instructure.com/124111
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2017-08-26 18:44:35 +00:00
Rob Orton c53c65f55c don’t delete admin running a sis import
fixes CNVS-38863

test plan
 - run sis import that would delete an admin that
   is running the sis import
 - it should not delete the admin
 - attempt to delete the user
 - it should not delete the user

Change-Id: Ie5fb341b21017fea7cbf24b09a14a93ac781a1ab
Reviewed-on: https://gerrit.instructure.com/124103
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2017-08-26 14:38:35 +00:00
Rob Orton 4718bc697b downgrade oauth gem
refs CNVS-38864

Change-Id: I753621048717b27d3ce8ac15a21ba887c394f906
Reviewed-on: https://gerrit.instructure.com/124109
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Tested-by: Rob Orton <rob@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
2017-08-26 13:44:51 +00:00
Transifreq f288bccc58 update tr translation
Change-Id: Ib7bf5a4df7dc5f2f05f0b2414d88a5b42b117aa1
2017-08-26 05:54:12 -06:00
Transifreq 2be131ea6d update nn translation
Change-Id: Ia9bd4dd3ff0b82e3603eb2560ef76cd9e2a43a88
2017-08-26 05:53:16 -06:00
Transifreq 274dbcda6a update ko translation
Change-Id: Ie67c8f37c7b06c39ec1eb7af0ad24417f0416a30
2017-08-26 05:52:17 -06:00
Transifreq 2081f16bff update hy translation
Change-Id: I39c636573a9cde7bce13b3d77edab8abf0a8cbb3
2017-08-26 05:51:31 -06:00
Transifreq 3b396b444e update he translation
Change-Id: I2bb42a9979ba5c893b99cb54f27c224e37136dab
2017-08-26 05:50:33 -06:00
Transifreq 6f939b3fa5 update fa translation
Change-Id: If70b544200beca03a765dbbb844db782148733a9
2017-08-26 05:49:32 -06:00
Transifreq 4d5f9a2e9d update zh-Hant translation
Change-Id: I11115f8610297c99626bbff9629a4849bc41392b
2017-08-26 05:33:29 -06:00
Transifreq 2b1df77cc4 update zh-Hans translation
Change-Id: Idbb9112bcb4048ec2aefe84e385c202ee4b50c80
2017-08-26 05:32:21 -06:00
Transifreq 173a393354 update sv translation
Change-Id: Ib3aa56cb21d5b3593500f0a05fe15b8953182ecd
2017-08-26 05:31:13 -06:00
Transifreq da2271c6c3 update ru translation
Change-Id: Ia17561efb7d6de8d4febe441bc2f7248c05b34fe
2017-08-26 05:30:12 -06:00
Transifreq 281ff80394 update pt-BR translation
Change-Id: Iec1e854e281cc08b92cf4c9f0da0edc34bc8ebbf
2017-08-26 05:28:59 -06:00
Transifreq f244b60edc update pt translation
Change-Id: I20beb753b87cdb7a9a3de115d3b76c1366cc601b
2017-08-26 05:27:57 -06:00
Transifreq 878f83ee92 update pl translation
Change-Id: I983cad93aee5e2f1ef932716b766131edcf1bc25
2017-08-26 05:26:56 -06:00
Transifreq e1af62cbab update nl translation
Change-Id: I5b378b9520ce7ae690a3b4a774c6a9687dd8c424
2017-08-26 05:25:55 -06:00
Transifreq 1f67da1d60 update nb translation
Change-Id: Iae14760c9860476fb55ca86ebf8cfd8c1373e4d8
2017-08-26 05:24:54 -06:00
Transifreq 9e975aaf13 update mi translation
Change-Id: Ied8c575a62913f01248774ba90ed2571e3471cb4
2017-08-26 05:23:53 -06:00
Transifreq 78d2bb1f0e update ja translation
Change-Id: Ib6b18b6b5cc6429e35beb567f45cb5259b0461df
2017-08-26 05:22:54 -06:00
Transifreq b6856c768e update is translation
Change-Id: Iaba97813f1f93bc8c3bbfb94e588a2ce0c8a3640
2017-08-26 05:21:48 -06:00
Transifreq bd68068ed3 update ht translation
Change-Id: If0402818cb93aaaa84e934ccd1ba08a4ac0e470e
2017-08-26 05:20:49 -06:00
Transifreq c7477939d5 update fr-CA translation
Change-Id: I0596d91b6ccc4833cd6d7f4302632a8223000e20
2017-08-26 05:19:52 -06:00
Transifreq ddabe80bf6 update fr translation
Change-Id: I0624a30795ec9dfe9d0d027f791fd0499800cbcf
2017-08-26 05:18:55 -06:00
Transifreq 358def6913 update es translation
Change-Id: Ibbf279ecbdc689d5568eac5d75fb85c26f150e45
2017-08-26 05:17:55 -06:00
Transifreq 71bf10b7f4 update en-GB translation
Change-Id: I3184c755cb2cf51149fa70cd1ca6dd7e2b259e56
2017-08-26 05:15:28 -06:00
Transifreq 1d4d1aa360 update en-AU translation
Change-Id: Ia869db28d9e873522efff84478cd835ee4fa30db
2017-08-26 05:14:28 -06:00
Transifreq 6833a13eaf update da translation
Change-Id: I1340bffadcd410dc2610d3d4b6fc93127590bc30
2017-08-26 05:13:20 -06:00
Transifreq c57aed9cd1 update ar translation
Change-Id: I64a34b1265f79601236374a2fe2ee9e247006687
2017-08-26 05:12:20 -06:00
KC Naegle ae4318c770 spec: clean out gradebook_common
Change-Id: Ib4371679519dbdab864dc9fa57b02ba215fe0cf4
Reviewed-on: https://gerrit.instructure.com/124069
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2017-08-25 22:33:54 +00:00
Jeremy Neander 21d277c358 de-lint new gradebook data loader
refs GRADE-212

test plan:
* ensure Jenkins passes

Change-Id: I9110815ab1ee0230b75debc86825866104619b8a
Reviewed-on: https://gerrit.instructure.com/123365
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
Tested-by: Jenkins
Product-Review: Neil Gupta <ngupta@instructure.com>
QA-Review: Neil Gupta <ngupta@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
2017-08-25 21:54:44 +00:00
Jon Willesen cac2704138 remove beta tag from blueprint courses
fixes CNVS-38848

test plan:
* beta flag should no longer be on the blueprint courses feature flag

Change-Id: Ib7a362fdbce67e234fe31c0031ef3657d4649420
Reviewed-on: https://gerrit.instructure.com/124038
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Product-Review: Jon Willesen <jonw+gerrit@instructure.com>
QA-Review: Jon Willesen <jonw+gerrit@instructure.com>
2017-08-25 20:50:48 +00:00
Indira Pai 95d3de88f8 Closes QA-333
Change-Id: Iaae5e41d03393daab155c1c3dd11d57a1e5ce8b0
Reviewed-on: https://gerrit.instructure.com/124000
Tested-by: Jenkins
Reviewed-by: Anju Reddy <areddy@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Product-Review: Indira Pai <ipai@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
2017-08-25 20:24:21 +00:00
Ryan Shaw a01547c823 ensure js/css build succeeded during health_check
fixes: CNVS-38654

otherwise the health check might happily say canvas
is all good, when no front end page will actually work

test plan:
 (Do all of this in RAILS_ENV=production)
 * go to /health_check; it should work

 * delete public/dist/webpack-*/webpack-manifest.json
 * restart your server
 * go to /health_check; it should give a 500

 * compile_assets again
 * go to /health_check; it should work
 * delete public/dist/brandable_css
 * restart your server
 * go to /health_check; it should give a 500

 * compile_assets again
 * go to /health_check; it should work
 * rm public/dist/rev-manifest.json
 * restart your server
 * go to /health_check; it should give a 500

Change-Id: I0d4c941e71185563ad382d5f91dfce92447fbba6
Reviewed-on: https://gerrit.instructure.com/122326
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2017-08-25 20:22:53 +00:00
Spencer Olson 3b043037d1 spec: clean up spec pollution
closes GRADE-215

Removes the GRADEBOOK_DEVELOPMENT key from the ENV after specs that add
the key to the ENV, instead of setting its value to "false".

Change-Id: I7bb0fcc1f311725901e7ed0fa67b8cca80e5ffea
Reviewed-on: https://gerrit.instructure.com/123944
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Tested-by: Jenkins
QA-Review: Anju Reddy <areddy@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2017-08-25 20:18:22 +00:00
Xander Moffatt f91a64cb6b remove :id from file capture route
refs CNVS-38587

test plan: none

Change-Id: Iebc68bb6a25d8d5c52b859ecdfae99bc0da5b4e1
Reviewed-on: https://gerrit.instructure.com/123999
Tested-by: Jenkins
Reviewed-by: Andrew Huff <ahuff@instructure.com>
Product-Review: Xander Moffatt <xmoffatt@instructure.com>
QA-Review: Xander Moffatt <xmoffatt@instructure.com>
2017-08-25 19:47:28 +00:00
James Williams 694b38c353 don't let students create group discussions
test plan:
* create a course with the setting
 "Let students create discussion topics" enabled
 (under the "more options")
* should not be able to try to create a group
 discussion as a student

closes #CNVS-38705

Change-Id: I46b7bd4d59dd7df457e709bbbc9ce1d764c08792
Reviewed-on: https://gerrit.instructure.com/123729
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-25 19:01:57 +00:00
Jon Willesen ee3461b4e2 Revert "unify SR course nav labels"
This reverts commit 639e3899d2.

The above commit removed the screenreader field that's being used by
the dashcards interface. See CNVS-37921.

fixes CNVS-38600

test plan:
* make sure the actions hover text and screenreader text show and read
  the proper strings.

Change-Id: If97203a21274563e8894c3593a66ae4d3960a395
Reviewed-on: https://gerrit.instructure.com/123982
Tested-by: Jenkins
Reviewed-by: Aaron Kc Hsu <ahsu@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Jon Willesen <jonw+gerrit@instructure.com>
2017-08-25 17:04:08 +00:00
James Williams 44b82f567a fix group assignment by section with more groups than students
test plan:
* have a course with a student
* create a group set with two groups
* randomly assign students, checking the
 box to require members to be in same section
* it should work

closes #CNVS-38813

Change-Id: I56a64aff1355c6d61160cd14911c0c5c4dc965a2
Reviewed-on: https://gerrit.instructure.com/123810
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-08-25 16:30:04 +00:00
Pam Hiett 0d0b5dc97d bug fix: Login Link Color not updating all login links
Fixes: CNVS-38823

test plan:
- as an admin using default canvas theme ensure the "Forgot
  Password" link on the login page is white vs link blue
- next navigate to theme editor to test that switching the
  "Login Link Color" is respected and sticks :D
  example: https://screencast.com/t/ibeH0Uvrp

Change-Id: Iff5c4a8318cdbaa8921e06365a93758c03887d60
Reviewed-on: https://gerrit.instructure.com/123828
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-25 16:07:13 +00:00
James Williams 94a72d26b4 create submission comment mail replies on correct shard
closes #CNVS-38755

Change-Id: I4c2f12d247f9b569368f4fad21581080a1025f5b
Reviewed-on: https://gerrit.instructure.com/123970
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-08-25 15:12:07 +00:00
Transifreq 23a42b3ad3 update da translation
Change-Id: I346a036b8447ae350da7454c3c990daf375bb4ff
2017-08-25 05:12:07 -06:00
Simon Williams 9d361132c5 better uri handling on equation image redirection
occasionally we have strings that come through unescaped, and we need to
handle that case better

fixes CNVS-37254

test plan:
- regression test equation editor with mathman
- create single-escaped equation images in rich content manually
- they should also render properly

Change-Id: I2037a0e048f24e149e4d75ccb2c1042ad33b3b07
Reviewed-on: https://gerrit.instructure.com/123535
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2017-08-24 22:47:55 +00:00