Commit Graph

9154 Commits

Author SHA1 Message Date
Chris Hart 875fe0ab8b Better :focus states
Fixes: CNVS-18653

Revamps the :focus states of the following elements
and components:

- Regular text links
- jQueryUI tabs
- jQueryUI accordion
- Buttons
- Button groups
- Item groups

QA Test Plan:

(If someone other than Nathan R. is QAing this commit,
please reach out to me [chart] for the Google doc
I compiled that illustrates the new :focus states
for both the regular and high-contrast UIs.)

- Go through the Google doc in both UIs and make
  sure that the :focus states are displaying
  properly and that they meet contrast requirements
  where necessary.

Change-Id: Ife0086333d6042f98b968e905e8b793adb9bc328
Reviewed-on: https://gerrit.instructure.com/49438
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2015-03-11 17:35:05 +00:00
Chris Hart 6203efbf8d Regression on dropdown in authentication settings
Fixes: CNVS-18824

Updates icon markup so the dropdown is less ugly.

Test Plan:
- Create a SAML config from your root account in
  Settings > Authentication.
- The dropdown under Current Integration should
  now look like this:

  http://cl.ly/image/2s000H2j2a2f

  ...instead of this:

  https://www.dropbox.com/s/6l8m8s54n5t3flb/Screenshot%202015-02-21%2015.03.15.png?dl=0

Change-Id: Ie321be9e15837d3e180f3566fff1d1e2a350c17b
Reviewed-on: https://gerrit.instructure.com/49776
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2015-03-11 15:07:39 +00:00
James Williams d8bfdc0e9b show assignments needing to be graded only to instructors
also a touch of refactoring

test plan:
* create a course with a student, teacher and designer
* also create an assignment

* as the student, submit to the assignment
* as the teacher, should be able to see the assignment in
 the "To Do" list on the right-hand side of the dashboard
* as the designer, should *not* be able to see it

closes #CNVS-8059

Change-Id: I97b61bf857a1cf84c71597ffdd3c816023b84dd5
Reviewed-on: https://gerrit.instructure.com/50063
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-03-11 13:51:59 +00:00
James Williams 63c511b717 don't send group membership notifications for unpublished courses
test plan:
* create a course, leave it unpublished
* enroll a student
* as the student, set notifications for "Group" -
 "Membership Update" to ASAP
* create a group in the unpublished course
 and add the student
* the student should not receive a notification

closes #CNVS-6008

Change-Id: I38f3009222a50ac0cf016d18f6daf39add33f3a0
Reviewed-on: https://gerrit.instructure.com/50055
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-03-11 13:51:22 +00:00
Clay Diffrient fa343f9715 Refactors Add Module Item for Files
Converts the "Add File" portion of the "Add Module Item" dialog
into a React component.  It also sets up a Folder and File store
for interacting with the API.  It also modifies the behavior
so that folders that do not contain any files are not shown in
the select box.

fixes CNVS-13036
closes CNVS-18302

Test Plan:
  - Go to the modules page in a course that has some files.
  - Add a file to a module via the file menu.
  - Create 200+ folders with at least one file in each.
    You can import and expand this zip to make this a lot easier:
     http://goo.gl/lNtfx5
  - All files should be visible.
  - Create another folder, with no files within it.
  - That folder should not be visible.

Change-Id: I93e520135acb66bd821b3d19cc387eec59b347c7
Reviewed-on: https://gerrit.instructure.com/49028
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2015-03-10 23:57:38 +00:00
Bracken Mosbacker 3018205bc2 add lti_guid include option to account api
to help integration tie LTI launches to canvas accounts

Test Plan:
 * Do an account api call with include[]=lti_guid
 * the lti_guid of the account(s) should be returned

fixes PLAT-938

Change-Id: Ic68f82a19ca3828fe8958e75892d9c16533bae79
Reviewed-on: https://gerrit.instructure.com/47082
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins
Reviewed-by: August Thornton <august@instructure.com>
Product-Review: August Thornton <august@instructure.com>
2015-03-10 20:59:48 +00:00
Matthew Berns fe58074177 add 'exceeds mastery' level to both lmgbs and update mastery level colors
fixes CNVS-17463
fixes CNVS-16823

test plan:
- create outcomes; at least one should use either decaying average or power law
- attach outcomes to some assignments/quizzes and assess a student. Ensure there
  is a full range of outcome result scores, from 5 to 0
- go to teacher lmgb
- there should be an 'Exceeds Mastery' box on the right hand side
- score color breakdown should be as follows, with default outcome 5pt scale:
  1.5 and below: red ("Well Below Mastery")
  1.6-2.9: yellow ("Near Mastery")
  3.0-4.4: green ("Meets Mastery")
  4.5-5.0: dark green ("Exceeds Mastery")
- selecting boxes on right side should properly show-hide the respective scores
- go to student lmgb and expand a set of outcomes
- using the same scale as above, hover mouse over symbol on left hand side
  to trigger tooltip (scores can be seen on hover or alignments list):
  1.5 and below: red "x" icon, "Well Below Mastery" on tooltip
  1.6-2.9: yellow "+" icon, "Near Mastery" on tooltip
  3.0-4.4: green check icon, "Meets Mastery" on tooltip
  4.5-5.0: dark green check-plus icon, "Exceeds Mastery" on tooltip
- symbols on the new hover should be identical to the symbol shown on the left
  side of their respective outcomes
- colors on progress bars when viewing alignments should match symbol colors
- on student lmgb, voiceover in safari should properly read the student's mastery
  score (this commit addresses a voiceover bug introduced on the teacher ui commit)

Change-Id: Iabea8cd4a0b015e5dfe15d91716126ddb1195443
Reviewed-on: https://gerrit.instructure.com/49496
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2015-03-09 21:41:48 +00:00
Matthew Berns 4a5ddb8cd9 ensure proper sorting if submitted_at times exist on any decaying avg results
fixes CNVS-19114

test plan:
- create a decaying average outcome and attach it to several assignments
- give outcome scores to students without them submitting anything, noting the
  time when scoring
- math should properly reflect assessed_at time from most recent to oldest
- outcome result scores should be consistent on the student and teacher lmgbs
- create two new assignments and attach the outcome
- as a student, submit to one of them
- give and outcome score on that submission and re-check score. math should now
  reflect the submitted and graded assignment as most recent
- give an outcome score to the other assignment the student did not make a
  submission for.
- math should now reflect that assignment as the most recent

ensure decaying average scores are rounded to 2 decimals

fixes CNVS-19108

test plan:
- already handled above as long as you didn't see a score with a long trailing
  decimal on results. It would only happen due to floating point math issues.

Change-Id: Ia7b68eec443bbd5b64a0fa72293b9671dfb79e9d
Reviewed-on: https://gerrit.instructure.com/50019
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2015-03-09 21:39:08 +00:00
James Williams 349e411315 allow teachers with concluded enrollments to view hidden tabs
test plan:
* create a course with a teacher
* set the enrollment term end date for teachers
 in the past
* teachers should still be able to all tabs on
 the left-hand side inside the course (including
 the files tab)

closes #CNVS-13353

Change-Id: I1ee41567edb1fad7620f18e7b822c47f09e2ab38
Reviewed-on: https://gerrit.instructure.com/49998
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-03-09 20:35:23 +00:00
Brayden Lopez 7b3a02cb69 Fix google drive tree list item height when title is really long
Fixes PLAT-933

test plan: 
- Make sure any google docs title does not overflow to the unnecessary amount of lines.

Change-Id: Ibc95d951fe008b74bed0764c47ca6935f1d8adbf
Reviewed-on: https://gerrit.instructure.com/49935
Tested-by: Jenkins
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2015-03-06 23:51:11 +00:00
Nathan Mills 5f248efb82 render react on load if the active tab is external tools
fixes PLAT-937

test-plan:
browse directly to the apps tab in settings, it should always render.
account url = accounts/:account_id/settings#tab-tools
course_url = courses/:course_id/settings#tab-tools

Change-Id: I1f6f9601bfdb81cec8e28c38aa522c1ea4dc34eb
Reviewed-on: https://gerrit.instructure.com/49838
Tested-by: Jenkins
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Reviewed-by: Brayden Lopez <blopez@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2015-03-06 21:03:06 +00:00
Jeremy Stanley 979468b674 fix cache issue when restoring a user's enrollment
test plan:
 * have a student in a course
 * as an admin, go to the student's course user page
   by selecting "User Details" from the gear menu on the
   People page
 * click "More User Details"
 * in the Membership(s) box, click "Conclude this enrollment"
   and then "Restore this enrollment" (which will appear in its
   place)
 * verify that the student still has access to the course

fixes CNVS-3284

Change-Id: If782d7923aefdff5910a5a44e58a357be7c26dfe
Reviewed-on: https://gerrit.instructure.com/49976
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-03-06 18:53:07 +00:00
Clay Diffrient 9554a15c9a [SOC-2] Adds delete account link holder
This adds methods to show a delete account link on the user's settings page.

refs CNVS-16336

Test Plan:
  - Go to the user settings page
  - On the right hand side, you should see nothing out of the ordinary
    below the MFA and edit settings buttons.

Change-Id: I794f41ad024c7a5392b78adf7aa05695a06bd8c3
Reviewed-on: https://gerrit.instructure.com/49914
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-03-06 18:02:15 +00:00
James Williams 03b13c50a1 retain quiz question migration id when de-duped
(also de-dups questions with mis-matched answer ids)

test plan:
* create a quiz with an essay question or file upload question
* copy the entire course (quiz + question bank)
* re-copy the course, but selectively select only the quiz
* it should not have duplicated the quiz questions

closes #CNVS-18593

Change-Id: I508d20aaeae4878e5634d182cd835ddcd8642468
Reviewed-on: https://gerrit.instructure.com/49941
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
2015-03-06 17:41:31 +00:00
Nathan Mills 39019eb33d force google docs reauth in submissions if the token is bad
fixes: PLAT-888

test-plan:
make sure google drive plugin is disabled and google docs is enabled
remove your google docs user token
try to submit an assignment, it should force you to reauth

change your docs token in the db so it is invalid
try to submit an assignment, it should force you to reauth

Change-Id: Ib8d589aa84cd61a7860ad9a2bdae4bcf1df01e6a
Reviewed-on: https://gerrit.instructure.com/49846
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2015-03-06 17:39:47 +00:00
Cameron Sutter 853eb61c38 multiple drop down questions show answers
fixes CNVS-18429

the regex looking for the select tags was busted.
I tried to fix it, but i think this is a better approach

test plan:
 * as a teacher
 - create a quiz with questions of type: multiple drop downs
 * as a student
 - start the quiz and answer some questions, but do not submit
 - navigate away from the page
 - come back to the page
 > the answers you chose should be chosen in the drop downs

Change-Id: I9b0d5e31bc87b2dc00cf73e9f7bc0d23c961cda7
Reviewed-on: https://gerrit.instructure.com/49853
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Tested-by: Jenkins
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2015-03-06 16:25:33 +00:00
Simon Williams 8447e36bd0 fix date handling for multipart post requests
due to the way we are handling multipart posts, by creating a hidden
form + iframe to handle the multipart encoding, date objects were being
ignored when creating the secondary form.  this doesn't happen with
normal ajax requests because backbone uses JSON.stringify, which
properly converts the date object to an iso8601 string. we looked for
a way to properly encode any object when it gets re-entered into the
form, so that we didn't have to special case date objects, but didn't
find a good method.

fixes CNVS-3475

test plan:
- go to the announcements page, and press '+ Announcement'
- enter a title and description
- choose an attachment
- check "Delay posting" and pick a date in the future
- save the announcement
- ensure that the attached file and the delayed post date were both
  retained

Change-Id: I55f883d18c0fd251f4f0c1e57e7ab5f8a5ce1fdb
Reviewed-on: https://gerrit.instructure.com/49030
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-03-06 04:34:35 +00:00
Simon Williams 1928fe18de fix tab order of ok/delete buttons in outcome criteria cells
fixes CNVS-19021

test plan:
- in a course, go to the outcomes page
- create/edit an outcome, and edit one of the criteria cells
- you should be able to tab from the label field to the delete/ok
  buttons, and the tab order should match visual order, from left to
  right

Change-Id: Ie9d335f0e7cb49cdd63346eea152625c4d5dffbb
Reviewed-on: https://gerrit.instructure.com/49868
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-03-06 00:14:56 +00:00
Simon Williams 08360d9ae9 fix student submission link in eportfolios
fixes CNVS-18882

test plan:
- enroll a student in a course, with an assignment
- as a student, submit to the assignment
- create a new eportfolio
- the submission should be listed as a possibility to embed in the
  eportfolio
- the small icon to open the submission in a new window should actually
  work

Change-Id: I20487f8a2699b730472003140e388490d9d67d8e
Reviewed-on: https://gerrit.instructure.com/49638
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-03-06 00:14:46 +00:00
Nathan Mills 7605864c03 fix logic for showing google auth on submissions
fixes: PLAT-928

test-plan:
make sure that the appropriate information is displayed for the following scenarios for google docs submissions:
no google_drive token
google drive plugin disabled and no google docs token
google drive plugin disabled and a google docs token
google domain restriction not allowing google account

Change-Id: I8b72de3504a5e010fdfa4961ed66babdde31df39
Reviewed-on: https://gerrit.instructure.com/49778
Tested-by: Jenkins
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2015-03-05 23:06:02 +00:00
Addison Higham 099bafa228 Make changes for node 12/iojs.
This makes a number of changes to get the compilation compatible with
node 12 and iojs.

- removes loom (no longer used)
- updates karma dependencies to more recent versions
- minor css change to make sass compilation work with node-sass
  (lib-sass)

test plan:
- should be able to compile assets with node 12 and iojs
- JS specs still pass

Change-Id: Id4a0628ff0c6dd09e622d02329a4400d60459ec2
Reviewed-on: https://gerrit.instructure.com/49493
Tested-by: Jenkins
Reviewed-by: Nick Houle <nhoule@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
QA-Review: Cameron Matheson <cameron@instructure.com>
2015-03-05 22:43:38 +00:00
Brad Horrocks f3b400b7fd Google Drive file extension filters
Pull extensions from export url.
Failover to uploaded mime type/extension
Use preferred extensions if available

Fixes PLAT-932
Fixes PLAT-931

Test plan

Submit Google drive doc with filters enabled
note: .doc, .xls, .ppt aren't available on google drive.
      use .docx, .xlsx, .pptx instead

Change-Id: I0b6efa66efe7418e7e5a8d7ecf9216d3e2d9bce9
Reviewed-on: https://gerrit.instructure.com/49699
Tested-by: Jenkins
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
2015-03-05 22:42:19 +00:00
Brad Horrocks 2d4eef6bc9 Google Doc submissions can no longer be submitted without selecting a doc
The submit button is now disabled until you select a doc

Fixes PLAT-935

Test Plan
Make sure you cant submit unless you select a google doc

Change-Id: I4d4c8bfec7bedcfddac8c47d3d18931e55edcc3e
Reviewed-on: https://gerrit.instructure.com/49837
Tested-by: Jenkins
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Reviewed-by: Brayden Lopez <blopez@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
2015-03-05 22:42:11 +00:00
Simon Williams 6848c3011d fix height of outcome criteria editor row
fixes CNVS-19022

test plan:
- in a course, go to the outcomes page
- click on an outcome, and click edit
- click edit on one of the criteria cells
- the 'delete' and 'ok' buttons should visually fit inside the border of
  the cell

Change-Id: Ida286d50e95ece1da51e8cb0180fca709b165ca3
Reviewed-on: https://gerrit.instructure.com/49862
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-03-05 22:07:27 +00:00
Dan Minkevitch a777f3948c Changes SOC2 Start Date
closes CNVS-19060

The date for requiring new users to accept terms has been changed to 2015-05-05

Change-Id: I3ca4e569062c6ab26047a2038bdd5cecce359835
Reviewed-on: https://gerrit.instructure.com/49910
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Tested-by: Jenkins
Product-Review: Jon Willesen <jonw@instructure.com>
2015-03-05 22:05:15 +00:00
Brayden Lopez 0f1ce9f634 Don’t override external tool’s shared secret if nothing changed
Fixes PLAT-925

test plan:
- Navigate to app settings page
- Create app config
- Edit app config 
- Shared secrets should be empty with placeholder saying ‘[Unchanged]’
- Make sure if is empty, the actual shared settings doesn’t change
- If shared settings is changed, make sure the saved value matches.

Change-Id: I6488abb7c26451fb4c41eff17320564fc283ba75
Reviewed-on: https://gerrit.instructure.com/49702
Tested-by: Jenkins
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2015-03-05 22:00:45 +00:00
Brayden Lopez d0a394178c Fixing various app center bugs
Fixes PLAT-923
Fixes PLAT-926

test plan:
- Go to app center.
- Make sure ‘domains’ displays the correct information.
- Go to create an external app.
- Make sure if you spam the add button it only adds one tool.

Change-Id: I00396b30b33811ff0269dc19063f3c2e416bbb5c
Reviewed-on: https://gerrit.instructure.com/49506
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2015-03-05 22:00:32 +00:00
Joel Hough df718ffd60 don't load all contexts for group recipient lookup
fixes CNVS-18578

test plan
quauntitative functionality test
- regression test recipient picker when picking in groups

qualitative speed test
- have a high enrollment user with normally slow response times
 during conversation recipient finding
- compose a conversation message
- search for recipients in a group using the dropdown recipient
 picker
- ensure that the response time for the recipient is not as bad
 as it was

Change-Id: Ie7655544f93d1168ac78f0b1497c1bec9f0319c6
Reviewed-on: https://gerrit.instructure.com/49395
Tested-by: Jenkins
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2015-03-05 18:38:42 +00:00
Jeremy Stanley b19f89d6ff preserve "Until" time when copying discussion topics
test plan:
 - create an ungraded discussion topic with "Available at"
   and "Until" dates
 - copy the course
 - confirm the dates are preserved
 - confirm both dates move appropriately when you shift dates

fixes CNVS-19043

Change-Id: I81b694b87e745dc098e2c6b306c2c0d6656c38ca
Reviewed-on: https://gerrit.instructure.com/49898
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
2015-03-05 17:12:43 +00:00
Joel Hough bca69aaef8 dependent destroy communication channel's notification policies and delayed messages
fixes CNVS-18976

test plan
- create communication channel
- set notification preferences to 'daily' for some notification
- cause a message of that type to be sent (i.e. queued for sending
 later)
- destroy! the communication channel from the console
- ensure that the channel is destroyed

Change-Id: I10e58c9381bf9307e0fc0c5c870ccbfc24671314
Reviewed-on: https://gerrit.instructure.com/49842
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Tested-by: Jenkins
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2015-03-05 17:03:38 +00:00
James Williams 035cf861d4 don't allow users to create conferences without the permission
test plan:
* enable a web conference plugin
* add a teacher to a course
* create a group
* as the teacher, should be able to create
 conferences for the course and group

* as an account admin, disable the permission
 to "Create conferences" from the teacher role
* the teacher should no longer be able to create
 conferences

closes #CNVS-5370

Change-Id: Ic0955bd09b09e5026754f754077889904918cbbb
Reviewed-on: https://gerrit.instructure.com/49856
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-03-05 16:25:25 +00:00
Michael Nomitch 6f84469096 DA - fix participants with visibility for group discussions
fixes CNVS-18897

test plan:
  - turn DA on
  - make an active user with a verified email address
  - make a group assignment discussion & assign to a
    group this user is in & publish it
  - check  /users/:id/messages and the user
    should have been notified about the post
    - if they get 2 notifications that is okay
      (it is a different bug)
  - make an ungraded group discussion in a course
    - check that participating users get
      notifications as well

Change-Id: Ib83315bf109a72fc657f151182851eaa50e90983
Reviewed-on: https://gerrit.instructure.com/49618
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-03-05 16:24:26 +00:00
Brad Horrocks 04ca108451 Google docs tab will appear when using file extension filters
Fixes PLAT-936

Test Plan:

Attempt to load google docs tab on an assignment submission
with file extension restrictions turned on

Change-Id: Iaa11ef90b36e9732579dc2179a22719bd9148d61
Reviewed-on: https://gerrit.instructure.com/49698
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
Tested-by: Brad Horrocks <bhorrocks@instructure.com>
2015-03-05 15:00:49 +00:00
Brad Horrocks 955fcf47c8 When allowed google docs domain is nil, no one can submit homework
We now make sure domain is set when enforcing domain restrictions for submissions

Fixes PLAT-934

Test Plan:

Enable google doc domain restrictions, but dont fill in a domain.
you should still be able to submit from any domain

Change-Id: I4fa597ad4de49fcb96bab5fe67c9c3e450ac27af
Reviewed-on: https://gerrit.instructure.com/49650
Tested-by: Jenkins
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
2015-03-05 14:58:31 +00:00
Ryan Taylor 96a604111a Prevents pick count erroring on nil
Adds a default value of 0 when pick count isn't being set properly.

Closes CNVS-18856

Test Plan:
  - Create quiz with question groups and pick count of nil
  - Confirm that the preview page still works without error or silent
    redirection to quiz show page.

Change-Id: I2523e93aa3af31520e87ca0107e5f82db1b7a92c
Reviewed-on: https://gerrit.instructure.com/49469
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins
QA-Review: Robert Lamb <rlamb@instructure.com>
Product-Review: Ryan Taylor <rtaylor@instructure.com>
2015-03-05 02:48:27 +00:00
Jeremy Stanley 80bcc2dafd prompt the user when moving and a file exists
test plan:
 - enable new files
 - have a multiple files with the same name in different
   folders
 - try to drag a file from one of these folders to another
   and confirm you are prompted to rename or overwrite
 - test renaming to another name that already exists, and
   confirm the dialog comes up again
 - test overwriting when the destination folder has been
   looked at previously without reloading the page, and
   confirm no duplicate file appears there
 - confirm that an error message is displayed if you try
   to rename a file to an existing name (and the file
   retains its original name)

fixes CNVS-18537

Change-Id: Id5ecedaafcfa762481e65ec2adf61640da5603d8
Reviewed-on: https://gerrit.instructure.com/48679
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-03-05 01:10:36 +00:00
Rob Orton bec4472543 Revert "allow IE8 if setting is set"
This reverts commit fabfb4acc2.

Change-Id: I0fd84fe0150d112ff1006e5cf41f211f7814e4fb
Reviewed-on: https://gerrit.instructure.com/49807
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2015-03-04 22:46:30 +00:00
Matthew Berns d502ff488e makes discussion creation date only visible to moderators
fixes CNVS-15233

test plan:
- make a discussion
- view it as a teacher, creation date should be shown above reply count
- view it as a student and observer, date should not be visible

Change-Id: I5b297ba05cfd14352f72ad98d6c02025a3fab2c6
Reviewed-on: https://gerrit.instructure.com/49663
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2015-03-04 19:58:40 +00:00
Cody Cutrer 15ca8d65a2 remove basic auth support
2012 has definitely come and gone

Change-Id: Ifa6c74048b0afe38a6892ea305594ce81c4bc381
Reviewed-on: https://gerrit.instructure.com/49832
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-03-04 19:50:50 +00:00
Nick Houle f398d9f792 Practice quizzes not saving with post_to_sis feature
Fixes SIS-828

Test plan:
- Create a graded quiz, publish it with the post grades to SIS feature enabled.
- Edit the quiz and change it to a practice quiz, then click save.
- Edit the quiz one more time and change the description, then save.
- Confirm the save worked.

Change-Id: I6730f69796acbd675ab5b09f3bf046a9d5c88d9e
Reviewed-on: https://gerrit.instructure.com/49737
Reviewed-by: Tyler Pickett <tpickett+gerrit@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Linda Feng <lfeng@instructure.com>
Tested-by: Jenkins
2015-03-04 17:55:06 +00:00
Jeremy Stanley d06051d02a don't enforce usage_rights_required unless new files is on
test plan:
 - enable "Require Usage Rights" but disable "Better File Browsing"
   and ensure files uploaded to the files page via the upload button,
   drag/drop, and wiki sidebar are not locked by default
 - enable both features and confirm that the usage rights requirement
   is enforced before files can be published (whether they are
   uploaded via files page upload button, drag/drop, or wiki sidebar)

fixes CNVS-18979

Change-Id: Iba09c672f6cb7b9e1518942ef95be14170d82fcb
Reviewed-on: https://gerrit.instructure.com/49799
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-03-04 17:21:27 +00:00
James Williams ac49b20db4 fix and add avatar reporting links
test plan:
* enable avatars on the root account,
* create a course with multiple students
* a student should be able to look at the
 course profile of another user in the course
 and report their avatar
* when reported, should be able to be seen by
 account admins at "/accounts/X/avatars"
* should work with profiles enabled or disabled

closes #CNVS-13849 #CNVS-4781

Change-Id: I97f62ca709321233c8a57cd6f1bd9870dc50d215
Reviewed-on: https://gerrit.instructure.com/49781
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-03-04 15:46:57 +00:00
James Williams 6c00886edd improve qti and course copy warnings
test plan:
* quiz imports and course copying should
 be unaffected

closes #CNVS-19012

Change-Id: I6000fce1d6f08459bb7266c97b9d47424bedc1de
Reviewed-on: https://gerrit.instructure.com/49762
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-03-04 13:51:26 +00:00
Benjamin Porter 6d2192d9cf OutcomeView update calculation int intelligently
When the user changes between calculation methods, the calculation int
currently just stays the same.  This is almost never what we want.

Instead, this patch makes the calculation int update based on what is
selected.  When set to n_mastery, the value will change to 5 unless the
current value is already a valid settings for n_mastery.  When settings
to decaying_average, the value will change to 65 if it is currently set
to 5 (which is a valid but very unlikely value for decaying_average)

Fixes CNVS-18769

Test Plan:

    1. Edit an outcome on the outcomes page
    2. Set the value to decaying average and 65
    3. Change to n mastery and observe that the int changes to 5
    4. Change back to decaying average and observe that the int changes
    back to 65
    5. Change to n mastery and set 4
    6, Change to decaying average and observe the value stays at 4

Change-Id: Ie231bd2f108dfd896553e4a282422711bcb2003a
Reviewed-on: https://gerrit.instructure.com/49563
Reviewed-by: Matt Berns <mberns@instructure.com>
Tested-by: Jenkins
Product-Review: Hilary Scharton <hilary@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
2015-03-03 23:01:31 +00:00
Ryan Shaw fabfb4acc2 allow IE8 if setting is set
this is an experiment so we can allow customers to
try ie8 instead of immediately redirecting them
to a page that says IE8 is not supported

Change-Id: I883b00316d47bd48c89093c9e5dcdb6e13431fe4
Reviewed-on: https://gerrit.instructure.com/49625
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2015-03-03 22:10:48 +00:00
Ryan Shaw 837bbe3bec Starting point for upgrading SISGradePassback to current react
fixes: CNVS-18165

if you apply this commit and everything in SISGradePassback
works, your work on upgrading to current react is done.

use this as the starting point to know what you need to do

Change-Id: I9259b4081163c0063eb69dd19dea6bec4231dfb0
Reviewed-on: https://gerrit.instructure.com/47742
QA-Review: Kausty Saxena <kausty@instructure.com>
Reviewed-by: Tyler Pickett <tpickett+gerrit@instructure.com>
Product-Review: Tyler Pickett <tpickett+gerrit@instructure.com>
Tested-by: Jenkins
2015-03-03 18:06:16 +00:00
Cameron Sutter 2bfc1e7bed admins can preview quizzes
closes CNVS-18786

test plan:
 * as an admin
 - navigate to a quiz within a course
 - click preview
 > it should load the quiz and let you take it

Change-Id: I13f40e9fc085f1e7c5269b330b4469b85ed0ffce
Reviewed-on: https://gerrit.instructure.com/49603
Tested-by: Jenkins
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2015-03-03 17:07:28 +00:00
Jeremy Stanley d4a0ecc59b fix publishing wiki page after renaming on modules page
test plan:
 - have a module with an unpublished wiki page
 - from the modules page, rename the wiki page via the gear menu
   and "edit" item
 - without reloading the page, click the cloud icon to publish
   the wiki page
 - go to the Pages tab and ensure only the new name appears
   (publishing the page didn't create a new published page with
    the old name, leaving the renamed page unpublished)

fixes CNVS-18693

Change-Id: I1a1995f81dfe1d02cebc558bbaee716e930c8354
Reviewed-on: https://gerrit.instructure.com/49593
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-03-03 16:34:35 +00:00
James Williams d50fffb713 include updated_at in Conversation#preload_users_and_context_codes
without updated_at, it's possible to fetch stale
conversation_context_codes, which ends up causing
the wrong tags to be added (because it tries to infer them)

test plan:
* create a course with two students
* as one student, send a message from that student to the other,
 selecting the course from the drop-down
* create another course with the same two students
* send another message, this time using the other course
 in the drop-down
* view the sent messages, filtering by course
* should show each message in the right filter

closes #CNVS-18315

Change-Id: Ia0418489c2ce632bde36bcb899844f86c892b3c6
Reviewed-on: https://gerrit.instructure.com/49516
Tested-by: Jenkins
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-03-03 13:49:59 +00:00
Dylan Ross d4bffe3bc3 fixes the dropdown rendering issue in gradebook
Chrome 40 introduced a rendering issue that
prevents selection of menu items in dropdowns
on the gradebooks page. This issue is fixed in
Chrome 42 (Canary). This commit should be
reverted when Chrome 40 and 41 are no
longer supported

fixes CNVS-18276

test plan:
- In chrome 40, create a course with 2 sections
  and 1 student
- Go to the gradebook

1. Click on the change sections dropdown
  - Menu should appear without rendering errors
  - Select a menu item
  - Menu should disappear compeltely

2. Click on the change sections dropdown again
  - Menu should appear without rendering errors
  - Click outside of the menu
  - Menu should disappear completely

3. Repeat the two steps above for the settings
   dropdown

4. Check for performance problems in
   gradebooks with a lot of students /
   assignments

Change-Id: I50805ea3bb0f49e0ba943b319c02bed283b5b774
Reviewed-on: https://gerrit.instructure.com/49237
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Dylan Ross <dross@instructure.com>
Tested-by: Jenkins
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
2015-03-02 22:29:10 +00:00