Commit Graph

26579 Commits

Author SHA1 Message Date
Jon Jensen 938bf5a858 spec: exclude quiz_submission_event partitions when comparing schemas
this also means we don't have to spend any time cleaning up old ones either

Change-Id: If7af1c3bfe8a274614571a4fc5df641d4cb9a654
Reviewed-on: https://gerrit.instructure.com/121147
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-08-01 20:25:16 +00:00
Jeremy Neander b7dd7b6796 remove unused assignment group weights dialog
This removes what is believed to be completely dead code.

test plan:
* ensure Jenkins passes

Change-Id: I5d540588dea3b9ea11b176b46c9abba10d8bb1b7
Reviewed-on: https://gerrit.instructure.com/121144
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
QA-Review: Neil Gupta <ngupta@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-08-01 20:20:50 +00:00
Rob Orton 9e97c6e11a handle empty files for diffing mode
fixes CNVS-38281

test plan
 - upload diffing file
 - upload empty diffing file with just headers
 - it should diff the files

Change-Id: I5d9c5dbf04c37e485de408ca038ba524461d0afe
Reviewed-on: https://gerrit.instructure.com/119610
Tested-by: Jenkins
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2017-08-01 19:56:44 +00:00
Rob Orton e63627c74c add workflow_state to account_users
fixes CNVS-38231

test plan
 - delete an admin
 - admin should be gone from every where
 - admin should not have permissions to do stuff

Change-Id: I56c90a12b2be879c5d646c1ab6980693ff161673
Reviewed-on: https://gerrit.instructure.com/119220
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Tested-by: Rob Orton <rob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2017-08-01 18:31:37 +00:00
Transifreq 3c2830cd99 update is translation
Change-Id: I5858fbd4d6fa6206235ff21ebaf224561e13a2f5
2017-08-01 12:15:59 -06:00
Transifreq ebb3fae2e4 update da translation
Change-Id: Ib612770c006174c3db4e820b4a60b58d53dac074
2017-08-01 12:08:34 -06:00
Cameron Matheson 890de0ae2e graphql: make grades nullable
(only students have grades)

Change-Id: Ic17d6168f6093bf825a8865c4d9dc6ca05c85617
Reviewed-on: https://gerrit.instructure.com/120543
Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
Tested-by: Jenkins
Product-Review: Cameron Matheson <cameron@instructure.com>
QA-Review: Cameron Matheson <cameron@instructure.com>
2017-07-31 22:36:31 +00:00
Omar Khan b51d4f5af6 Use redis:alpine
Updates docker-compose.yml to use redis:alpine, which is the same
version we use to run tests on jenkins. Our lua scripts don't seem to
work with redis 2.6.

Change-Id: I608d7bbea9e813a5fb31f0c32b8fdf5ba127f16d
Reviewed-on: https://gerrit.instructure.com/121058
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-07-31 22:31:40 +00:00
Omar Khan d05bd760ff Process config/security.yml as ERB template
Now:

    irb(main):001:0> Canvas::Security.config
    => {"encryption_key"=>"<%= ENV[\"ENCRYPTION_KEY\"] %>"}

With this fix:

    irb(main):001:0> Canvas::Security.config
    => {"encryption_key"=>"facdd3a131ddd8988b14f6e4e01039c93cfa0160"}

Test plan:

- Apply this patch over a fresh clone of the canvas-lms repo
- Run `docker-compose run --rm web bundle exec rails console`
- Run `Canvas::Security.config['encryption_key']`
- Check that the result is `facdd3a131ddd8988b14f6e4e01039c93cfa0160`

Change-Id: Ieba33697900cb4c539aa204d0c0dd14ad8baa896
Reviewed-on: https://gerrit.instructure.com/121036
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-07-31 22:04:37 +00:00
Gary Mei 75f272598e allow teachers to use grade history endpoint
closes CNVS-36350

Widens the permissions for for_course and
for_course_and_other_parameters so that teachers can use the endpoint
as well.

Test Plan
1. Create a grade change for a student, as a teacher.
2. Note the id of the student, the id of the teacher, and the id
    of the assignment.
3. Navigate to CANVAS.URL/api/v1/audit/grade_change/courses/COURSE_ID
    as a teacher. Use the course id from step 1. If you get a
    successful response, good. If you get a 401 or 404 response, bad.
4. Navigate to CANVAS.URL/api/v1/audit/grade_change/courses/COURSE_ID/
    assignments/ASSIGNMENT_ID/students/STUDENT_ID/graders/GRADER_ID
    using the course id, assignment id, student id, and grader id
    from step 1.
5. If you get a successful response, good. If you get a 401 or 404
    response, bad.

Change-Id: I38a3288fc517a574ff22607c88d94e6d9009a24f
Reviewed-on: https://gerrit.instructure.com/119435
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@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-07-31 21:49:41 +00:00
Simon Williams b6862f50ff use notification_service in cases that bypass the Message model
fixes CNVS-38028
fixes CNVS-38029

test plan:
- enable the notification service
- enable MFA via text message but set Setting.set('mfa_via_sms', 'false')
- try to log in
- you should get an MFA text

Change-Id: I1848bf666a51a771619de8f538bed5b39d38a262
Reviewed-on: https://gerrit.instructure.com/119695
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2017-07-31 21:49:05 +00:00
Chris Hart eda57b4d01 Replace Sass color functions in ic-forms.scss
Fixes: CNVS-38400

Test plan:
[your Canvas instance]/styleguide#forms

- Radio button :focus state should look like:
  https://www.screencast.com/t/LkhrTWyPMkk

- Checkbox :focus state should look like:
  https://www.screencast.com/t/CIzQakkac

Change-Id: I9b04019cdec529e307e195b5b4e1da5d52740b37
Reviewed-on: https://gerrit.instructure.com/121012
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
2017-07-31 21:05:44 +00:00
Jeremy Stanley bc938a4b30 add Iceland (+354) to the SMS country code list
test plan:
 - enable International SMS feature in the root account
   associated with a user's login
 - on the account settings page, click "+ contact method",
   select the SMS tab, and ensure "Iceland (+354)" appears
   in the country list dropdown

closes CNVS-34699

Change-Id: I71b771500814d3db84910264452039263c2990ae
Reviewed-on: https://gerrit.instructure.com/119974
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2017-07-31 20:43:45 +00:00
Jeremy Stanley b0bb886869 don't create graded discussions from the modules page
test plan:
 - create a discussion topic via the modules page
   - it should not be graded
 - regression test SIS-2854

fixes CNVS-38297

Change-Id: I2f89d50387aba494712573bdd388fde7df8a0b46
Reviewed-on: https://gerrit.instructure.com/119944
Reviewed-by: Nick Houle <nhoule@instructure.com>
Tested-by: Jenkins
QA-Review: David Mirabile <dmirabile-c@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2017-07-31 20:43:39 +00:00
Cody Cutrer 2023e3d591 i18n: add islandic
fixes CNVS-35911

Change-Id: Ia2be4e137e8c0f2fb23e1403713b731b7bbbafcd
Reviewed-on: https://gerrit.instructure.com/121015
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2017-07-31 20:23:09 +00:00
James Williams 0638da43ba rails 5.1: all the rest of the specs
Change-Id: I2f4ca4a671a0e5bdcfbeb90b4714465ec34acc9f
Reviewed-on: https://gerrit.instructure.com/120891
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-07-31 19:48:51 +00:00
KC Naegle 64b083e3de spec: refactor grading cells for a11y_spec
Change-Id: I9635b505d3ab9c563e1c782c7a44ee59428dddce
Reviewed-on: https://gerrit.instructure.com/120993
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-07-31 19:18:15 +00:00
Andrew Butterfield 25e1cc63c9 Fix group submission for external tools
fixes PLAT-2501

Test plan:
* Ensure expected behavior as outlined in the ticket

Change-Id: I2dad19e3bd310d2aefb4c67901ed8996031c7c79
Reviewed-on: https://gerrit.instructure.com/119914
Tested-by: Jenkins
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Reviewed-by: Weston Dransfield <wdransfield@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Andrew Butterfield <abutterfield@instructure.com>
2017-07-31 18:45:15 +00:00
Shahbaz Javeed 1812a4d543 re-apply late policy when assignment grading_type changes
closes CNVS-38056

test plan:
* Create a course with a late policy, multiple students, and one
  assignment which is to be graded using points
* Ensure the assignment is late for some students but not for
  others
* Ensure the late policy deducts a reasonable number of points
  for every day the students are late
* Submit the assignment from all students
* Grade the assignment for all students and verify that the late
  policy is taking effect as expected

* Now alter the assignment so it is graded using pass / fail
  or complete / incomplete
* Go back to the gradebook and verify that when you grade
  students this time, no late deductions are applied

* Now alter the assignment so it is considered a "not graded"
  assignment
* Go back to the gradebook and verify you don't see it listed
* Alter the assignment back to points

* Grade the students and verify late deductions are applied

Change-Id: Ifaae1729ccb6790ef642d02c0d86da145f8ad178
Reviewed-on: https://gerrit.instructure.com/119163
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-07-31 17:49:44 +00:00
David Mirabile 8d8d4a8fa3 spec: fix a fragile calendar spec
Change-Id: I2e5de6f10f24e8d9e4970491b566f6ae8291747d
Reviewed-on: https://gerrit.instructure.com/120994
Tested-by: Jenkins
Reviewed-by: Heath Hales <hhales@instructure.com>
Product-Review: David Mirabile <dmirabile-c@instructure.com>
QA-Review: David Mirabile <dmirabile-c@instructure.com>
2017-07-31 17:42:20 +00:00
Pam Hiett ee9100ad43 Update color functions in /stylesheets/base/_ic_app_header.scss
Fixes: CNVS-38393

test plan:
- as a user navigate to local canvas and ensure the left-hand
  main nav background color displays correctly when hovered

Change-Id: Ia1d4a3dc2b7e38cac83f7ebf54294873c12b0ba6
Reviewed-on: https://gerrit.instructure.com/120743
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
2017-07-31 17:39:19 +00:00
Jayce Higgins 482c423e80 allow quizzes2_exporter to be enabled on prod
Fixes: CNVS-38380

Change-Id: I928738ff197b4a426675a7a8945ce1ec5f23e208
Reviewed-on: https://gerrit.instructure.com/120518
Reviewed-by: Hannah Bottalla <hannah@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Tested-by: Jenkins
Product-Review: Jayce Higgins <jhiggins@instructure.com>
2017-07-31 15:27:13 +00:00
Pam Hiett 47d90cd2fd remove slightly varied background-color on main nav toggle
Fixes: CNVS-38402

test plan:
- navigate to the dashboard and using browser inspector
  ensure the background-color has been removed from
  `.ic-app-header__secondary-navigation` which is the
  container for the toggle button
- example: https://screencast.com/t/NFGT93CnUui

Change-Id: I430686a021489d19a1c529ed8f04255eef814fd5
Reviewed-on: https://gerrit.instructure.com/120854
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
2017-07-31 14:33:19 +00:00
Santosh Natarajan dd18bdeca5 spec: restart driver with saucelabs & set custom timeout
Change-Id: Ib7dafd337a4226dc29772dd24f5c2bc13536ad61
Reviewed-on: https://gerrit.instructure.com/120858
Tested-by: Jenkins
Reviewed-by: Robert Lamb <rlamb@instructure.com>
Product-Review: Robert Lamb <rlamb@instructure.com>
QA-Review: Robert Lamb <rlamb@instructure.com>
2017-07-31 14:23:41 +00:00
Transifreq 1d06e1776b update zh-Hant translation
Change-Id: Ie0ae1ac374cb5001ef9b766eba2d8677cdad2ee4
2017-07-29 05:31:35 -06:00
Transifreq 124c02219d update zh-Hans translation
Change-Id: Ida761422cf9999a4b85ae6668e7d77681d26563d
2017-07-29 05:30:13 -06:00
Transifreq 435e3e06e2 update sv translation
Change-Id: I063e0701309d0b0e76426c7a86fadbe81fd6d795
2017-07-29 05:29:07 -06:00
Transifreq bc85fc1c72 update ru translation
Change-Id: I0e2718bc6bba222055fa83a3d5da9cef34320657
2017-07-29 05:28:07 -06:00
Transifreq 1ca03714d3 update pt-BR translation
Change-Id: I618f396564505cbc3c56f4d2342a29c9e4eed198
2017-07-29 05:27:00 -06:00
Transifreq 3c6b5e6643 update pt translation
Change-Id: Ic6775595b8d99a8e1b32b348aa4442a3a711e5c5
2017-07-29 05:25:59 -06:00
Transifreq cd6a65daa6 update pl translation
Change-Id: Ia7f1d19976445cf54cd7bf292f0186f333550ad3
2017-07-29 05:24:56 -06:00
Transifreq 6f9ebe47f4 update nl translation
Change-Id: Ib8d480af10298ea763ac6e537d6a1bed676a3123
2017-07-29 05:23:54 -06:00
Transifreq 5d4d9b8816 update nb translation
Change-Id: Id8d9d77754aac3bbfe041b0f72c5f36d6d55daba
2017-07-29 05:22:52 -06:00
Transifreq ae9e3d87de update mi translation
Change-Id: Idd85f02ba4e6293ee69f4d8102ce97317abda691
2017-07-29 05:21:51 -06:00
Transifreq 908167dd70 update ja translation
Change-Id: Ic3b27eaea4969bfc9071120cf5817202b2727bdd
2017-07-29 05:20:52 -06:00
Transifreq b922b4d49a update ht translation
Change-Id: Iab802c54e0dda83a41878cc9e90846dad0fbdb5a
2017-07-29 05:19:46 -06:00
Transifreq 2e84b00d88 update fr-CA translation
Change-Id: Ie0a923a6fb1b550f8f30d4f193fe0a6b1fffe724
2017-07-29 05:18:50 -06:00
Transifreq 23e572ef19 update fr translation
Change-Id: Id110d10f96e0c1aeadc82f032117e172c07a5572
2017-07-29 05:17:53 -06:00
Transifreq 7afcfa5b99 update es translation
Change-Id: I73f510b66efe594a33c311e1adebd22e712b52c1
2017-07-29 05:16:54 -06:00
Transifreq 7483c7b8cd update en-GB translation
Change-Id: If9ab9034df2bb21fff2a1738408179100ce5a164
2017-07-29 05:14:26 -06:00
Transifreq bc0685ab43 update en-AU translation
Change-Id: Ieb3c0a8330c8d92aa429c4e258ecbd6d4290fda2
2017-07-29 05:13:27 -06:00
Transifreq 5818ff482b update da translation
Change-Id: I6bf75ae6132d248952f9adc7458914f6e6bfdad6
2017-07-29 05:12:20 -06:00
Transifreq 7e8af5ba73 update ar translation
Change-Id: I8b6ab901b84e1c019a03631ae90cf99be6b5c645
2017-07-29 05:11:20 -06:00
Ryan Shaw af074d2c77 Convert some sass vars that darken/lighten to css
closes: CNVS-38396, CNVS-38397, CNVS-38405, CNVS-38404, CNVS-38394

refs: CNVS-38400, CNVS-38403

Test plan:

* the places that use these css variables should still look like they
  Did before.
* especially check in ie11

- the only place that appears to still be using the original
  accordion styles is within the right sidebar for pages,
  assignments editing, etc...
- example view: https://screencast.com/t/DrwOKmQkmCtu

Change-Id: I3e6329912e7c2bdd69bce8628ac466d4b7247725
Reviewed-on: https://gerrit.instructure.com/120775
Tested-by: Jenkins
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2017-07-28 22:33:18 +00:00
Ryan Shaw c6fe8f7526 Use css variables for primary & secondary buttons
closes: CNVS-38412

test plan:
* check this out
* run bundle exec rake brand_configs:generate_and_upload_all
* compile assets
* make sure buttons look how they did before
* especially check in ie11

Change-Id: If1d87ef9fa5c184cc21b1b51212d26ee1c7c1da5
Reviewed-on: https://gerrit.instructure.com/120726
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-07-28 22:25:50 +00:00
Ryan Shaw 13765cc6ad convert most theme sass variables to css variables
closes: CNVS-38411

these are all the uses of variables that don’t do
anything funky like `lighten` or `darken` or `rgba`

Test plan:
* Make sure everything looks exactly as it did before
* especially in ie11

Change-Id: I8ad0274c360d76dbbe42c2018ce9d7dd99ff5262
Reviewed-on: https://gerrit.instructure.com/120575
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-07-28 22:24:58 +00:00
Ryan Shaw bb36d8ecd3 Create IE 11 fallback for theme css variables
closes: CNVS-38410

This fallback will make it so in browsers that
don’t support css variables it will use a fallback
and display the theme editor stuff just like the
browsers that do. The only browser we support
that doesn’t support css variables is IE11

this polyfill has to do an Ajax get request to get the
content of the css files so there will be a slight flash
of unsetyled content but I try to help subsequent page
loads by using a sessionStorage based cache.

Test plan:
* in a normal browser, css should work fine as usual. No changes.
* in IE11, all the css that uses theme editor colors should still
  show up as it did before.

Change-Id: I76eda5444aa7808c1bc78e99ecb14cbcb23acbd5
Reviewed-on: https://gerrit.instructure.com/120654
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2017-07-28 22:23:41 +00:00
Ryan Shaw 0f2832dcb0 Write css file with brand variables
closes:  CNVS-38408

NOTE: this does not actually change any behavior, it just
gets things set up so we can actually start using css variables
in follow-on commits.

test plan:
* with this checked out,
* run bundle exec rake brand_configs:generate_and_upload_all & compile assets
* open a page in canvas
* there should be a stylesheet near the top of the <head> with css variables
  of all the theme editor variables.

Change-Id: I2caa210917d9245ae103d1444d6353ecfdeb59fe
Reviewed-on: https://gerrit.instructure.com/120574
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2017-07-28 22:23:25 +00:00
Rob Orton db4c5724d8 write all errors and warnings to file
fixes CNVS-38309

when the batch is saved it will write the messages to file, but
if it has more work to do, it will skip future messages for the
error file.

test plan
 - run an import that has errors and warnings
 - it should report all of them to the file

Change-Id: I2891651febdf2b16270ea62d623e143c30e59cbc
Reviewed-on: https://gerrit.instructure.com/120651
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-07-28 22:09:16 +00:00
Ryan Shaw bb14a49a36 Don’t show webpack progress on prod build
… so Jenkins logs are less noisy

Test plan:
* verify that the “full console” view
  For the selenium build of this patchset doesn’t
  Have a bunch of noisy progress output from webpack 

Change-Id: Id69b04435be52bcc3213298e5ae55ac146d8e2ed
Reviewed-on: https://gerrit.instructure.com/120863
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-07-28 19:59:01 +00:00