Commit Graph

12144 Commits

Author SHA1 Message Date
Cameron Matheson 5b5eb0c710 send xlsx files to crocodoc
fixes CNVS-29198

Test plan:
  * enable crocodoc (disable canvadocs)
  * make an xlsx homework submission
  * the teacher should be able to annotate it

Change-Id: I97f952fb8824234926c927dab046c497683498ca
Reviewed-on: https://gerrit.instructure.com/78964
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2016-05-12 18:30:25 +00:00
Jeremy Stanley c152d006e0 fix google doc submissions with submissions folder enabled
test plan:
 - enable the Google Drive plugin
   (see instructions in the wiki article "OtherServiceTestAccounts",
    section "Google (Beta)")
 - enable the submissions folder feature
 - ensure that you can submit an assignment that accepts file
   uploads via the Google Doc tab

fixes CNVS-29307

Change-Id: I5bb953abd89bfcd1a8c0845eb76b1dcb78f4ef89
Reviewed-on: https://gerrit.instructure.com/79379
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-05-12 18:03:53 +00:00
Clay Diffrient ae57b0609d Make column headers sort properly in files
This also converts the column header spec from
coffeescript to javascript (JSX)

fixes CNVS-29308

Test Plan:
  - Go to files
  - Click the various column headers across the top
    of the files area
  - The files should sort as expected

Change-Id: Ib8bd0040c06b45a095bce3960c6ff1cc4d39a99b
Reviewed-on: https://gerrit.instructure.com/79358
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2016-05-12 16:27:37 +00:00
Steven Burnett 4c866b675e remove errors shown in console
fixes CNVS-28868

Test Plan:
- go to the user search page
- open up the chrome console
- notice there are no errors on either tab
  (users/courses)

Change-Id: I024fbef28a5721f16044b6a29042b057fcefdba0
Reviewed-on: https://gerrit.instructure.com/78994
Tested-by: Jenkins
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2016-05-11 18:33:05 +00:00
Colleen Palmer f263d05cd3 Fix overlap on header toolbar and right sidebar in Discussions
closes: CNVS-26533

Test Plan:
- Go to discussions and add enough to be able to scroll the page and have
the toolbar stick to the top to follow you
- Toolbar should now overlap the right side RCE

Note: the right side no longer sticks with you down the page, but is
pinned to the top, so you will need to scroll up to view it. This was
part of another ticket.

Change-Id: I680b9ccc36502423eedcd757956503cac8adf724
Reviewed-on: https://gerrit.instructure.com/78737
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2016-05-11 15:34:06 +00:00
James Williams f98b914c5b move sis id permission checks in api to courses when possible
being a teacher in an account should no longer give the
ability to see sis ids for users in every course context

test plan:
* add a teacher to a course
* add a student with an sis user id
* the teacher should be able to see the sis id for the user
 in the users api for the course
 (e.g. /api/v1/courses/:id/users)

* add the teacher to another course but as a student instead
* add the student with the sis id
* the teacher user should not be able to see the student's
sis id through the users api for this course

* also sub-account admins should be able to see sis ids
if they have the "Read SIS" permission enabled

closes #CNVS-21216 #CNVS-26688 #CNVS-29063

Change-Id: I5b0c4442626612f2770a30b6b301b57ea1a6e0a7
Reviewed-on: https://gerrit.instructure.com/78858
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-05-11 15:09:44 +00:00
Ryan Shaw d3a30e56ff move css for #unauthorized to the only places that use it
refs: CNVS-28781

instead of loading this css on every page
I moved it out into its own bundle so it can be
only loaded in the few places that use it

test plan:

* go to these places where you can get an
  "unauthorized, you need to log in" message
* make sure that message is styled like it was before

Change-Id: Id8462f92e4abbf308957a58374b902c32a0657ae
Reviewed-on: https://gerrit.instructure.com/77313
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2016-05-09 21:20:27 +00:00
Jon Jensen e48cc6614e don't do double ajax calls on jobs page
the `running` and `tags` grids would each trigger two back-to-back ajax
requests every `refresh_rate` seconds instead of just one. this started
happening way back in 55f3aae3 :o

incidentally fixes various flaky selenium specs

test plan:
1. jobs page should work and update at the expected frequency
2. you should not see double ajax requests in the network console or rails
   log

Change-Id: I6fa585e5a20f6e52d8a733cfb50c556b73b1161e
Reviewed-on: https://gerrit.instructure.com/79095
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2016-05-09 19:57:59 +00:00
Rob Orton 7d7fb15fa6 s/remove_brand_dir!/remove_scss_dir!/
fixes: CNVS-29208

as part of https://gerrit.instructure.com/77427
we created a remove_brand_dir! method but in code
review decided it would be better to call it
remove_scss_dir! but did not catch renaming
this one spot where didn't change it


test plan:

go to theme editor
make change and preview 3 different times
it should not have a page error

Change-Id: Ifca9eaa03477414925a0e5427568d1754af352f9
Reviewed-on: https://gerrit.instructure.com/79016
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2016-05-09 18:43:50 +00:00
Jeremy Stanley 7db2f23b53 expose `for_submissions` in folders API
test plan:
 - enable "submissions folder" feature
 - submit a file to an assignment if you have not done so
   previously, so you have submissions folder(s)
 - use the folders API to list user folders
 - ensure "for_submissions" is returned correctly
   ("true" for submissions folders, "false" otherwise)
 - ensure the API docs explain this field

refs CNVS-28394

Change-Id: I3cb940316a61d0138a3848d82d5288955d15f921
Reviewed-on: https://gerrit.instructure.com/78935
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-05-09 16:02:28 +00:00
Davis McClellan 87770fedf4 Fix section due date validation
fixes CNVS-24815

test plan:
- Create two sections one in the past and one in the future
- Create an assignment and assign the past section first to a valid
  date
- Assign the future section to a date withing the future section
  range but not within the past section
- ensure that no error is displayed

Change-Id: I59ebe6345184a5f7d8876a32a9fef02eec4b51a9
Reviewed-on: https://gerrit.instructure.com/71087
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Tested-by: Jenkins
Product-Review: Davis McClellan <dmcclellan@instructure.com>
2016-05-09 15:59:27 +00:00
Pam Hiett 2169217dbf design polish on a few items in /files
Fixes: CNVS-28841

test plan:
- as a user with the new ui
- click the "account" link from the left nav
- from the sub-nav click "files"
- if you do not have any items uploaded - do so
  in order to click an item and see the action
  buttons groupset... a few tweaks have been
  made to bring it inline with products design
  example: http://screencast.com/t/QA6E3u5u
- next click into a course and from the course
  sub-nav click "files" - the tweaks from above
  should be viewable on this page as well
  example: http://screencast.com/t/85IoRnYwlpiE

note:
- a comment has been left on the jira regarding
  the odd course sub-nav placement for files
  within a course *** wil need to be addressed
  on a new ticket/commit

Change-Id: I49cae6c4057e44076ce9cae0489f02c065927f85
Reviewed-on: https://gerrit.instructure.com/77893
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2016-05-09 14:52:40 +00:00
Simon Williams e1e6f4f4b1 use 'dashboard cards' over 'dashcards' in user strings
Change-Id: Icfd0951cf267047efec29f89e610e346089c522d
Reviewed-on: https://gerrit.instructure.com/78974
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2016-05-06 22:49:08 +00:00
Steven Burnett 06ca0836eb add screenreader notice for masquerading
fixes CNVS-29026

Test Plan:
- In Safari with VoiceOver on, navigate to the Settings page of a course
- Click on the Student View button in the right column
- Navigate to first div in page letting you know you are masquerading
- Move to another page in the course
- Navigate to first div in page letting you know you are masquerading

Change-Id: If774dd2bdbd0bf736f465a9e8b50d1f2c3e16789
Reviewed-on: https://gerrit.instructure.com/78795
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
Product-Review: Aaron Cannon <acannon@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
2016-05-06 22:39:20 +00:00
Joel Hough 824085c07c send appointment group notifications to observers
fixes CNVS-27519

test plan
- ensure that observers observing students who would normally
 receive the following notifications receive them also:
 - appointment reserved by user
 - appointment cancelled by user
 - appointment group published
 - appointment group updated
 - appointment group deleted

Change-Id: I344fbafc425bbd523511950193b295aa28ff469e
Reviewed-on: https://gerrit.instructure.com/75344
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2016-05-06 20:46:29 +00:00
Felix Milea-Ciobanu d9bb96db24 fix teacher avatar issues on course search page
add alt text and fix css issue causing top of avatar to be cut off

test plan:
- navigate to courses search page
- note that teacher avatars are round and the top is not cut off

fixes CNVS-28770

Change-Id: Iac4e3cd8eebb86e0290d335d2b9daa5165f94c0c
Reviewed-on: https://gerrit.instructure.com/77256
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Tested-by: Jenkins
Product-Review: Steven Burnett <sburnett@instructure.com>
2016-05-06 20:07:46 +00:00
Ryan Shaw d2a80c5fc7 send ie9 to the "not supported" page we send ie8 to
refs: CNVS-28781

...and remove fancy conditional comment
thing that adds the .ie & .ie9 classes to the page.
And now that we know that IE9 will never be using
the site, remove some css that specifically targeted it

test plan:
* try go to to canvas in ie9,
* it should redirect you to a "not supported" page

Change-Id: Ia4e020afeebe13bad730d7591736fd4e141bf387
Reviewed-on: https://gerrit.instructure.com/77318
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Tested-by: Jenkins
2016-05-06 19:28:52 +00:00
Steven Burnett a203ef15d2 add more informative text to sms validation
fixes CNVS-28602

Test Plan:
- Register an SMS endpoint
- Ensure text in modal for character validation
  is translated and looks good.
- Ensure the modal matches what blake posted
  on the ticket.

Change-Id: Ia4da0cff2e3b8b05a12b4f549b787764aa1d2f77
Reviewed-on: https://gerrit.instructure.com/78944
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2016-05-06 19:26:41 +00:00
Alex Boyd 7a471e44cd Always download files when downloading from the preview page
Fixes CNVS-28388

Test plan:
 - Set up Canvadocs
 - Upload a file whose name ends with .txt to a course's files
 - Make a wiki page
 - Include a link to the file in the page
 - View the page
 - Click on the link
 - On the page you're taken to, click the "Download ..." link at
   the top
 - Verify the file gets downloaded instead of simply opened in a
   new tab

Change-Id: Ib357f7edcc70a320f66707091209e43defbcd8c7
Reviewed-on: https://gerrit.instructure.com/76593
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Alex Boyd <aboyd@instructure.com>
2016-05-06 17:06:49 +00:00
Jeremy Stanley f46c259e40 fix conferences#show page error
test plan:
 - create and start a conference (wimba or bbb)
 - as a teacher, click the conference name in the
   conference invitation at the top of a course page
   (not the "join" button).
   it should take you to the conference edit page.
 - as a student, click the conference name in the
   invitation. it should take you to the conferences
   page and scroll the selected conference into view.

fixes CNVS-29134

Change-Id: I3fd5bc5312c6253d58597272fe7367567c957ba7
Reviewed-on: https://gerrit.instructure.com/78879
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-05-06 17:04:59 +00:00
Chris Hart 62de5f2a16 Fix Help nav link gap on IE11
Fixes: CNVS-28708

Test plan:

- New UI only
- Go to any page featuring the primary navigation,
  using IE11/Win7 and 10
- There should be no more space between the text
  and the Help icon (see the JIRA ticket for
  a screenshot of the bug)

Change-Id: I7c05b7b8aaf12b455963e1231e18e23dac523702
Reviewed-on: https://gerrit.instructure.com/78481
Tested-by: Jenkins
Reviewed-by: Pam Hiett <phiett@instructure.com>
Product-Review: Pam Hiett <phiett@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2016-05-06 16:33:11 +00:00
Steven Burnett 2468ccb697 fix aria labeling on files
fixes CNVS-29027

Test Plan:
In Firefox with NVDA active, navigate to a Files page
Move NVDA focus to the Search field
Note that there is a label to notify the user

Change-Id: I48ecb027d9299b4a3a9a0e59627779713e939594
Reviewed-on: https://gerrit.instructure.com/78839
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2016-05-06 15:55:41 +00:00
Steven Burnett 79fa758339 Fix right side scroll issues
closes: CNVS-26493

For some pages like Syllabus, in legacy the right side would stick to
the bottom of the page as you scroll large content. In new ui, we
disable this, and the sidebar sticks to the top, no matter its content
height.

Test Plan:
- See ticket for full test setup
- Go to Syllabus with long content, long sidebar, see how you can
now scroll down the page just fine, no jumping
- Go to Syllabus with short content, long sidebar, see same
- Legacy UI remains the same

Change-Id: I746f6c6e41865e5cd20b96bf3e7a518190055294
Reviewed-on: https://gerrit.instructure.com/78098
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
2016-05-05 23:25:09 +00:00
Amber Taniuchi ce5935df72 add a11y flash message for what-if grade changes
Previously on the Grades page of a course, if a student
using a screen reader clicked on the 'Show Saved "What-If"
Scores' button, there was no indication that anything on the
page had changed. The same happened for the "Revert to Actual
Score" button (which appeared once the "Show Saved" button
was pressed). Now there is a screereader-only flash message
that is read to indicate scores have been changed to reflect
what-if scores/original score. Focus should also be returned
to the what-if/revert button on the right pane.

fixes CNVS-27858

Test Plan:
1. Using VoiceOver in Safari, navigate to the Grades page
of a course as a student
2. Click on the "Show Saved 'What-If' Scores" button on
the right
3. The screenreader should now read "Grades are now
showing what-if scores"
4. Click on the "Revert to Actual Score" button
5. Screenreader should now read "Grades are now
reverted to original scores"
6. Ensure each time the buttons are clicked that the
focus is set back onto the button.

Change-Id: Iad31491a4de08cd3a16444c398b2e87373d6a95f
Reviewed-on: https://gerrit.instructure.com/76192
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
Tested-by: Jenkins
2016-05-05 23:04:26 +00:00
Steven Burnett 461a1d6f39 validate external feed url not blank pre-save
also improve how single vs multiple errors are handled in error boxes
and in the screenreader flash message list.

finally, put screenreader flash messages in a div instead of a span,
because our form validation can add p tags to this area (because there
may be several error messages to display) and VO doesn't handle block
elements inside of span's very well.

fixes CNVS-20800

test plan:
- try to save a blank external feed url
- it should give you an error before trying to make a request to the
  server
- try it with a screenreader (with a blank url, text that is not a url,
  and a valid url)
- screenreader messages should be intelligible

Change-Id: I0a7a16253c128c2f62e87bc4b2e1d6e9b08f3d56
Reviewed-on: https://gerrit.instructure.com/64134
Tested-by: Jenkins
QA-Review: Pierce Arner <pierce@instructure.com>
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2016-05-05 22:04:04 +00:00
Chris Hart 644d16668a (NUI) Only show ePortfolios in nav when feature is on
Fixes: CNVS-28914

Test plan:

- New UI only

- Go to your institution's Settings page and see if
  the ePortfolios feature is enabled:
  http://screencast.com/t/Eo1ltqyIG

- Change your ePortfolios account setting

- IMPORTANT: restart your Canvas server and hard-
  refresh your browser

- Click on the Account link in the primary
  navigation. If ePortfolios is disabled, you
  should no longer see the ePortfolios link in
  the menu:
  http://screencast.com/t/GVLlTFzKX

Change-Id: I9c45ffe36241450557ab270203eebb9358be1104
Reviewed-on: https://gerrit.instructure.com/78576
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Pam Hiett <phiett@instructure.com>
Tested-by: Jenkins
QA-Review: Myller de Araujo <myller@instructure.com>
2016-05-05 21:00:16 +00:00
Rob Orton 4a5f37a76c only update cached due dates for students
fixes CNVS-29170

test plan
 - update workflow_state of non student users
 - it should not make a due date cacher job

Change-Id: Ia7ab7dc7ef0ce93434d9a2e63496883b5ae6d007
Reviewed-on: https://gerrit.instructure.com/78836
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2016-05-05 19:29:36 +00:00
Jon Jensen ce1ce3dcf7 spec: disable css animations during selenium specs, fixes SD-1090
per http://marcgg.com/blog/2015/01/05/css-animations-failing-capybara-specs/

animiations slow things down and sometimes make it hard for selenium to
interact with things (e.g. it tries to click on a link that is moving, so
it mis-clicks and nothing happens)

requires a css tweak to dashboard color picker so that it still works with
animations disabled

this should fix ./spec/selenium/courses_spec.rb:178 and many others

Change-Id: I23667019948db4d1857ee9bb6c176ae8bc24f518
Reviewed-on: https://gerrit.instructure.com/78853
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2016-05-05 19:19:07 +00:00
James Williams 4e7e4f2339 only show group discussion sub-topics for DA groups
test plan:
* create a group set with two groups
* create a graded group discussion topic
and assign it only to one of the groups
* the root discussion topic page should only list a
 link to the group the topic is assigned to

closes #CNVS-27979

Change-Id: I8e3864d1d377620c2a88902ed112b3f347208d77
Reviewed-on: https://gerrit.instructure.com/78691
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-05-05 18:00:41 +00:00
Rob Orton fab58aea7b remove enrollment.sis_user_id since it can't be trusted
refs CNVS-29138

test plan
 - specs should pass

Change-Id: Ie2b703cbc61198dd44a2f9cebe351bc28df1db01
Reviewed-on: https://gerrit.instructure.com/78718
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2016-05-05 15:55:51 +00:00
Cody Cutrer f2b0bc129d rename oauth scopes param to the standard scope
and it's space separated, not comma separated

refs gh-807

note that the old form - scopes - is still accepted for now

Change-Id: I98e038125c3491abd54eb50c99d6efdf3e25acd7
Reviewed-on: https://gerrit.instructure.com/77412
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2016-05-05 15:49:53 +00:00
Ryan Shaw d2db8a3692 fix some JS array iteration that was using for..in
all of these were iterating over an array using a
for...in loop. they should all be using normal
index-based array iteration. it was causing specs
to fail in chrome 50

test plan:
with latest chrome installed,
run bundle exec rake js:test
it should work

Change-Id: Icc8c6dae460f57a0008cf49565bf9ff0a0a96d38
Reviewed-on: https://gerrit.instructure.com/77906
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2016-05-05 00:06:27 +00:00
Joel Hough 75cddb1974 fix typo in course index api doc
test plan
- navigate to /doc/api/courses.html
- under the "List your courses" endpoint, find the "include[]"
 parameter
- under the "include[]" parameter, find the "teachers" string
 description
- ensure "UserDisplay" is a hyperlink

Change-Id: I81d750e3d3935fb8afd752636a45a2ed141acf52
Reviewed-on: https://gerrit.instructure.com/76591
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
QA-Review: Joel Hough <joel@instructure.com>
2016-05-04 22:24:21 +00:00
Ryan Shaw a732087cc0 remove unused jqueryui icons
refs: CNVS-28781

test plan:
* based on grepping the whole codebase,
  none of these icons were actually being used
* verify that the icons in the styleguide still load
* see if you can think of any other place that
  might use any of these

Change-Id: I8caa95a04ce64c0f1a231d6fe66c7ab8af886901
Reviewed-on: https://gerrit.instructure.com/77302
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2016-05-04 22:15:07 +00:00
Steven Burnett d8c002bf07 fix multiple reading of select all in jaws
fixes CNVS-27668

Test Plan:
1. Using JAWS in IE11, navigate to the Files page of a course
2. Move screen reader focus to the Select All checkbox and press Space
3. Note that all files are selected but the checkbox's state is read
once

Change-Id: I8a60614e9664c2d2fc84e5576efd6aa845ebd515
Reviewed-on: https://gerrit.instructure.com/78677
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2016-05-04 21:44:36 +00:00
Alex Boyd 67a9886cf0 Fix drag and drop onto minical
Fixes CNVS-26396

Test plan:
 - Create a calendar event
 - Drag it onto a different day on the minical
 - Ensure it moves
 - Reload the page
 - Ensure it's still on the new date

Change-Id: I407bf2dc9f28b469a96fbd4f65937e80bbd3a786
Reviewed-on: https://gerrit.instructure.com/73658
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Alex Boyd <aboyd@instructure.com>
2016-05-04 21:15:42 +00:00
Jacob Fugal d1211c0fb9 don't initialize sidebar that won't be used
fixes CNVS-28964

test-plan:
 - have an RCS instance running
 - turn on RCS (remote editor) feature flag
 - open browser network panel to watch requests made
 - as a *student*, visit the course syllabus page
 - should not see initial requests from the sidebar to the RCS
 - repease as a *teacher*
 - should see those initial requests after page load, even if you
   haven't yet hit the edit button

Change-Id: Ie23c0a74113111bb0e1094eff8cfefc2cc2eadc6
Reviewed-on: https://gerrit.instructure.com/78406
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2016-05-04 21:02:49 +00:00
Brent Burgoyne 2134a9b430 Generate JSON file for brand configs
Refs CNVS-28275, closes CNVS-28885

Generate a json file to go along with the scss file for each brand config.
The intention is that the json file for each brand config will be pushed
to the cdn. One difference from the scss file is that it includes all
variables, even if they are not specified in the brand config. Variable
that have not been customized will use the default value.

In addition to generating a json file for each brand, a json file for that
inclues all default values is generated so other services don't need to
know the defaults if no brand config is available.

To allow for long term caching the filename of the json file includes a
hash of the current defaults (including fingerprinted urls for default
images). This way when the defaults change (or a default image) it will
point to a new file even if the brand config didn't change.

Test plan:

- Save a new brand config.
- Look in public/dist/brandable_css/[brand config hash]/
- There should be a [hash of defaults].json file
  - Should include custom values from brand config
  - Should include default values not specified in the brand config
- Run rake brand_configs:clean && rake brand_configs:write
- Should generate json file for all brand configs
- Open console in browser
  - ENV.active_brand_config_json_url should be path the current brand json file
- Go back to the default brand
  - ENV.active_brand_config_json_url should be path to default json file
- Test with a real s3 bucket for the CDN
  - JSON files should be uploaded to the CDN
  - ENV.active_brand_config_json should work when used with ENV.ASSET_HOST

Change-Id: Ibcaf54a2bff324f419a7614a8d3906c0c49aed9e
Reviewed-on: https://gerrit.instructure.com/77427
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2016-05-04 19:18:28 +00:00
Steven Burnett 1e6a5a66bf add user search to site admin
fixes CNVS-28590

Test Plan:
- Log in as a Site Admin
- Verify user search works

Change-Id: I6ba7bcda6200c4b20dc5942089e15455ff7991df
Reviewed-on: https://gerrit.instructure.com/76695
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2016-05-04 19:18:07 +00:00
Rob Orton 4b41be86ee remove unused method
refs CNVS-29138

test plan
 - specs should pass

Change-Id: I4782f6c50535548665a6c0d69798e6611a90d4d8
Reviewed-on: https://gerrit.instructure.com/78712
Tested-by: Jenkins
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2016-05-04 19:12:41 +00:00
James Williams 7f81d18477 show test students to account admins who are also observers
test plan:
* have a test student in a course
* enroll an account admin in the course
 as an observer
* the gradebook page should still work
 for the admin

closes #CNVS-28960

Change-Id: I4d0940ee33058a147e206a39bb3dc0a79c5d013d
Reviewed-on: https://gerrit.instructure.com/78582
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-05-04 18:40:08 +00:00
Alex Boyd 9ee46cacdf Expose calendar context information via the API
Fixes CNVS-28900

Test plan:
 - View the calendar
 - Uncheck a course or two on the sidebar. Make sure some are
   still checked.
 - Note the colors of the boxes next to each context
 - Hit /api/v1/calendar_events/visible_contexts
 - Verify that the result includes the same list of contexts you
   saw in the sidebar
 - Verify that the hex color codes for each context match up with
   what you saw in the sidebar
 - Verify that the "selected" key is true if you left that context
   selected and false if you didn't

Change-Id: Id20fcc84b2db061402a03520238a577a1d5223a5
Reviewed-on: https://gerrit.instructure.com/77684
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Alex Boyd <aboyd@instructure.com>
2016-05-04 17:36:26 +00:00
Matthew Berns 1e4c469590 scale aggregate bank scores to parent outcome mastery
fixes CNVS-28147

test plan:
- create an outcome with a default 1/3/5 scale
- align the outcome to a question bank with 10 total points
- align the outcome to another 10 point bank, but set mastery
  at 70% rather than the default of 60%
- as a student, score 60% on both quizzes/banks
- go to the student view of learning mastery gradebook
- the alignment to the first question bank should show the score
  as 3/3, the alignment to the second bank should as 2.57/3
- return to the second quiz and score a 70% instead of a 60%
- mastery should now show as 3/3 for the alignment
- return to the secon quiz and score 100%
- mastery should now show as 5/3 for the alignment
- test some other outcome point scales and results to ensure consistency

Change-Id: I4a90c8f698c425311453b40e0a506d0a4e408b1c
Reviewed-on: https://gerrit.instructure.com/75381
Reviewed-by: Davis McClellan <dmcclellan@instructure.com>
Tested-by: Jenkins
QA-Review: Indira Pai <ipai@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2016-05-04 16:06:42 +00:00
Jeremy Stanley 7108dadfd7 copy submitted files to the Submissions folder
test plan:
 - enable the Submissions Folder feature
 - as a student, upload some files via the Files page
 - submit an assignment and choose to
   "Click here to find a file you've already uploaded"
 - ensure the submission succeeds
 - go to the student's Files page and ensure the file
   was copied into the Submissions folder in a subfolder
   named after the course

fixes CNVS-28139

Change-Id: I64bb604a54d9c4b3708a8f1a4f8c1f9a8779fe21
Reviewed-on: https://gerrit.instructure.com/78253
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-05-04 14:11:37 +00:00
Jeremy Stanley c378afc033 upload submissions to submissions folder if feature is enabled
test plan:
 - enable the submissions folder feature
 - create an assignment that accepts file submissions
 - submit the assignment by uploading a file
 - ensure it is uploaded to the read-only Submissions folder
 - repeat this test with a group assignment

 (NOTE: submitting an assignment by choosing an alredy-uploaded
        file will not yet copy the file into the Submissions
        folder; this is coming up in another commit)

closes CNVS-28138

Change-Id: I836b26324cfa87d9a3ea62ca80569bcdfbb3b671
Reviewed-on: https://gerrit.instructure.com/77922
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-05-04 14:11:25 +00:00
Jeremy Stanley 59821b6302 remove direct-upload capability from SubmissionsController#create
this code hasn't been used in 5+ years AFAICT

test plan: regression test submitting files to assignments
 (including group assignments and multiple files per submission)

refs CNVS-28138

Change-Id: I8bb50c2b022faabdfaffe79a75df6225bf29d00b
Reviewed-on: https://gerrit.instructure.com/78156
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-05-04 14:11:17 +00:00
Alex Boyd a444454e27 Move selected calendar context tracking server-side
Fixes CNVS-28899

Test plan:
 - In a normal browser window, view the calendar
 - Uncheck some of the courses on the right so that only some are
   visible
 - Switch to an incognito user
 - Log in as the same user
 - View the calendar
 - Verify that the same set of courses are checked

Change-Id: I7649394e510e28f47639868bf198a006ed8127aa
Reviewed-on: https://gerrit.instructure.com/77680
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Alex Boyd <aboyd@instructure.com>
2016-05-03 23:05:03 +00:00
Ryan Shaw cd22ede085 move css for .Reminder__course-setup to the only place that uses it
refs: CNVS-28781

instead of loading this css on every page
I moved it out into its own bundle so it can be
only loaded in the one place that uses it

test plan:

* go to courses/x for a course
* there should be a "This Course is Unpublished"
  div
* make sure it is styled like it was

Change-Id: I5cf1eebf3dbfd876e7b015d24f6030f5ba5cdfbc
Reviewed-on: https://gerrit.instructure.com/77314
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2016-05-03 21:39:58 +00:00
Matthew Berns 655da72018 fix calculation int not persisting visually after refresh
fixes CNVS-27824

test plan:
- create a new outcome for n number of times
- set n number of times calculation int to 3
- reload the page and return to the outcome
- 3 should still be displayed as the calculation int

Change-Id: I5b1823248a5a6af3d35fb44e84e7b39c09f8274e
Reviewed-on: https://gerrit.instructure.com/78528
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
Tested-by: Jenkins
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2016-05-03 21:28:20 +00:00
John Corrigan ff88fca588 refactor logic in #assignment_overrides_json
fixes CNVS-28632

test plan:
- Create a Practice Quiz
- Assign the Quiz to everyone with a due date
- Create an ovverride of any type (adhoc, section, or group) with a
  different due date
- Save
- Attempt to Edit the quiz

Change-Id: I2bd118fb580e95465781440b0ed4c2f565ae4ab0
Reviewed-on: https://gerrit.instructure.com/76796
Reviewed-by: Marc Alan Phillips <mphillips@instructure.com>
QA-Review: Indira Pai <ipai@instructure.com>
Tested-by: Jenkins
Product-Review: Chris Wang <cwang@instructure.com>
2016-05-03 20:40:52 +00:00