Commit Graph

27339 Commits

Author SHA1 Message Date
wdransfield c3a4e90334 Add group id to submission live events
Closes PLAT-2874

Test Plan:
- Create a group assignment associated with a
  plagiarism detection tool.
- As a student submit to the assignment and verify
  the resulting live event contains the group id.
- Resubmit to the assignment and verify the resulting
  live event contains the group id.
- Create an originality report for the submission.
- From speed grader trigger the resubmit to plagiarism
  tool provider button to emit a live event.
- Verify the resulting live event contains the submission's
  group id.

Change-Id: I3ae14946c2b08e4f0ae6bb5175621609bf31524c
Reviewed-on: https://gerrit.instructure.com/128835
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins
Product-Review: Weston Dransfield <wdransfield@instructure.com>
2017-10-09 14:33:13 +00:00
Ryan Shaw aac714911f include “Term” column in course search results
Closes: CNVS-39755 CNVS-39647

Test plan:
* enable user/course search feature flag
* go to /accounts/x
* on the “Courses” tab, there should be a “Term”
  Column on the results table
* clicking it should sort the results by term
  name properly

Change-Id: Idb27356f6eeb66380f739b8d4550cf2fdd908dc2
Reviewed-on: https://gerrit.instructure.com/128347
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-10-09 02:35:50 +00:00
Rob Orton ce29dd4fe0 handle bad data for content_tags
Change-Id: I17be1caf629c6e766ed3d5581bb63d0cc0e97302
Reviewed-on: https://gerrit.instructure.com/128933
Reviewed-by: Matt Berns <mberns@instructure.com>
Tested-by: Jenkins
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2017-10-08 21:22:54 +00:00
Rob Orton ba392ebd8c document sis integrations api
fixes CNVS-39751

test plan
 - run rake doc:api
 - it should generate
 - this sis integrations api should be documented

Change-Id: I5e1b8ab1e58df472fe34b393afceb198a69db9dd
Reviewed-on: https://gerrit.instructure.com/128444
Reviewed-by: Brad Humphrey <brad@instructure.com>
Tested-by: Jenkins
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2017-10-08 21:14:37 +00:00
Ryan Shaw 3383d9ce18 allow "course/user search" feature flag in prod
Fixes: CNVS-39790

Test plan:
Go to account settings in RAILS_ENV=production
You should see the account/user search feature flag
There should not be a “development” label next to it

Change-Id: I07db49846df08b7fada2575338df89ca762a8700
Reviewed-on: https://gerrit.instructure.com/128819
Reviewed-by: brian kirkby <bkirkby@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Tested-by: Jenkins
Product-Review: Ryan Shaw <ryan@instructure.com>
2017-10-08 17:00:24 +00:00
Rob Orton 5b3ac7b85a allow for nil context
Change-Id: Iaf0de2d0487b79a32c7ee13977818dbb25d5dea3
Reviewed-on: https://gerrit.instructure.com/128932
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Tested-by: Rob Orton <rob@instructure.com>
2017-10-07 12:46:33 +00:00
Transifreq 136e594b46 update fr translation
Change-Id: Icd6707a5d7f103d231a6391874cb0dfc10dc5ad1
2017-10-07 05:18:20 -06:00
Ryan Shaw 12d63c670b fix styling of header in account User search page’
Fixes: CNVS-39559

I had previously already fixed the styling of
the courses tab, this also fixes it for the
“People” tab

Test plan:
* Turn on “course/user search” feature flag
* go to “courses & people” in an account
* click the “people” tab
* the headers should be styled correctly
* click them to make sure that the arrows show up and sort correctly

Change-Id: I84374d3c7354e5d51c80afb76e4eeecdb4f556c7
Reviewed-on: https://gerrit.instructure.com/128818
Tested-by: Jenkins
Reviewed-by: brian kirkby <bkirkby@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2017-10-06 23:19:42 +00:00
Rob Orton 4439471b53 show group menu in main nav for cross shard groups
we already show all groups in the menu, just not
the menu

fixes CNVS-39650

test plan
 - have a cross shard group
 - you should be able to get to it from global nav

Change-Id: I2806cd78ec7079abb8967c09fe33a2eb82efd5df
Reviewed-on: https://gerrit.instructure.com/128467
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2017-10-06 22:26:00 +00:00
Shahbaz Javeed 4930d576fc add padding to top of grading tray carousels when avatar is nil
closes GRADE-336

test plan:
* Create a course with at least two student and one assignment
* Verify the students don't have avatars
* Go to Gradebook and open up the Submission Tray for the last student
  in the grid
* Verify there is a gap between the Tray's close button and the left
  arrow shown next to the Student's name

Change-Id: I791b62700eb9b1798cbad7a37ce3b714cd69d33b
Reviewed-on: https://gerrit.instructure.com/128545
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2017-10-06 21:22:57 +00:00
Jon Willesen a66cfcfa81 fix getting cached response for planner overrides
It was getting the raw cached string from Redis instead of
requesting a deserialized object.

test plan:
* none, developer tested

Change-Id: I8815439b47a95493ab380e56563f74250f8fd279
Reviewed-on: https://gerrit.instructure.com/128884
Reviewed-by: Mysti Sadler <mysti@instructure.com>
Tested-by: Jenkins
Product-Review: Jon Willesen <jonw+gerrit@instructure.com>
QA-Review: Jon Willesen <jonw+gerrit@instructure.com>
2017-10-06 21:13:11 +00:00
Ryan Shaw f78ff77126 Fix JS error on addPrivacyLinkToDialog
When I was playing around locally, I got a:
“Cannot read property ‘privacy_policy_url’ of undefined” Error

Test plan:
You shouldn’t get a js error when you open this dialog

Change-Id: Iac83e426970e1de82ae99932798b212f164d6bea
Reviewed-on: https://gerrit.instructure.com/128820
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-10-06 20:36:47 +00:00
Rob Orton 1ca32c4057 add user object to sis import api
fixes CNVS-39635

test plan
 - sis import api should return user

Change-Id: If54a50a646c8b73ebf122885d53717572930dda7
Reviewed-on: https://gerrit.instructure.com/128018
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2017-10-06 19:41:18 +00:00
wdransfield b5889a957c Include similarity detection tool associations in export
Closes PLAT-2843

Test Plan:
- Create an assignment associated with a plagiarism
  detection tool.
- Export the assignment and verify the assignment
  resource xml contains the product code, vendor
  code, and resource type code of the associated
  assignment.
- Verify exporting assignments with no plagiarism tools
  continues to function as before.

Change-Id: Idc6e9e2863baa083ec6d7c4c058719cf632ecc22
Reviewed-on: https://gerrit.instructure.com/128742
Tested-by: Jenkins
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Weston Dransfield <wdransfield@instructure.com>
2017-10-06 19:33:29 +00:00
Derek Bender 9d39754e48 fix has_annotations?
fixes: GRADE-339

test plan:
  - with new annotations disabled
  - have a course with an assignment that requires a file upload
  - have a student submit the assignment with a doc pdf or docx file
    type
  - as the student or teacher go to the assignment submissions page
  - as a student click 'Grades'
  - click the assignment that was previously submitted
  - ensure that the document preview loads without errors
  - as a teacher click 'Grades'
  - click the students name
  - click the assignment that was previously submitted
  - ensure that the document preview loads without errors

Change-Id: Idd6984aae779205b247927843da8c8acfb5a33d6
Reviewed-on: https://gerrit.instructure.com/128803
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-10-06 17:10:24 +00:00
Cameron Matheson dc1ecf70fc enable graphiql in production for site admins
closes CNVS-39437

Change-Id: I9848d7577792939a65dabfc458a490a42f01d3d3
Reviewed-on: https://gerrit.instructure.com/127490
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Collin Parrish <cparrish@instructure.com>
Tested-by: Jenkins
Product-Review: Cameron Matheson <cameron@instructure.com>
2017-10-06 17:06:34 +00:00
Cameron Matheson 61c56db3a5 graphql remove 'development' feature flag flag
Change-Id: I9b6eeaea60229ec349cbb1ea1c4d268e58fc5520
Reviewed-on: https://gerrit.instructure.com/128738
Tested-by: Jenkins
Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
QA-Review: Collin Parrish <cparrish@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2017-10-06 17:06:25 +00:00
Clay Diffrient 92213f0911 Make link placeholders respect iframe style attributes
closes CNVS-38624

Test Plan:
  - Add a page to a course
  - Use the HTML editor to put in an iframe specifying width
    and height in a style tag. Something like:
        <iframe style="width: 800px; height: 600px;" src="https://google.com">
        </iframe>
  - Save the page
  - Edit the page, notice that the placeholder for the iframe has the same
    dimensions you specified previously.

Change-Id: I0ba0f7fb4fcf49a9ca8bd66e77148c94fce2baa4
Reviewed-on: https://gerrit.instructure.com/128233
Tested-by: Jenkins
Reviewed-by: brian kirkby <bkirkby@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Brent Burgoyne <bburgoyne@instructure.com>
2017-10-06 16:52:59 +00:00
Nathan Mills 68d04c6a0b use lti_assignment_id for resource link id
ref PLAT-2844

test plan:
create a originality report placement
do a launch
it should use the lti_assignment_id as the resource_link_id

Change-Id: I6409677a14c259c8f71582deff52698554078d48
Reviewed-on: https://gerrit.instructure.com/128635
Tested-by: Jenkins
Reviewed-by: Weston Dransfield <wdransfield@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2017-10-06 15:48:02 +00:00
Ed Schiebel 38adc605a6 Include handlebars_helpers in i18n export
handlebars_helpers.coffee includes calls to I18n.t, but was explicitely
excluded from the i18n export. This changes that.

fixes CNVS-308106

test plan:
  wait for translations to go out and come back
  - go to /accounts/1/admin_tools
  - click on View Notifications tab
  - click on a user (you may have to search if no users actually have
    notifications)
  - in the devtools console run
    document.getElementById('search_start_date_label').textContent
  > expect the result to be translated. in particular "Format Like"

Change-Id: I69e4abb8cc9fc80b59990887d8825ec912db323e
Reviewed-on: https://gerrit.instructure.com/126897
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2017-10-06 12:56:01 +00:00
Pam Hiett 3fe73f5d7b [Design Alignment] Student Grades Table
Fixes: CNVS-39607

test plan:
- ticket set-up... ensure you have a course with multiple
  assignments, quizzes, discussions + users enrolled
- ensure you have "new gradebook" turned on at the account
  level under course section so it can be used on the
  course settings
- ensure some of the above have been graded
- as a student - navigate to course select "grades" from the
  left-hand sub-nav | the table has been updated
  similar to: https://screencast.com/t/bNCVC5zHc
- as a student with high-contrast turned on navigate to
  course select "grades" from the left-hand sub-nav | the
  table has been updated similar to:
  https://screencast.com/t/ff1HTunJqF9M
- as an admin/teacher navigate to course select "grades"
  from the left-hand sub-nav... choose one of the above
  students to view their table... similar to:
  https://screencast.com/t/YFT9rSpUKN
- in order to see some of the icons within the last
  column - ensure at least one of the assignments has
  comments, a rubric attached, or an assignment that
  has been "excused" for a user

Change-Id: I9ea40408d859cdfcc4f23c94a55c357d67cf188d
Reviewed-on: https://gerrit.instructure.com/127972
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Mary Jane Anderson <manderson@instructure.com>
2017-10-05 22:33:20 +00:00
Pam Hiett 49d4d89d1d [Bootstrap Cleanup] Replace SIS Passback tables with ic-Table
Fixes: CNVS-39313

test plan:
- sis agent needs to be set-up for this (** however i could not
  get this working locally **)
- under account settings "apps" the above sis agent needs to be
  added (_gradebook qa has steps for this_)
- one the app is set-up on the "features" tab... "enable new sis
  integration settings" needs to be turned on
- once the above is complete... create a course with a sis id
- navigate to the gradebook > click the "export" dropdown and the
  sis agent should be listed with the ability to "sync"
  (** on my local the modal shows but does not have a table of
  data inside it.. but rather an error message **)

Change-Id: Ibb762c8a7062943dcad342ab84495d5765432c93
Reviewed-on: https://gerrit.instructure.com/126508
Reviewed-by: Nick Houle <nhoule@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Pam Hiett <phiett@instructure.com>
Tested-by: Jenkins
2017-10-05 21:42:19 +00:00
Steven Burnett b48d3260ff create migration for populating terms
Change-Id: I13eddbe900070b8f50ff5c8f6f016daa27ec87d1
Reviewed-on: https://gerrit.instructure.com/128447
Tested-by: Jenkins
QA-Review: Steven Burnett <sburnett@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
2017-10-05 20:19:30 +00:00
Nathan Rogowski 1846d1843e Add H1 to Login page
fixes CNVS-39550

test plan:
- Navigate to the Login page (/login/canvas)
- Inspect the element of the Canvas logo at the top of the page
- Note that the class "ic-Login-header" is an h1
- Test with a screen reader to ensure it is announced properly

Change-Id: I077648361da679b0db5d40255f3db993032a0108
Reviewed-on: https://gerrit.instructure.com/127980
Tested-by: Jenkins
Reviewed-by: Ed Schiebel <eschiebel@instructure.com>
QA-Review: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Nathan Rogowski <nathan@instructure.com>
2017-10-05 19:02:53 +00:00
Simon Williams 2d95ae1f62 allow linking to lti test settings section
Change-Id: Iec0010904a62bde85bf8bd5494775fd02e0e5585
Reviewed-on: https://gerrit.instructure.com/128246
Tested-by: Jenkins
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2017-10-05 19:00:19 +00:00
Pam Hiett 4232651d5a Remove box-shadow from around badges in global nav + dashboard
Fixes: CNVS-39534

test plan:
- fire up local canvas as a user that has at least one unread
  message in inbox (so the badge notification shows in the main
  nav)
- there should no longer be a box-shadow being applied to the badge
  itself (this brings it inline with what is in instui)

  example: https://screencast.com/t/9QLu1R2wJ

Change-Id: I13f0e46c4b28a9d057ea2fb37e9855f82cd0e1ef
Reviewed-on: https://gerrit.instructure.com/128511
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Kyle Follett <kfollett@instructure.com>
2017-10-05 16:38:49 +00:00
Mark Valentine b3035f1e0a add description to rubric ratings
Fixes PFS-8549

Test Plan:
Verify that a description is now able to be added for
rubric ratings.  Description should adhere to requirements
outlined in JIRA.

Specifically:
1.  Add a rating description, and save the rubric.  Verify
    that description is still present after saving.  Reload
    page.  Verify description is still present.
2.  Verify rating description is displayed on the following
    pages:
    a) Assignment submission view.
    b) SpeedGrader / PeerReview view.
    c) Student Grades view.
    d) Account/Course rubric view.
    e) Assignment rubric view.
3.  Verify that course copy will also copy rating descriptions
    from rubrics.

Change-Id: I544a0564fd3df6b8928a44d13464693621f96533
Reviewed-on: https://gerrit.instructure.com/126139
QA-Review: Aiona Hernandez <ahernandez@instructure.com>
Tested-by: Jenkins
QA-Review: Andrew Porter <hporter-c@instructure.com>
Reviewed-by: Matt Berns <mberns@instructure.com>
Product-Review: Sidharth Oberoi <soberoi@instructure.com>
2017-10-05 15:46:10 +00:00
Dan Minkevitch 7925e19f11 User global_id for caching user avatars & alt text
Closes CNVS-39302

Test Plan:
* As an admin
* With avatars enabled
* Visit a user's profile
* Inspect their avatar image
* The alt text should read "Click to change profile
  picture for USER", where USER is the profile user's
  short name/display name

Change-Id: I51fd7cf1e5ab05046808e97b01ec404993aed64d
Reviewed-on: https://gerrit.instructure.com/126040
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
2017-10-05 15:44:24 +00:00
Shahbaz Javeed 81c4fcc45a don't double-escape student names in submission tray
closes GRADE-330

test plan:
* Create a course with at least one assignment and one student; call
  the student "J'onn J'onzz"
* Go to Gradebook and open the submission tray on a cell on J'onn's row
* Verify his name appears as J'onn J'onzz and not J&#x27;onn J&#x27;onzz

Change-Id: I6e907dad7ae25d1d48620bdc1412de96e279d878
Reviewed-on: https://gerrit.instructure.com/128505
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Tested-by: Jenkins
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-10-05 15:06:56 +00:00
Rob Orton 06b9adad43 document graded_at in submission api
fixes CNVS-39725

test plan
 - rake doc:api
 - should have graded_at on submission object

Change-Id: I0e929382805f2a2bc5359b2b48a1f89a27173f35
Reviewed-on: https://gerrit.instructure.com/128239
Tested-by: Jenkins
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2017-10-05 14:46:00 +00:00
Rob Orton 43e554fa40 add multi_term_batch_mode to sis import api
fixes CNVS-39788

test plan
 - should have multi_term_batch_mode in response

Change-Id: Idb0ada9eff15c62848d7b616e95a8b01d4870cca
Reviewed-on: https://gerrit.instructure.com/128521
Tested-by: Jenkins
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2017-10-05 14:04:46 +00:00
Transifreq 292b1068e3 update nb translation
Change-Id: I89b1a4070275a1ed84c0cbb649b74657c8af62fb
2017-10-05 05:23:46 -06:00
Transifreq 152c383185 update is translation
Change-Id: Ib64a139e3828043fa805b9340fe20b1530371c8d
2017-10-05 05:20:58 -06:00
Transifreq abb44b8d59 update ar translation
Change-Id: I34d1ebdd0bb5ffd13faedfbf9cc113b681831359
2017-10-05 05:12:50 -06:00
brian kirkby 1f8c2d7c1c implemented focus() code for tinymce remote and fixed for legacy
fixes CNVS-39100

test plan:
- hit 'reply' to a discussion
- verify it puts the focus on the tinymce edit area
- verify that switching between RCE and HTML editors will put focus to the
  editor
  - announcements, assignments, discussions, discussions-reply, wiki-pages
    syllabus, outcomes, quizzes-detail, quizzes-questions
- verify that edit and new in the following areas will put the focus on
  the proper field
  - assignments, discussions-reply, quizzes-detail

Change-Id: I02c7fde039d913c349b62091d2be3b35317200e6
Reviewed-on: https://gerrit.instructure.com/126089
Product-Review: brian kirkby <bkirkby@instructure.com>
Tested-by: Jenkins
Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
2017-10-04 20:13:14 +00:00
Indira Pai cf224da25d Spec: Gbhistory Search, Typeahead checks
Closes QA-393,
Addreses CR from https://gerrit.instructure.com/#/c/122260/10

Change-Id: I1f56b9268c95f1b76ed9b5d4021b9287fb06afdd
Reviewed-on: https://gerrit.instructure.com/128152
Tested-by: Jenkins
Reviewed-by: KC Naegle <knaegle@instructure.com>
Product-Review: Indira Pai <ipai@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
2017-10-04 19:05:39 +00:00
Aaron Kc Hsu f0c64bcc78 Create Nested Move To Dialogs Replace Move Assignment + Groups
refs CNVS-30426
fixes CNVS-38877 CNVS-39399

Test Plan
* Navigate to assignments page
* Try to use move dialog in the group level through the gear
button menu
* Try using the moe dialog in the assignment level as well

Change-Id: I64baafeaa9596ff2dcc5f630bc493c1ce309ebb3
Reviewed-on: https://gerrit.instructure.com/127288
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Aaron Kc Hsu <ahsu@instructure.com>
2017-10-04 19:04:09 +00:00
Ryan Shaw d77bcbf934 move things from “devDeps” to “dependencies”
Closes CNVS-39744

we used to only have the things needed to compile brandable_css in
“Dependencies”. This was because, when we used to have to run 
brandable_css on a job server when someone pressed “preview” in the 
theme editor, we only wanted to have the minimum amount of node_modules
installed there to do that. But now that we no longer have to do
any brand-specific css compiling we can just do what is considered
normal and put anything that actually goes on the page in “dependencies”
and leave all the build tooling, linting, etc stuff in devDependencies.

This also makes it so it is really easy to see the cases that we
might be loading 2 versions of something in our webpack bundles
by running `yarn install --prod --flat`. Whatever that prompts you
about is something that will be included more than once in our webpack
bundles.

Test plan:
* run `yarn install`
* it should not generate a new yarn.lock because everything is the
  same versions as before.

Change-Id: I87b88f50d2cdbe494f928e5418e8540da9cc084c
Reviewed-on: https://gerrit.instructure.com/128244
Tested-by: Jenkins
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-10-04 18:59:59 +00:00
Rob Orton 8ca2f083f2 allow removing blueprint course links from sis import
fixes CNVS-39563

test plan
 - run sis import with dissociate
 - it should remove the link

Change-Id: Id512802fe5f805ef4074b4a79cf19b9012c232c1
Reviewed-on: https://gerrit.instructure.com/127873
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2017-10-04 18:59:12 +00:00
Shahbaz Javeed d4fc86ea5d allow navigating to different students from SubmissionTray
closes GRADE-24

test plan:
* Create a course with at least one assignment and at least three
  students
* Go to Gradebook and open the tray on the first submission
* Verify there's an arrow to the right of the student's name in the
  submission tray
* Click this arrow and verify that the highlighted cell moves to the
  next row in the grid
* Verify also that now there is an arrow to the left of the student's
  name in addition to an arrow to the right of their name
* Verify clicking this arrow takes you back to the first row and the
  left arrow hides
* Using the right arrow, navigate to the student in the last row of the
  grid and verify that the right arrow hides when you're on the last row
* Open the submission tray on the first, middle and last rows by
  using the mouse and verify that the arrows continue to hide and appear
  properly

Change-Id: I15cb7052620698149ff16811ce4c746e6c16ad81
Reviewed-on: https://gerrit.instructure.com/127537
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-10-04 18:54:46 +00:00
Heath Hales 999dd0cd34 spec: 3353071 present discussion duplication option
Change-Id: I8d7f6db734b55349a8a58fd2db4c1d0756eea64e
Reviewed-on: https://gerrit.instructure.com/127976
Reviewed-by: Robert Lamb <rlamb@instructure.com>
Tested-by: Jenkins
Product-Review: Heath Hales <hhales@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
2017-10-04 18:48:03 +00:00
Heath Hales cdeb3ce5cc spec: cnvs-38266 api returns section
Change-Id: I14af78277bb502c5fddb6f6b4e2f6ca7900fd530
Reviewed-on: https://gerrit.instructure.com/127909
Reviewed-by: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Tested-by: Jenkins
Product-Review: David Tan <dtan@instructure.com>
Product-Review: Heath Hales <hhales@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
QA-Review: David Tan <dtan@instructure.com>
2017-10-04 18:46:22 +00:00
Ryan Shaw 79a06e9fc6 Ensure db migrations exists if brand defaults change
closes CNVS-39664

Test plan:
* start your rails server, it should work
* make a change to app/stylesheets/brandable_variables.json
* restart your rails server
* it should throw raise an exception
* do what it says in the error message
* after you moved those files an restarted rails like it said,
* start your rails server, it should not throw an error

Change-Id: I30042f59baa31908c2e902445fb1bf3b06f3b45c
Reviewed-on: https://gerrit.instructure.com/127667
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-10-04 17:43:54 +00:00
Steven Burnett f18305cf98 add terms of service and ToSC table to canvas
fixes COMMS-175 COMMS-174

Test Plan:
- Test pass
- You can log into rails console and create
  a Terms Of Service with content

Change-Id: Ib3a26e2fbb721c023a39469bb6412844690150e4
Reviewed-on: https://gerrit.instructure.com/124970
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
QA-Review: Steven Burnett <sburnett@instructure.com>
2017-10-04 16:13:02 +00:00
Jeremy Slade fbd50a83c6 Pass correct args to chained :perform callbacks
Closes: CNVS-39627, AMS-701

The Delayed::Worker around callbacks are chained,
so all of the required parameters must be passed
through to the block in case it is another callback
that relies on them.

Change-Id: I740d42bfc36e3dda52c85802ddca673f2b2f6bb8
Reviewed-on: https://gerrit.instructure.com/128232
Tested-by: Jenkins
Reviewed-by: Dave Donahue <ddonahue@instructure.com>
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Product-Review: Jeremy Slade <jslade@instructure.com>
QA-Review: Jeremy Slade <jslade@instructure.com>
2017-10-04 15:27:57 +00:00
James Williams bc1536dce5 master courses: don't show edit buttons for locked pages
test plan:
* have a wiki page in a blueprint course that
 allows "teachers and students" to edit the page,
 but then lock the page (with content locked)
* in the associated course, students (or anyone)
 shouldn't be able to visit the page's edit page
 and try to save changes to the page

closes #CNVS-38060

Change-Id: I3c09ca42baa6735c183b686310e225ff035d367e
Reviewed-on: https://gerrit.instructure.com/127351
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-10-04 15:11:30 +00:00
Matt Taylor efd4bc145b support any grading scheme key that is not a number
fixes GRADE-304

Test Plan
  1. Define a grading scheme with numbers followed by letters
     1A - 90%
     2B - 80%
     3C - 70%
  2. Create a course with students that uses the grading scheme
  3. Create an assignment with "letter grade" grading type
     and 10 points possible
  4. Go to new gradebook
  5. Grade the assignment with "2B", the cell should show 2B 8.9
  6. Grade the assignment with "2", the cell should show 3C 2
  7. Repeat 5-6 in old gradebook

Change-Id: I7e7d89a0e8c7d10c2c5922e65b710ef3a213a52d
Reviewed-on: https://gerrit.instructure.com/127949
Reviewed-by: Spencer Olson <solson@instructure.com>
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-10-04 14:20:05 +00:00
Ed Schiebel 4957223e40 Display planner notes in the calendar
closes FALCOR-575

test plan:
  - load dashboard, list view
  - click the + and add a todo. give it a title and details, do not add
    to a course
  - repeat, but put to do in a course
  - go to the calendar
  > expect to see the 2 to dos in the calendar
    - they have the title and the planner note icon
    - they are the right colors for student and course calendars
    - they don't show a time (like 11:59)
  - click on each note
  > expect the details popup with the right info
  > expect no delete or edit button
  > expect the title not to be a link
  - click on the calendar checkboxes to filter out the course or the
    student
  > expect the corresponding to do to remain|disappear
  - the same stuff should happen in agenda and week view

Change-Id: I494d26bc11a20d9f74b60af028e45fb812bfdd9e
Reviewed-on: https://gerrit.instructure.com/127696
Reviewed-by: Jon Willesen <jonw+gerrit@instructure.com>
QA-Review: Jon Willesen <jonw+gerrit@instructure.com>
Tested-by: Jenkins
Product-Review: Christi Wruck
2017-10-04 12:32:46 +00:00
Rob Orton d5c141ee0c don't delete enrollments if an active login remains
fixes CNVS-39623

test plan
 - have a user with two logins and enrollments
 - remove one through sis import
 - the enrollments should not be deleted

Change-Id: Idb95db90ba0eedfcb19b27208c0af639bf13f75f
Reviewed-on: https://gerrit.instructure.com/127946
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2017-10-03 23:35:04 +00:00
Jeremy Neander ccfeee9244 fetch teacher notes data using the column id
fixes GRADE-324

test plan:
 1. Select or create a course with multiple pages of students
 2. Load New Gradebook
 3. Ensure the Teacher Notes is hidden
 4. Open the Network tab in Chrome Dev Tools
 5. Reload New Gradebook
 6. As soon as the View menu is visible, open it
    and select "Notes" to show the Teacher Notes column
 7. Verify the request to load custom column data is correct:
    `…/api/v1/courses/<id>/custom_gradebook_columns/<id>/data?…`
 8. Verify the notes data loads correctly.

Change-Id: I904c901a79421bf71a850e6a94f74deece4691e3
Reviewed-on: https://gerrit.instructure.com/128329
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-10-03 23:13:58 +00:00