Commit Graph

31895 Commits

Author SHA1 Message Date
Keith T. Garner 0ec9969892 fix minor documentation errors found during docker setup
Change-Id: I1d9459e0a36e8ac49b75ac16da50b32e638cae60
Reviewed-on: https://gerrit.instructure.com/160379
Reviewed-by: Derek Bender <djbender@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
QA-Review: Keith T. Garner <kgarner@instructure.com>
Tested-by: Jenkins
2018-08-10 13:48:36 +00:00
Ubuntu 351fe8d40a [i18n] update locales with new translations
Change-Id: I5f5615a98c2b4d3261a37981514f3dd115fe8258
Reviewed-on: https://gerrit.instructure.com/160404
Tested-by: Jenkins
2018-08-10 07:48:22 +00:00
Sara Chadwick 0b962503b5 Remove Alert permission if alerts is not enabled
Fixes COMMS-1368

Test plan:
- Make sure alerts is not enabled (Account settings > settings >
  towards the bottom under features)
- Go to the permissions page, check that there is no "Alerts - add /
  edit / delete" permission (should be the very first one if it's there)
- Turn alerts on
- Go to the permissions page, and check that the permission is
  now there

Change-Id: Ia7c7bfd176f3ad99a151290d3100692f2cdf6832
Reviewed-on: https://gerrit.instructure.com/160194
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Aaron Kc Hsu <ahsu@instructure.com>
Product-Review: Sara Chadwick <schadwick@instructure.com>
2018-08-09 22:25:50 +00:00
Sara Chadwick e4dad3ffcc Add tooltip and fix cell overflow for roles in Permissions
The changes in RoleTray are an unrelated quick-fix I slipped
in there to fix a console alert

Fixes COMMS-1277

Test plan:
- Go to permissions UI
- Create two new roles; one really long single word and one with
  several words
- Test that they don't overflow the bounds of their cell or overlap
  other roles
- Test that when you hover over them, it displays the full name
- Make sure to SR/KO test this as well!

Change-Id: I0f0766f94354fa4442671e3f3248559bd6bde386
Reviewed-on: https://gerrit.instructure.com/160116
Reviewed-by: Landon Gilbert-Bland <lbland@instructure.com>
Product-Review: Landon Gilbert-Bland <lbland@instructure.com>
QA-Review: Landon Gilbert-Bland <lbland@instructure.com>
Tested-by: Jenkins
2018-08-09 22:25:45 +00:00
Derek Bender 976116302e remove curly brace block warning in specs
Change-Id: I8f7978adacf41792b3ca3c1e5ea3b09c29b5403e
Reviewed-on: https://gerrit.instructure.com/159896
Reviewed-by: Gary Mei <gmei@instructure.com>
Reviewed-by: Adrian Packel <apackel@instructure.com>
Product-Review: Derek Bender <djbender@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
Tested-by: Jenkins
2018-08-09 22:07:06 +00:00
Ryan Kuang 83bddc402c Add API for bulk uploading custom columns
When updating custom columns in database,
we can use the API for efficient bulk uploads

closes GRADE-1350

Test Plan
    - Send a PUT request to
      /api/v1/courses/:id/custom_gradebook_column_data
    - The request body should have
      an array of objects with attributes column_id, user_id, and content
    - An example below
      {column_data:
        [column_id: string, user_id: string, content: string]
      }
    - Make sure the auth token in Postman is configured properly
      (bearer token)
    - Send the request
    - Check to see if the data appears in the gradebook

Change-Id: I90e747d5d92478b1e3dd101e4f254dfd392486ed
Reviewed-on: https://gerrit.instructure.com/156647
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: Adrian Packel <apackel@instructure.com>
Tested-by: Jenkins
Product-Review: Keith T. Garner <kgarner@instructure.com>
2018-08-09 22:04:07 +00:00
Nate Armstrong 4c3d0fc3be Allow sub account admins to generate pairing codes
Refs MBL-10998

Test plan:
* Create a sub account
* Add an admin to the sub account
* Create a course for the sub account
* Enroll a student in the course
* Verify that you can generate pairing codes as the admin in the sub
account

Change-Id: I7a67fc6c5c9335bbd7cd8716720b66bf9fe31f42
Reviewed-on: https://gerrit.instructure.com/160286
Tested-by: Jenkins
Reviewed-by: Matthew Sessions <msessions@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Matthew Sessions <msessions@instructure.com>
QA-Review: Matthew Sessions <msessions@instructure.com>
2018-08-09 21:33:57 +00:00
wdransfield 59942f4ff8 LTI 1.3: Add security claims and sign with Canvas private key
Closes PLAT-3633, PLAT-3634

Test Plan:
- Do an LTI 1.3 launch in Canvas and verify the id token is
  signed with the current canvas secret key.
- Verify the following claims are included and correct:
  * exp
  * iat
  * iss
  * nonce
  * sub

Change-Id: I57699ac42bbe98a9fa03f82f3f9b9a16c6923011
Reviewed-on: https://gerrit.instructure.com/159855
Tested-by: Jenkins
Reviewed-by: Marc Alan Phillips <mphillips@instructure.com>
QA-Review: Marc Alan Phillips <mphillips@instructure.com>
Product-Review: Marc Alan Phillips <mphillips@instructure.com>
2018-08-09 21:33:03 +00:00
Matt Sessions a709c080cd Make pairing codes more complex
Pairing codes were only hex and 24 hours. This change makes
them last 7 days and increases complexity by changing to
A-Za-z0-9

Refs MBL-10988

Test Plan:
 - Generating a pairing code should still work
 - The code should include A-Za-z0-9 now
 - The generated code should last for 7 days now which
   can be tested by going into the rails console and
   checking the expires_at field of the pairing code
   record

Change-Id: Ieff735b6cee94d3d03ad72b73e169852c5ef4572
Reviewed-on: https://gerrit.instructure.com/160259
Tested-by: Jenkins
Reviewed-by: Nate Armstrong <narmstrong@instructure.com>
Product-Review: Nate Armstrong <narmstrong@instructure.com>
QA-Review: Nate Armstrong <narmstrong@instructure.com>
2018-08-09 21:29:21 +00:00
James Williams 5e40443d9e don't include rejected enrollments in associations
test plan:
* users with rejected teacher enrollments shouldn't
 be listed as teachers on the new course search page

closes #CORE-1665

Change-Id: I1021ad7de5bad473606080fd7d56e8edc2a62a05
Reviewed-on: https://gerrit.instructure.com/158908
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: Rohan Cheeniyil <rcheeniyil@instructure.com>
Product-Review: Matt Miller <mmiller@instructure.com>
2018-08-09 20:30:22 +00:00
James Williams f6c31682bb include blueprint_course_id in sis export
test plan:
* set up some blueprint courses with associated courses
 all with sis ids
* run a sis export report
* it should have the blueprint_course_id set
 on associated courses

closes #CORE-1678

Change-Id: I3ad184272ffa1c77968b36aca852fbafa1f20da6
Reviewed-on: https://gerrit.instructure.com/159355
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Rohan Cheeniyil <rcheeniyil@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2018-08-09 20:13:06 +00:00
Ed Schiebel d86bb30e52 Submit trumps unchecking complete in planner
The user marks an item as complete, then incomplete, then submits the
assignemt. Currently, the planner_override.marked_complete is used to
set the item to incomplete.  The behavior we want if for the submission
to override the student's uncheck, until they uncheck it again.

This is a corner case, probably seen only in a demo
environment.

Update planner_override.marked_complete when the
submission is submitted.  The ugly part is that we have to look at the
submission's assignment for discussion_topic and quiz to find
the right override until assignments are handled more uniformly.

closes ADMIN-1262

test plan:
  - have an assignment
  - have student check as complete, then uncheck as incomplete
  - have student submit the assignment
  - have the student refresh the planner
  > expect planner to show assignment as complete
  - have the student uncheck the assignment as incomplete
  - have the student refresh the planner
  > expect planner to show the assignment as incomplete
  - have the teacher grade the assignment
  - have the student refresh the planner
  > expect the assignment to still be unchecked as incomplete
  - repeat with a graded discussion, a quiz that requires grading,
    and an auto-graded quiz

Change-Id: I59be1e39ef35ecbd8bd60d3075d023154de49609
Reviewed-on: https://gerrit.instructure.com/159125
Tested-by: Jenkins
Reviewed-by: Mysti Sadler <mysti@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Christi Wruck
2018-08-09 19:06:49 +00:00
Spencer Olson ae8c80be28 spec: fix brittle grading period spec
Change-Id: I2ea303e298029352e5f30dd9c66f2005226c82d9
Reviewed-on: https://gerrit.instructure.com/160270
Reviewed-by: Adrian Packel <apackel@instructure.com>
Tested-by: Jenkins
Product-Review: Spencer Olson <solson@instructure.com>
QA-Review: Spencer Olson <solson@instructure.com>
2018-08-09 17:38:03 +00:00
Clay Diffrient d07f1b7ea2 Fix links failing to insert in RCE
closes CORE-1695

Test Plan:
  - Go to a page with a RCE/RCS
  - Click a link from the links tab
  - It inserts into the RCE
  - Please regression test all the sidebar interactions :(

Change-Id: Ia81c6e770272c260d6d827b675c28da8f196bdb9
Reviewed-on: https://gerrit.instructure.com/160040
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2018-08-09 17:28:50 +00:00
James Williams 00b2e03526 don't send empty grade export
closes #CORE-1705

Change-Id: I6f427ae74bd0600913e174998821052f2d4ad29e
Reviewed-on: https://gerrit.instructure.com/160246
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2018-08-09 17:03:14 +00:00
James Williams 2cd0b64009 show sub-account notifications for unpublished courses
test plan:
* create a sub-account
* create a course in that sub-account but don't publish it
* add a student to the course
* create an account-level announcement (on the settings page)
 for the sub-account
* the announcement should be shown to the user even if
they can't see the course linking them to the subaccount

closes #CORE-1652

Change-Id: Id1f12d2e41cf27b7ab73ac5d08c8251ffbf7c795
Reviewed-on: https://gerrit.instructure.com/158128
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2018-08-09 12:30:49 +00:00
James Williams 360c1c6d3a strip hosts and verifiers from links in quiz content
test plan:
* try to include an absolute link to a file with a verifier
 in a quiz description or quiz question text
* view the content as a student
* it should have stripped the domain and verifier
 from the link

closes #CORE-1377 #CORE-1666

Change-Id: I16390003ba482f42bb49362f1d99838c8674ae27
Reviewed-on: https://gerrit.instructure.com/159596
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2018-08-09 12:29:18 +00:00
Mysti Sadler 058f1c4108 Optimize the assignment student visibility view (again)
closes ADMIN-1270

Test plan
- Check this in beta and somewhere safe before
  rolling to production

Change-Id: I3000fe22d724ab738b54969b9471d0045de2e07d
Reviewed-on: https://gerrit.instructure.com/160053
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Mysti Sadler <mysti@instructure.com>
2018-08-09 01:28:10 +00:00
Adrian Packel 01e2f8d5f1 Keep section synced between SG/new gradebook
When new gradebook is enabled and the user restricts the display to a
specific section, have the selected section carry over to SpeedGrader,
and similarly in the other direction. (If a section is changed in
SpeedGrader, the change will propagate to both old and new gradebooks;
if different selections are selected in OG and NG, SpeedGrader itself
will choose depending on whether new gradebook is enabled.)

fixes GRADE-989

Test plan:
- Have a course with multiple sections and new gradebook enabled
  - At least one section should be empty (i.e., contain no students)
- Test the following:
  - When you change the selected section in new gradebook and then
    open SpeedGrader, the new section should be shown
  - Similarly, section changes in SG should be persisted in NG
  - Selecting the empty section in SG (or selecting it in NG and then
    opening SG) should display an alert indicating no students could be
    found, and reload showing all students
  - Revert to old Gradebook and check that syncing sections still works
    between SG and OG

(Note that selecting a section in new gradebook will *not* directly
update the selected section in old gradebook, and vice versa. Changing
sections in SpeedGrader, however, will update both gradebooks.)

Change-Id: I42b4558f40f3208a93bd00fd6a2224d0f954c96e
Reviewed-on: https://gerrit.instructure.com/159356
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Gary Mei <gmei@instructure.com>
Tested-by: Jenkins
Product-Review: Sidharth Oberoi <soberoi@instructure.com>
2018-08-08 22:16:17 +00:00
Sara Chadwick bd17729f0b Let students reply to admins
Fixes COMMS-846

Test plan:
- Have a course with a student, in which your admin account is not enrolled
- From the course's People page, click on a students names
- Send a message to the student
- Masquerade as the student and attempt to reply
- Make sure the admin recieves the reply

Change-Id: Ic4ee1c13803cb9d006d4710285b46d984834b472
Reviewed-on: https://gerrit.instructure.com/159894
Tested-by: Jenkins
Reviewed-by: Landon Gilbert-Bland <lbland@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
QA-Review: Steven Burnett <sburnett@instructure.com>
2018-08-08 20:15:55 +00:00
James Williams 64414b4adc run due date cacher for discussion assignments after group change
test plan:
* create a course with a group set and a group
* create a graded group discussion topic
 overridden to only be assigned to members of the group
* add a student as a member of the group
* reply to the discussion as the student
* remove the student from the group
* it should no longer show the submission in speedgrader
* re-add the student to the group
* it should show the old submission in speedgrade

closes #COMMS-1367

Change-Id: I55888b3dc8e6d7efef43512cc33faaec856c26a5
Reviewed-on: https://gerrit.instructure.com/160082
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Tested-by: Jenkins
Product-Review: Steven Burnett <sburnett@instructure.com>
QA-Review: Steven Burnett <sburnett@instructure.com>
2018-08-08 20:09:08 +00:00
wdransfield 6c699514e1 Fix lti-advantage gem specs and change activemodel version
Test Plan:
verify lti-advantage gem specs pass locally and
on Jenkins.

Change-Id: I8707914ec5dff77b275ddc92c951e8a865925ba5
Reviewed-on: https://gerrit.instructure.com/160124
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-08-08 19:37:10 +00:00
Ryan Shaw eea009d582 fix js error on mobile login page
Closes: CORE-1693

Test plan
* go to <canvas>/login/canvas?mobile=1
* it should not have javascript error in the console of 
  "Cannot read property 'addEventListener' of null"

Change-Id: Ief058cf362cd324da818e8cc60a4f5e784dc297c
Reviewed-on: https://gerrit.instructure.com/159951
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Rohan Cheeniyil <rcheeniyil@instructure.com>
Product-Review: Matt Miller <mmiller@instructure.com>
2018-08-08 19:24:52 +00:00
James Williams 6ee5809bc8 Add new permission for creating discussions
Test plan
- Create a course with at least one teacher and apply a closed term
- As the teacher, check that you do not have a create discussion
  button
- go to courses/{course_id}/discussion_topics/new
- Verify that if you try to create a discussion, it returns an appropriate
  error message
- Create a discussion in a group to make sure the restriction only
  applies to courses
- Create a course end date that is active and overrides the term date
- Check that discussions can be created in this context

and don't grant it to concluded teachers
(unlike post_to_forum)

Change-Id: I5f16d535652e52917e2b5f2038b0a78f015cc688
Reviewed-on: https://gerrit.instructure.com/159732
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2018-08-08 19:03:36 +00:00
Matthew Berns c6f5e381ef fix only the 1st of 2 identical ratings being selectable in NSR
fixes OUT-2374

test plan:
- enable NSR feature flag
- create a rubric that has two tiers with identical point
  values
- attach the rubric to an assignment and assess a student
  in speedgrader
- when assessing the student, clicking on/giving points for
  the identical ratings should highlight both ratings
- save the rubric - both ratings should show on the smaller
  summary view
- go to the grades page for the student and view the rubric
  there
- both ratings should be highlighted

Change-Id: Ia384eaa458b3854e7f351a90d624760e71a99690
Reviewed-on: https://gerrit.instructure.com/159923
Tested-by: Jenkins
Reviewed-by: Augusto Callejas <acallejas@instructure.com>
QA-Review: Augusto Callejas <acallejas@instructure.com>
Product-Review: Sidharth Oberoi <soberoi@instructure.com>
2018-08-08 18:24:38 +00:00
Cody Cutrer e8f0be2f5e rails 5.2: enforce raw sql for order by
Change-Id: I6667c7917306a8c67802b99f9a6ecbe758a0a146
Reviewed-on: https://gerrit.instructure.com/159913
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-08-08 17:31:14 +00:00
Cody Cutrer 034bd981a1 bump inst-jobs
Change-Id: Idb6312b3a2f317321dfea3b6ab985341ed625d21
Reviewed-on: https://gerrit.instructure.com/160095
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-08-08 17:09:37 +00:00
Rob Orton c1e2d47712 api: return a progress for sis restore states
fixes CORE-1670

this endpoint would time out as it would try and
restore all the states before returning the api
response

test plan
 - delete a large set of users that had
   enrollments with a sis import
 - hit the sis import api to restore the states
 - it should not time out
 - it should return a progress
 - it should restore the states

Change-Id: I245e8c2f2914a77ff32abb2f1151abadc23ba17d
Reviewed-on: https://gerrit.instructure.com/159577
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Rohan Cheeniyil <rcheeniyil@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2018-08-08 16:57:51 +00:00
Cody Cutrer 4bd3764ac0 fix bullet/onceler interaction
with nested specs, where the other group has :once stuff, but the
inner does not

Change-Id: I2145cba249b5cbeb82c19ef47037674ac867f44d
Reviewed-on: https://gerrit.instructure.com/159901
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-08-08 16:45:01 +00:00
wdransfield 0f14bf4d93 Add LTI 1.3 Launch Path
Closes PLAT-3629

Test Plan:
- Install an LTI 1 tool in a course
- Modify the tool via the Rails console:
  `tool.settings['use_1_3'] = true; tool.save!`
- Add the tool to a module item
- Launch the tool and verify a JWT is sent as the 'id_token'
- Verify the JWT contains all required LTI 1.3 claims (minus
  security claims).
- Verify all claim data is accurate
- Verify the JWT contains all extensions Canvas sends
  from the same placement in LTI 1.1
- Verify custom variables are sent and expanded
- Create an External Tool assignment with the same tool
- View the assignment and verify a JWT is sent as the
  'id_token'
- Verify the JWT contains all required LTI 1.3 claims (minus
  the security claims).
- Verify the JWT contains all extension Canvas sends in LTI 1
  (ext_ LTI 1 params) as extension claims.

Note: For now the id_token is signed with a placeholder secret.

Change-Id: I7df3d150055bb30010bb509e4d40dde82a406631
Reviewed-on: https://gerrit.instructure.com/158907
Tested-by: Jenkins
Reviewed-by: Marc Alan Phillips <mphillips@instructure.com>
Product-Review: Marc Alan Phillips <mphillips@instructure.com>
QA-Review: Marc Alan Phillips <mphillips@instructure.com>
2018-08-08 16:43:58 +00:00
Cody Cutrer 2c185786b9 rails 5.2: Arel.sql
Change-Id: I6cf138e9ccc67a1a5ef6dbfb3061cda0fc93eedb
Reviewed-on: https://gerrit.instructure.com/159902
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-08-08 16:34:08 +00:00
Derek Bender 1cf78b8335 add anonymous_id in api for admins
requested by the University of Hertfordshire

closes: GRADE-1453

test plan
- as an admin, anonymous_id is now included submission objects
- if not an admin, anonymous_id is not present

Change-Id: I36f853a6c178b2e386af4705e70d8ebf589e4755
Reviewed-on: https://gerrit.instructure.com/158742
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
Tested-by: Jenkins
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2018-08-08 15:59:21 +00:00
James Williams 425d117230 fix api pagination url on course_accounts endpoint
closes #ADMIN-1311

Change-Id: Ic58cc484de45698d30f3aad29b62211bf8e9b0f0
Reviewed-on: https://gerrit.instructure.com/159982
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2018-08-08 15:35:58 +00:00
Cody Cutrer d39c0b6fd2 moar preloads
found by API specs

refs CORE-1541

Change-Id: I6a4cf04a121a5cd41673561fc57f0f55e5001440
Reviewed-on: https://gerrit.instructure.com/159903
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-08-08 05:22:30 +00:00
Sara Chadwick 092700cef8 Fix wrapping issues in Welsh
Fixes COMMS-1359

Test plan:
- Change language to Welsh
- Check files page, make sure "x% of y MB used" message is
  displayed on a single line

Change-Id: I3ac43be944e34944670651384b9d3d0369ce0b74
Reviewed-on: https://gerrit.instructure.com/160024
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Product-Review: Sara Chadwick <schadwick@instructure.com>
QA-Review: Sara Chadwick <schadwick@instructure.com>
Tested-by: Sara Chadwick <schadwick@instructure.com>
2018-08-07 22:58:55 +00:00
Derek Bender 43896d28ab add integration_id to gradebook
closes: GRADE-1436

test plan:
- in the console, give a user in a course an integration_id on the
user's main pseudonym:

    user.pseudonym.update!(integration_id: 'sPeCiAl_Id')

- in new gradebook, the main student name column has an options menu in
the title header, change the secondary info to "Integration ID"
- now the integration id is displayed beneath student names

Change-Id: Icf6c9f7d454efc34abf37ee024183342ed60f8e8
Reviewed-on: https://gerrit.instructure.com/158746
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Adrian Packel <apackel@instructure.com>
Tested-by: Jenkins
QA-Review: Derek Bender <djbender@instructure.com>
Product-Review: Sidharth Oberoi <soberoi@instructure.com>
2018-08-07 22:10:11 +00:00
Spencer Olson b0c91c44a6 annotations: fix moderated grading whitelist
closes CNVS-43261

Test Plan:
1. Create an assignment that accepts file uploads and is not moderated.
2. As a student, submit to the assignment.
3. As a teacher, go to SpeedGrader and leave an annotation on the
   student's submission. Reload the page and verify you can still
   see your own annotation.

Change-Id: I9f318b877dc3d002523d6bbecff93484c4f7242d
Reviewed-on: https://gerrit.instructure.com/159972
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Tested-by: Jenkins
Reviewed-by: Gary Mei <gmei@instructure.com>
QA-Review: Adrian Packel <apackel@instructure.com>
Product-Review: Sidharth Oberoi <soberoi@instructure.com>
2018-08-07 22:10:04 +00:00
Ryan Shaw 89bed86ec3 perf: speed up I18n.t calls
closes: CORE-1681

Test plan:
* this code should do exactly the same as what it did before,
  just faster
* verify by loading canvas in a production, translated environment
  and doing a few spot checks to make sure that strings, dates, times
  translated in javscript still show up exactly as they did before

Change-Id: Ibf72f290b64e7b4a664e92753ab3f95e03bd9576
Reviewed-on: https://gerrit.instructure.com/159002
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
Product-Review: Ryan Shaw <ryan@instructure.com>
2018-08-07 21:32:58 +00:00
Steve Kacsmark bc36b05af2 Remove the beta tag from Quizzes.Next Feature Flag
closes QUIZ-4885

Test Plan:
  Verity the beta tag no longer appears by the Quizzes.Next feature flag
  in canvas.

Change-Id: I4cdd37611d7d0e1dc515c35689c10163bf0794e4
Reviewed-on: https://gerrit.instructure.com/157213
Reviewed-by: Han Yan <hyan@instructure.com>
Tested-by: Jenkins
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Kevin Dougherty <jdougherty@instructure.com>
2018-08-07 20:19:03 +00:00
Nate Armstrong 569a687628 Add an endpoint for account help links
Refs MBL-10965

Test plan:
* As an admin, teacher, and student hit `api/v1/accounts/self/help_links`
* You should get default and custom help links

Change-Id: I291e64d4bedad4c45c2ba11dd09210d25479ac07
Reviewed-on: https://gerrit.instructure.com/159607
Tested-by: Jenkins
Reviewed-by: Matthew Sessions <msessions@instructure.com>
Product-Review: Matthew Sessions <msessions@instructure.com>
QA-Review: Matthew Sessions <msessions@instructure.com>
2018-08-07 19:20:58 +00:00
Jeremy Neander 424eb6d5e3 ignore students not assigned to anonymous assignments
fixes GRADE-1444

test plan:
 1. Select or create a course
 2. Enroll at least two students
 3. Create an assignment
    * student names hidden to graders
    * assigned to all but at least one student
 4. As the teacher, visit SpeedGrader
 5. Verify SpeedGrader loads successfully

Change-Id: I377383f6edab80be1810ca98459abf347d955d82
Reviewed-on: https://gerrit.instructure.com/159518
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
QA-Review: Spencer Olson <solson@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2018-08-07 17:04:38 +00:00
Jeremy Stanley e034a1ad1d don't show deleted todo items on teacher calendar
test plan:
 - pages and ungraded discussions with todo items should no
   longer appear on a teacher's calendar after they are deleted
 - unpublished pages and graded discussions don't appear either
   (for now)

fixes ADMIN-1307

Change-Id: I957442375c73f22ed5058a3fca39860305c215b4
Reviewed-on: https://gerrit.instructure.com/159686
Reviewed-by: Mysti Sadler <mysti@instructure.com>
Tested-by: Jenkins
QA-Review: Carl Kibler <ckibler@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2018-08-07 15:35:28 +00:00
Landon Gilbert-Bland 902b84aa7d Increase course menu width
"Collaborations" in Welsh was big enough that it was getting wrapped,
and I didn't want to disable word wrapping entirely in case there was
some extra long LTI tool that would be look really silly if we did.
Although I could see an argument being made for setting word-wrap to
normal instead of break-word, as LTI tools really shouldn't be one huge
word without any breaks. But it would open the door for that so 🤷

Fixes COMMS-1360

Test Plan:
  * Navigate to http://127.0.0.1:3000/accounts/1/settings and turn on
    the "External Collaborations Tool" feature flag
  * Navigate to http://127.0.0.1:3000/profile/settings
  * Change your language to Cymraeg
  * Navigate to a course.
  * Notice that the menu item "Cydweithrediadau" is not broken

Change-Id: I255bfaa7eaa5f47f94fc55373aa899757d96e391
Reviewed-on: https://gerrit.instructure.com/159868
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Product-Review: Landon Gilbert-Bland <lbland@instructure.com>
QA-Review: Landon Gilbert-Bland <lbland@instructure.com>
2018-08-07 15:33:08 +00:00
Cody Cutrer 9d9dbbd439 protect against SAML responses
so badly whacked that we can't even log what's wrong with them

Change-Id: I31740b8498d6bba214dc8305d098fc2d0e133eb8
Reviewed-on: https://gerrit.instructure.com/159828
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-08-07 15:20:24 +00:00
Steven Burnett 7fb11eff4c add better label to announcements pagination
fixes COMMS-1364

Test Plan:
- Go to the announcements page
- create more than 20 announcements so that you get
  the pagination links at the bottom
- with a SR navigate to those buttons
- Notice they read "Page #"

Change-Id: Ibdef3e8d36d395336d7df7d8885af2c4af8eec07
Reviewed-on: https://gerrit.instructure.com/159887
Tested-by: Jenkins
Reviewed-by: Landon Gilbert-Bland <lbland@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
QA-Review: Steven Burnett <sburnett@instructure.com>
2018-08-07 02:55:36 +00:00
Matthew Berns e897ac0c35 fix mastery paths breakdown styling
fixes OUT-2376

test plan:
- in a course with mastery paths enabled,
  assign mastery paths to an assignment
- in speedgrader, assess some students so that
  they fall into the various buckets of the paths
- on the assignment show page, click on a link
  under Mastery Paths Breakdown
- a tray should slide out showing buttons for
  the various path buckets
- clicking the buckets should properly expand
  whatever bucket was clicked while collapsing
  whatever bucket was open
- clicking on a student should open student details
  as expected

note: when clicking on a student and entering student view,
there seems to be an issue where the 'back' button is rendered
partially off the tray. This issue is unrelated to the one that
caused the styling problems being fixed here. Believe its related
to CNVS-42749

Change-Id: If97bf79916fa4187000839584d31efaca11dfb28
Reviewed-on: https://gerrit.instructure.com/159771
Tested-by: Jenkins
Reviewed-by: Michael Brewer-Davis <mbd@instructure.com>
Reviewed-by: Augusto Callejas <acallejas@instructure.com>
QA-Review: Augusto Callejas <acallejas@instructure.com>
Product-Review: Sidharth Oberoi <soberoi@instructure.com>
2018-08-06 22:38:38 +00:00
KC Naegle ac06c769d9 Revert "Stop teachers from creating discussions after term ends"
This reverts commit 21d795b565.

Change-Id: Ib16abf69ce0eb4c9dc913a4c26c93a570195aa3e
Reviewed-on: https://gerrit.instructure.com/159844
Reviewed-by: Landon Gilbert-Bland <lbland@instructure.com>
Product-Review: KC Naegle <knaegle@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Tested-by: Jenkins
2018-08-06 22:35:35 +00:00
KC Naegle bd98940111 Revert "Allow adding a discussion if course, term or section is open"
This reverts commit dc6b1d29c5.

Change-Id: Ib983efc29c3b4db1531002d109e3889879d52640
Reviewed-on: https://gerrit.instructure.com/159840
Reviewed-by: Landon Gilbert-Bland <lbland@instructure.com>
Product-Review: KC Naegle <knaegle@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Tested-by: Jenkins
2018-08-06 22:06:44 +00:00
KC Naegle 603edc3d85 Revert "Remove flakey spec temporarily"
This reverts commit e6106e783f.

Change-Id: Ib8b33c517a1f71dc6e585a5c74f6a79080ffee5e
Reviewed-on: https://gerrit.instructure.com/159846
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
QA-Review: Steven Burnett <sburnett@instructure.com>
2018-08-06 21:48:52 +00:00
Sara Chadwick da05546bdd Fix notifications sent to users after course section ended
Fixes COMMS-1332

Test plan:
- Have a an active course with two student in different sections.
  Make sure one of the sections is conclued and the other is not.
  Make sure both students are set up to recieve notifications.
- Have them both submit to an assignment (you'll have to submit
  before you can conclude the section)
- Leave comments on both submissions. Check that the
  user in the concluded section does not have a notification.
  Check that the other does get one.
- Add a new file to the course. Check that the concluded section
  user odesn't get it and the other does.
- Create a new assignment for the course. Check that the user
  in the concluded section gets it an the other does not.

Change-Id: I5ab469d0b5d43b85dfaa43fb45aae9b1bb4e2f4e
Reviewed-on: https://gerrit.instructure.com/158138
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Landon Gilbert-Bland <lbland@instructure.com>
Product-Review: Sara Chadwick <schadwick@instructure.com>
2018-08-06 21:11:49 +00:00