Commit Graph

17943 Commits

Author SHA1 Message Date
MFairbourn 56c815e9d2 spec: change should test SIS Agent Token Authentication to P2
Test Plan:
_ Tests should pass
_ Code review

* note this is a slow running spec and can be a P2

Change-Id: I9186089c94860c4d2402c9f12b6eec20f6cc7925
Reviewed-on: https://gerrit.instructure.com/66090
Reviewed-by: Derek Hansen <dhansen@instructure.com>
Tested-by: Jenkins
Product-Review: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2015-10-29 19:39:29 +00:00
gbeckmann d583a8ac57 Spec: Add spec to test agenda view assignment dates per section
Add a spec to test that assignment due dates appear correctly
for different sections in the calendar agenda view.

Spec for test case C138848

Test Plan:
Run specs

Change-Id: Ib47890d4c92417da451aa6a1f8a94e44a480c523
Reviewed-on: https://gerrit.instructure.com/65949
Tested-by: Jenkins
Reviewed-by: Adam Phillipps <adam@instructure.com>
Reviewed-by: August Thornton <august@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2015-10-29 19:24:59 +00:00
James Williams b4ce2b49e1 update canvas-jobs
includes n-strand improvements to perform load balancing
at runtime instead of queue time

(e.g. should prevent one strand from getting blocked when
 queueing many imports at a time)

test plan:
* regression test delayed jobs

Change-Id: I2f616d380c841d7231af5159c09c24cbcc8d235d
Reviewed-on: https://gerrit.instructure.com/65976
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-10-29 19:17:14 +00:00
Simon Williams 59183acae8 spec: fix spec for date fudging
Change-Id: I3eb761f5ca80e1f59520ba63747e17189109d0e2
Reviewed-on: https://gerrit.instructure.com/66034
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2015-10-29 19:08:28 +00:00
Jeremy Stanley 0714db64dd include assignments for graded topics/quizzes on import
test plan:
 - create a course with an assignment group containing a graded
   discussion topic and a quiz (but no assignments as such)
 - export the course to a common cartridge file
 - selectively import the course:
   * you should see the quiz and the discussion topic listed
     under "Assignments" and your assignment group in the
     select-content dialog
   * checking the assignment should check the associated
     quiz or topic and vice versa
   * if the (entire) assignment group is selected, it should be
     imported in a selected import
   * if individual items (but not the entire assignment group)
     are selected, they should be imported into an
     "Imported Assignments" group

fixes CNVS-23017

Change-Id: I2553cbf87209ea89b01325da855f3bfd12aa31aa
Reviewed-on: https://gerrit.instructure.com/66023
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-10-29 19:08:09 +00:00
James Williams 654a3d1dae don't potentially resave every quiz submission in transaction
test plan:
* regression test quiz editing

closes #CNVS-24587

Change-Id: I5078eb48e14ad5d7ac4bc70bda043f2eb305e4ed
Reviewed-on: https://gerrit.instructure.com/66007
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-10-29 18:41:38 +00:00
James Williams 37234f5989 allow teachers to unlink imported outcomes if unused
also don't show the delete button if it isn't going to work

test plan:
* create an account level outcome
* import it into a course
* as a teacher, link it to a assignment's rubric
* visit the outcomes page
* should not be able to delete the outcome
* delete the assignment
* should be able to delete the outcome

closes #CNVS-24106

Change-Id: Idd38d9e6fa69e3dd7d7c48b4056d6c13fa57753a
Reviewed-on: https://gerrit.instructure.com/65898
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-10-29 18:41:33 +00:00
James Williams 6062491d31 return deleted enrollments if requested in enrollments index
also refactor enrollments_visible_to away because it is bad

test plan:
* add people to a course
* remove them
* calls to /api/v1/courses/X/enrollments?state[]=deleted
 and /api/v1/sections/Y/enrollments?state[]=deleted
 should include the deleted enrollments

closes #CNVS-23729

Change-Id: I29d6995064dc6cf79af44b940f55dc0269c2a891
Reviewed-on: https://gerrit.instructure.com/65756
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-10-29 18:41:27 +00:00
James Williams 12a7c4220e accepting future enrollments should retain readonly access
test plan:
* create a course set to begin in the future with dates
 restricted to those dates, but making sure students
 are not restricted from viewing future courses
* invite a student into the course
* they should be able to view the course as before
* accept the enrollment
* they should now still be able to view the course
 as though they were invited

closes #CNVS-23683

Change-Id: Ib7a58d0c587b10b7aaa8c8b7c10a56e547029533
Reviewed-on: https://gerrit.instructure.com/65553
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-10-29 16:29:02 +00:00
Jacob Fugal bde3b2690e fix formatting of all day event date
fixes CNVS-24620

test-plan:
 - click on an all day event in the calendar
 - date shown in the opened modal should be just the date

Change-Id: I3347eee680c6dc1edf6e383056e9c2db92a570b2
Reviewed-on: https://gerrit.instructure.com/66019
Tested-by: Jenkins
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-10-29 13:57:32 +00:00
Simon Williams d076ff934c remove an unused partial
fixes CNVS-24126

test plan:
- search the app and make sure there are no external references to this
  partial

Change-Id: Ief7f62586c54eb66e58846fcdd0de0dab6ddc551
Reviewed-on: https://gerrit.instructure.com/65416
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Tested-by: Jenkins
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2015-10-29 13:53:20 +00:00
Clay Diffrient 3ea78381c2 [a11y] Have only one set of buttons for add module dialog
This replaces the fixDialogButtons helper that was causing a second
'hidden' set of buttons to be displayed with styles for form-dialog.

Ideally it would be nice to use react-modal, but the modules page
is sufficiently complex that its a bit difficult to do so.

closes CNVS-22870

Test Plan:
  - Go to the modules page
  - Click the 'Add Module' button
  - Using a JAWS make sure that only one set of buttons
    is read.  This should be the case in all screenreaders though
  - Close the dialog
  - The screenreader form navigation listing should not show the
    buttons as still being there.

Change-Id: I4ef0f782bb393241d1ce4bccd61ce90a0e1ba00f
Reviewed-on: https://gerrit.instructure.com/64805
Reviewed-by: Sterling Cobb <sterling@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2015-10-29 02:17:40 +00:00
Michael Nomitch 3d19862dbc calendar upgrade: assignment edit works on agenda
fixes CNVS-24615

test plan:
  - go to calendar agenda view
    - changing the date of an assignment works
    - creating a new assignment works
    - changing event dates works
  - drag and drop from month/week view works

Change-Id: Ide1ebe3552370ffb6ff62a4e125ed234d0318306
Reviewed-on: https://gerrit.instructure.com/66004
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-10-28 23:19:34 +00:00
MFairbourn 746f54003a spec: add spec for removing user from course with sis_id
test_id: 336018

test plan:
-Specs pass
-code review

Change-Id: I79b177ccc27b5b4db210d698ec5cf0cbbbf6b523
Reviewed-on: https://gerrit.instructure.com/65987
Tested-by: Jenkins
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2015-10-28 23:04:17 +00:00
Nathan Mills 2bceb54da7 start expiring access tokens created by new dev keys
add warning message to the api docs about expiring access tokens

fixes PLAT-1263 PLAT-1243

test plan:
*create a developer key before cherry picking change set
*cherry-pick change set
*generate an Access Token using the old dev key
*it should not have an expiration

*create a new developer key
*create an access token with the new dev key
*it should have an expiration

*check the api doc on the oauth page for the warning message

Change-Id: Id53d9b7fab4b8b308a0abbae0268c1c25a2d4c6f
Reviewed-on: https://gerrit.instructure.com/64881
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2015-10-28 22:00:55 +00:00
Spencer Olson 4264897cf2 remove colon from 'Name:' and 'Range:'
on the grading standards page, remove
unnecessary colons in the 'Name:' and
'Range:' headers.

test plan:

verify the headers no longer have colons
on the grading standards page.

Change-Id: I69192ce2bca4cb7b6aefb858896ed84acf6ae564
Reviewed-on: https://gerrit.instructure.com/65986
Tested-by: Jenkins
Reviewed-by: Strand McCutchen <smccutchen@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2015-10-28 21:46:36 +00:00
Spencer Olson 802299b2cf feature flag for 'All Grading Periods' totals
Add grading period dropdowns on the 'grades' page,
and add a "Display Totals for 'All Grading Periods'"
feature flag. By default, the feature will be turned
'off'.

When the feature is 'off':
 - Totals will not display in the gradebook
   or the 'student grades' page when the 'All
   Grading Periods' option is selected.
 - The grading period dropdowns on the 'grades'
   page will not have an 'All Grading Periods'
   option.

When the feature is 'on':
 - Totals will display in the gradebook and the
   'student grades' page when the 'All Grading
   Periods' option is selected.
 - The grading period dropdowns on the 'grades'
   page will have an 'All Grading Periods' option.

closes CNVS-23995

test plan:

1) as a teacher, enable the 'multiple grading
   periods' feature (do not enable the 'display
   totals for all grading periods' feature yet).
   a) verify the gradebook does not show totals
    when the 'All Grading Periods' option is
    selected.
   b) verify the 'student grades page'
    (courses/4/grades/9#tab-assignments) does
    not show totals, and the calculation of
    'what-if' grades is disabled when the
    'All Grading Periods' option is selected.
   c) turn on the 'display totals for all
      grading periods' feature. repeat steps
      a & b and verify that the totals now
      show up (and you can calculate what-if
      grades on the student grades page when
      'All Grading Periods is selected')

2) sign in as a student that is enrolled in
   3 courses: 1 course with MGP disabled, 1
   course with MGP enabled and 'display all
   grading periods totals' (DAGPT) disabled,
   and 1 course with MGP enabled and DAGPT
   enabled. go the the 'grades' page (/grades).
   a) verify there is a grading period dropdown
      next to the totals for courses that have
      MGP enabled. verify there is not a grading
      period dropdown next to the total for the
      course with MGP disabled.
   b) verify that the current grading period is
      selected by default, if one exists. if a
      current grading period does not exist, then:
      - the dropdown next to the total for the
         course with DAGPT disabled should show
         'Select a grading period' and the total
         grade should show as '--'.
      - the dropdown next to the total for the
        course with DAGPT enabled should show
        'All Grading Periods' and the total grade
        should be displayed.
   c) verify clicking a grading period in the
      dropdown changes the total, and shows
      the correct total for that grading period.

3) repeat steps 2a-c, but sign in as an observer that
   is observing at least 3 students in 3 different
   courses(1 course with MGP disabled, 1 with MGP
   enabled and DAGPT disabled, and 1 course with
   MGP enabled + DAGPT enabled).

4) verify that the grading period dropdowns that were
   added are accessible.

Note: The 'grades' page (/grades) will _always_
display the total for 'All Grading Periods' when
signed in as a teacher. We are aware of this
existing bug and we're working on a solution.

Change-Id: If501b47aa57121d17d4e6629d1dcdbc8676971a2
Reviewed-on: https://gerrit.instructure.com/65847
Tested-by: Jenkins
Reviewed-by: Strand McCutchen <smccutchen@instructure.com>
Reviewed-by: Dylan Ross <dross@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2015-10-28 21:03:45 +00:00
James Williams ae73f86187 spec: fix discussions_show_page_any_user_spec
Change-Id: I65a8442d479b2bfd05f19f141a99842477c46435
Reviewed-on: https://gerrit.instructure.com/65991
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-10-28 19:22:03 +00:00
Simon Williams d59a97d63a handle focus when adding/removing due date sets
when adding, focus goes to the input field of the new set.  when
removing, focus goes to the input field of the set that "slides in" to
the place of the removed set (so with 4 sets, deleting the original
first set, focus goes to the new first set), or if there is no new set
(when you delete the last set), focus goes to the previous set.

fixes CNVS-23043

test plan:
- on the assignment new/edit page
- add and remove due date sets with the keyboard / screenreader
- it should handle focus well, see above for the logic
- try lots of combinations, like deleting the first, last, and middle
  sets

Change-Id: Id1b7da84fddea1fe3f87d0874acf61a4978d73e0
Reviewed-on: https://gerrit.instructure.com/64837
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
QA-Review: Landon Holmstead <lholmstead@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-10-28 18:29:34 +00:00
Simon Williams 993ae12567 redirect to google drive auth for collaboration show
fixes CNVS-23084

test plan:
- create a google docs collaboration, and invite someone who does not
  have google docs or drive authorized
- click on the link to the collaboration from the invite email
- it should redirect you to authorize your google account
- going through that flow should work correctly

Change-Id: I7a5074277360742031994da71440237aa0fdd042
Reviewed-on: https://gerrit.instructure.com/64646
Tested-by: Jenkins
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: Adrian Russell <arussell@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-10-28 18:29:20 +00:00
Matthew Berns 5510947248 separate module ePub generation into separate xhtml files
refs CNVS-21803

this is primarily an organization change on the back end, there is
very little change to how it should look/work for end users.

test plan:
- generate an ePub using content type sorting and module sorting
  to ensure no regressions
- content type sorting should look exactly the same
- for module sorting, instead of having a "Course Modules" page at the
  beginning with links to the modules, the titles of the modules
  should just be on the spine/navigation of the ePub

Change-Id: I177691f3435440e9d2b5f8ef3185af941059b809
Reviewed-on: https://gerrit.instructure.com/65650
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Matt Berns <mberns@instructure.com>
2015-10-28 17:39:21 +00:00
Matthew Berns 024e4ab472 add syllabus to ePub
closes CNVS-23623

- adds a syllabus to the beginning of the ePub

test plan:
- generate two ePubs for a course that has items in modules, one using the
  default module sorting, the other using content type sorting
- the syllabus should contain the title and due date of graded assignments
  and quizzes in chronological order
- items with no due dates should appear last
- when sorting by module, only graded assignments and quizzes that are in
  modules should show up
- syllabus entries should link to their respective assignment or quiz

Change-Id: I9f9fb97f03e9bcaaa874681ab289ba9c70a1f4ac
Reviewed-on: https://gerrit.instructure.com/64552
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
Tested-by: Jenkins
QA-Review: Landon Holmstead <lholmstead@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-10-28 17:39:12 +00:00
Adrian Russell d17f455275 Spec: Check a teacher can get to /user_notes page.
Test plan:
- run spec

Change-Id: I04cbdd04e4de3cacc112f90a55637d224efb2f93
Reviewed-on: https://gerrit.instructure.com/65973
Tested-by: Jenkins
Reviewed-by: Derek Hansen <dhansen@instructure.com>
Product-Review: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2015-10-28 17:33:04 +00:00
Spencer Olson 05f776837c react gb: implement 'message students who'
closes CNVS-22024

test plan:

verify the 'Message Students Who...' dialog
works in the react gradebook AND in the normal
gradebook

Change-Id: Iec1201cc0a95816b9b9497a53a3d0c2c1406cacc
Reviewed-on: https://gerrit.instructure.com/64376
Tested-by: Jenkins
Reviewed-by: Dylan Ross <dross@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2015-10-28 16:16:27 +00:00
Jacob Fugal da6bcd1019 include observer in ENV.current_user_roles
test-plan:
 - log into canvas as a user with an observer enrollment
 - check ENV.current_user_roles in the browser javascript console
 - should include 'observer'
 - log in as a user without an observer enrollment
 - ENV.current_user_roles should not include 'observer'

Change-Id: I80fa42153229a1e9c1debe9d5daf85bfa8c52254
Reviewed-on: https://gerrit.instructure.com/65954
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-10-28 16:15:22 +00:00
Derek Bender bfb972dd57 Remove bold hover state for grade
fixes CNVS-23895

test plan
  - use Safari browser
  - navigate to a course as a student and click grades
  - hover your mouse over the score and they shouldn't disappear

Change-Id: I7f75bbaf7f36af29163d0a31d04442871762c94e
Reviewed-on: https://gerrit.instructure.com/65546
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Tested-by: Jenkins
Product-Review: Derek Bender <djbender@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
2015-10-28 15:30:32 +00:00
Spencer Olson 2517a4775a implement notes column for react-gb
clicking on a teacher note in the react gradebook
will now open up a modal where the teacher can
edit their note.

closes CNVS-22029

test plan:

go to course settings and enable 'Gradebook
Performance'. then go to the gradebook and
select 'Show Notes' from the settings cog.
try clicking on a note cell for a student
and verify that a modal pops up and allows
you to enter in a note. clicking 'Save' should
close the modal and save the note. clicking the
'x' or 'Cancel' should close the modal without
saving the note.

edge case: try entering a really really long
note (> 255 characters). you should see an error
message that says note length cannot exceed
255 characters, and it should not let you continue
to type a note longer than 255 characters.

Change-Id: Ie04fa96255ebb5cc6dd92f8460c50c32e5cf6c9c
Reviewed-on: https://gerrit.instructure.com/64203
Tested-by: Jenkins
Reviewed-by: Dylan Ross <dross@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2015-10-28 14:39:22 +00:00
MFairbourn 5d8799802f spec: test page refresh does not change module item publish state
Test Plan
- Specs Pass
- Code Review

Change-Id: I228a35216e59697e43815f3595cbc37ae43d93b0
Reviewed-on: https://gerrit.instructure.com/65895
Tested-by: Jenkins
Reviewed-by: Derek Hansen <dhansen@instructure.com>
Product-Review: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2015-10-28 13:40:19 +00:00
Simon Williams 2661b3001f add date format tooltip back to DA date fields
fixes CNVS-22206

test plan:
- go to the assignment new page
- focus the due/lock/unlock fields
- they should have a date format tooltip

Change-Id: I7c9245320cdb4e7aebd9b9763580230c66b4429d
Reviewed-on: https://gerrit.instructure.com/65000
Tested-by: Jenkins
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2015-10-27 22:54:10 +00:00
gbeckmann 9bea92cae6 Spec: Add spec for drag-and-drop in week view
Changes:
- Create spec 138866 "should make event all day..."
- Fix spec 138864 which broke with recent calendar updates
- Remove two skipped specs that have been replaced

Test Plan:
- Run specs

Change-Id: I0eb7d8c0fa2caed155f79cff26a8aef6d5b8e01b
Reviewed-on: https://gerrit.instructure.com/65778
Tested-by: Jenkins
Reviewed-by: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2015-10-27 22:51:28 +00:00
Michael Hargiss 62957a422c spec: add quiz availability specs
Test Plan:
- pass Jenkins
- check for syntax errors
- make sure new test_ids match up to existing test cases in TestRails

Change-Id: Ibe574f61b39e39c031897a7e3ea08271e999301c
Reviewed-on: https://gerrit.instructure.com/65701
Tested-by: Jenkins
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
2015-10-27 22:48:13 +00:00
Amber Taniuchi 9317cd1ea2 spec: Add spec to verify pass-fail grading type in speedgrader/GB2
Test Plan:
- pass Jenkins
- check for syntax errors
- make sure new test_ids match up to an existing test case in TestRails

Change-Id: I8e738d044eec52ad9380441b1101f7424195c4b0
Reviewed-on: https://gerrit.instructure.com/65862
Tested-by: Jenkins
Reviewed-by: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2015-10-27 21:40:21 +00:00
Cody Cutrer d454218928 modify dj functions on the dj database
Change-Id: Ief0293a58922eed2d87a39b239ba8933cba636b8
Reviewed-on: https://gerrit.instructure.com/65887
Reviewed-by: Spencer Olson <solson@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-10-27 21:21:55 +00:00
Davis McClellan 03d7a8ceae fix filename manipulation upload problem
fixes CNVS-23728

test plan:
- Create New Assignment with File Upload Submission Type
- As a student, submit a file to the assignment
- As a teacher, Download Submissions from the assignment page
- Unzip file
- Note that file names use the following format
  lastname--firstname_CanvasUserID_CanvasFileID_filename.extension
- Rename one of the files, but change only the CanvasFileID part
- Zip file
- Re-Upload Submissions from the assignment page

Change-Id: Ia533d60b0c8a80b82e3328cc0dff08a859dd91f2
Reviewed-on: https://gerrit.instructure.com/65575
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Landon Holmstead <lholmstead@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2015-10-27 21:21:06 +00:00
Sterling Cobb adc8b4a05e add info message when grades are posted
fixes CNVS-23904

Test Plan

As a user moderating grades
And I'm viewing the moderation page
When I post grades for students
And I refresh the page
Then I should see a blue info message telling me why I can't modify
anything on the page

Change-Id: Ie669ec03e10126f8ad03ccabacc46cedca0bf1c7
Reviewed-on: https://gerrit.instructure.com/64890
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-10-27 20:27:48 +00:00
Jeremy Stanley 9aff943389 use course nicknames in notifications
test plan:
 - set up multiple users in a course
 - give some of these users different nicknames for the course
 - set up and confirm communication channels for these users
 - do things that cause notification messages to be dispatched
   to the users
 - ensure each user sees the correct course name in his/her
   notification messages

closes CNVS-24168

Change-Id: Ic49c888ae86b40ba42004e3c2dbc205e49480b79
Reviewed-on: https://gerrit.instructure.com/65544
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-10-27 20:04:25 +00:00
Simon Williams 1a2f3f85b4 remove raw script tag from eportfolios show page
fixes CNVS-24175

test plan:
- general regression test of editing and viewing an eportfolios page
  with several sections.

Change-Id: I61ccb14dad1286985df3a182b2af3add2f7353b2
Reviewed-on: https://gerrit.instructure.com/65535
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-10-27 19:33:13 +00:00
Nathan Mills 2028f03b79 add feature flag for lti2 reregistartion
refs: PLAT-1247

test plan:
the feature flag for reregistration should only show for site admins
at the root account level

the api for api/v1/#{context}s/:#{context}_id/lti_apps should have
reregistraation equal true for lti2 tools when the feature flag is enabled

Change-Id: I6a4c2f1deaa4ef8a2448dde374b93b79289ab96c
Reviewed-on: https://gerrit.instructure.com/65739
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-10-27 19:10:05 +00:00
Jeremy Stanley d32b293187 fix race condition updating course nickname
test plan:
 - go to new UI dashboard
 - click a dashcard gear menu and try the following:
     * set a course nickname
     * set a color
     * set both
   - after doing this and clicking Apply, refresh
     the page immediately after the color picker
     dialog closes, and ensure the changes you
     made "stuck"
 - also try to create a really long course nickname
   and ensure the edit box cuts you off at 59 chars

fixes CNVS-24583

Change-Id: Ia1ac8a00dfd25bbf239b3fa1d7f89fac35d27bc5
Reviewed-on: https://gerrit.instructure.com/65868
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-10-27 18:58:25 +00:00
Cody Cutrer 2622b62e8e Merge branch 'master' of git://github.com/EinsteinsWorkshop/canvas-lms
Change-Id: I268ec1c5c4437e223274e35b7e81dd42c02ee73a
Reviewed-on: https://gerrit.instructure.com/65541
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
2015-10-27 12:54:24 -06:00
James Williams aac5a4fcfd extend wiki page revision polling intevals
also stop polling if you detect a change

test plan:
* create a wiki page
* open the wiki page to edit in one browser window
* edit the page in another
* in the original window, it should still indicate that it
 changed (after 60s now)

* it should also indicate that a page changed on the
 normal view, but only after 2-1/2 minutes

closes #CNVS-24248

Change-Id: I899c3a58ab3145c6ea3d6a871f80ad59bbb6b99a
Reviewed-on: https://gerrit.instructure.com/65738
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-10-27 18:52:41 +00:00
Jeremy Stanley d76e49f08d fix publishing newly created module items
test plan:
 - create an item such as a wiki page via add-module-item
 - without reloading the modules page, click the publish cloud
   for the item
 - reload the page and confirm that the item is *really*
   published

fixes CNVS-24578

Change-Id: Iec359cf7654b9477377b4617fbfa763db8df3f29
Reviewed-on: https://gerrit.instructure.com/65891
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-10-27 18:37:24 +00:00
James Williams bed6e2350a translate brandable css variable names
test plan:
* theme editor variable names, group names and helper text
  should all be lolcalized

closes #CNVS-23768

Change-Id: I01846a0c0354342cc5593d6ac153f117ccc39b64
Reviewed-on: https://gerrit.instructure.com/65809
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-10-27 18:26:39 +00:00
James Williams 54133288c5 fix avatar pagination limit
test plan:
* the account avatars page should still work

closes #CNVS-24048

Change-Id: I120a43b6cd7da96f68c6aa0987d1418947727c80
Reviewed-on: https://gerrit.instructure.com/65806
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-10-27 17:07:01 +00:00
James Williams 630286b0ae send out notifications on assignment save + publish after create
test plan:
* have an active course with a student
* create an assignment without publishing
* edit the assignment and then click "Save + Publish"
* it should send out the "Assignment Created" notification

closes #CNVS-24238

Change-Id: Ie6e7bed5268979e13409aa2ef145fab151bb91b2
Reviewed-on: https://gerrit.instructure.com/65846
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-10-27 16:58:08 +00:00
James Williams ce2043442a cache has_subset_of_account_permissions temporarily
will alleviate problems caused by users with too many
 account_users

closes #CNVS-24195

Change-Id: I2f91e126763e3ccdb5cb77c53c00f18b89e8ad1f
Reviewed-on: https://gerrit.instructure.com/65713
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-10-27 16:35:10 +00:00
Ryan Shaw bd8554130f fix brand config previewing and skipping
the actual changes are in:
https://github.com/ryankshaw/brandable_css/compare/8cff7...master
make sure to review that too

first thing it fixes: 
better logic for knowing what to skip in brandable_css
closes: CNVS-24039

* gets rid of any manifest files on s3.
  The only manifest file that is used is the one
  on the local disk which only includes metadata
  about the "stock" (unbranded) css files which
  are generated as part of the tarball on the
  deployer's vm.
* which means we no longer use the env var:
  UNIQUE_KEY_FOR_BRANDABLE_CSS_MANIFEST

* because the filenames on s3 include:
  <css bundle name>
  <combined checksum of stock version of this file>,
  <md5 of this brand config>
  if that css file exists, we know we don't need
  to generate or upload that file again. and we
  don't need a shared manifest on s3 to figure that
  all out.

test plan:
* with a canvas_cdn.yml file configured
* run brandable_css
* run it again, it should be fast
* rm -rf public/dist/brandable_css
* run it again, it should generate all the "stock"
  (unbranded) css and skip all the brand configs
* change a value in variables.scss
* run it again, everything should be recompiled


also fixes: CNVS-24269 and CNVS-23786

to test:
* with a canvas_cdn.yml enabled and delayed jobs running
* go to theme editor for your account
* change a value to a non-default value
* press preview
* it should generate the preview correctly
  (you should not see the giant svg icons)
* "apply" it, it should still not have the unstyled
  giant svg icons



Change-Id: I992c11b392a0d6bbb045b16a78036f5ec1afed31
Reviewed-on: https://gerrit.instructure.com/65203
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2015-10-27 16:16:15 +00:00
Simon Williams 1199b87fe7 remove the need for sinon-patch.js
we included this to help handle a js action queuing multiple ajax calls,
but it works better to just use fake timers to manage that interaction.

fixes CNVS-24582

test plan:
- js tests should still pass

Change-Id: I01cd5ad37e003ddf06956caad3c69a9e58cabab0
Reviewed-on: https://gerrit.instructure.com/65845
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Tested-by: Jenkins
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2015-10-27 16:15:52 +00:00
Jeremy Stanley 68f2a5952c modules: don't show overdue icon when submission exists
test plan:
 - as a teacher:
   - create an assignment with a due date in the past
     that expects a submission
   - put it in a module
 - as a student:
   - view the modules page and notice the "past due" icon
     next to the assignment's module item
   - submit the assignment
   - return to the modules page
   - the "past due" icon should be gone

fixes CNVS-24207

Change-Id: I1ee23322920b476dc035da433849f9b6bb78b085
Reviewed-on: https://gerrit.instructure.com/65695
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-10-27 15:44:16 +00:00
John Corrigan c3e48f62e1 display inline flv media in ePubs
refs CNVS-21799

- Fetch transcoded mp4 in place of exported flvs.
- Reference mp4s in place of flvs in generated xhtml.
- Do not include in files array files that should not be uploaded to the
  ePub.
- Remove from xhtml references to files that are not included in the
  ePub.

test plan:
- Have a course with an assignment description, quiz description,
  discussion topic description, or wiki page body that contains a
  recorded video comment.
- Export course as an ePub.
- Observe that the video displays inline.

- Have a course with unsupported media (the official _supported_ list
  is: 'jpg', 'gif', 'png', 'mp4', 'm4v', 'flv', 'mp3').
- Export an ePub.
- Observe that the unsupported file is not part of the package (using
  something like Calibre's book editor).
- Observe that the reference to the media has been replaced with an
  explanation of its absence.

Change-Id: I9f5eab8fa1c86e719d69e4ae42451e795ee4b471
Reviewed-on: https://gerrit.instructure.com/64365
Reviewed-by: Matt Berns <mberns@instructure.com>
Tested-by: Jenkins
QA-Review: Landon Holmstead <lholmstead@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-10-27 15:36:06 +00:00