Commit Graph

13806 Commits

Author SHA1 Message Date
Cody Cutrer f854d37b15 allow bundler 1.7.11
Change-Id: I8eeb6555aa1ab1dfda61174ddbe7183ffa8bfa15
Reviewed-on: https://gerrit.instructure.com/46555
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-01-06 00:00:27 +00:00
Cody Cutrer 8311ebb6c0 use bundler platform specifications for ruby 2.2
Change-Id: I14f09ef4a99d7cd5799eb97115c0d6f683957ce7
Reviewed-on: https://gerrit.instructure.com/46382
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-01-06 00:00:15 +00:00
Michael Nomitch af3104a9b0 DA - remove filter from assignment_stats
fixes CNVS-17748

test plan:
  - with DA on and off
    - go to the grade summary page as a teacher
      - it should load assignment max/min/ave
    - go to it as a student
      - it should load assignment max/min/ave

Change-Id: I8996495eaf9c1427be6a3bbf3883b5c78e9ee571
Reviewed-on: https://gerrit.instructure.com/46521
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-01-05 21:34:46 +00:00
Eric Berry 44d4a9fa7f Rebuilt App Center in React
fixes PLAT-731
fixes PLAT-774
fixes PLAT-679

Test steps:
- Add, remove, navigate and show apps
- Ensure that when the App Center is disabled,
  you are only able to access the configurations

Patchset notes:
33: removed ability to destroy cache via api, removed reviews
37: rebased
37: fixed js map bug

Change-Id: I397aeab58ff50a5a930b39228571a7088e5784ce
Reviewed-on: https://gerrit.instructure.com/43818
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Product-Review: Eric Berry <ericb@instructure.com>
2015-01-05 21:34:02 +00:00
Nick Cloward 487c5074fe bump ruby-saml-mod
fixes: CNVS-17646

Encodes destination SAML xml attribute if it has more then one query
string parameter.

Test Plan:

  - Setup SAML with a logout url with query string parameters.
      http://<dev saml server>/logout?external=param&external=param
  - Make sure there is a & in the logout url.
  - Ensure you can log out successfully.

Change-Id: If159423ffc74e1fb4781d247aa108389ad3fd40c
Reviewed-on: https://gerrit.instructure.com/46297
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2015-01-05 19:37:41 +00:00
Ryan Taylor c5d28d2006 OQAAT QLA events are captured successfully
Adds a on page load submission feature for all quiz taking/showing
pages.  Also ensures that session_started events are only returned once
for a OQAAT event.

Closes CNVS-15665

Test Plan:
  Approach :
    - Take a quiz with the "?debug_js=1" flag to see that events are being
      queued.
    - Rapidly register events then submit (attempting to leave some
      events in the buffer)
    - Confirm that the pending events were actually recorded.
  Approach :
    - Generate a bunch of events by quickly scrolling the page, and
      switching to and from the window, then leave the page
      ASAP. Answering events are higher priority and probably won't be
      stuck.
    - Confirm some events are missing.
    - Visit the quiz show page, then confirm that the events are now
      known.

Change-Id: If0a95eda6fd6dd90590996dcf55fa2b680c41b21
Reviewed-on: https://gerrit.instructure.com/45733
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Reviewed-by: Ahmad Amireh <ahmad@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Ryan Taylor <rtaylor@instructure.com>
2015-01-05 18:22:44 +00:00
Michael Nomitch 794f66b5b2 a11y - focus on outcome title
fixes CNVS-13124

test plan:
  - with a screenreader on
  - go to the outcomes page
  - select an outcome (not a group)
  - after you click the outcome, you focus
    on a title in the right pane and can
    navigate down to the rest of the outcome
    information

Change-Id: Ida3061a641372c8f537898d8b5c8cfd44e42913e
Reviewed-on: https://gerrit.instructure.com/46345
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matt Berns <mberns@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2015-01-05 17:40:33 +00:00
Ryan Shaw b4668b30f9 remove a bunch of css that we don't use
closes:  CNVS-17596

this is mostly bootstrap stuff that we never actually
used. in order to make things less of a maintenance
nightmare, I just removed some things I know for sure
we are not using anywhere so we don't have to support
those files.

some of this was old stuff that we never used for
Canvas Network v 0.never-launched.

test plan:
load a bunch of pages including the styleguide,
nothing should look any different from before.

and make sure the test plan in https://gerrit.instructure.com/25100
still works.

Change-Id: Id8940715e8e55c721a889392800dc103c749a062
Reviewed-on: https://gerrit.instructure.com/46084
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2015-01-05 17:15:30 +00:00
Matthew Berns 49ef3b7a22 adding term and section dates to due date validations
fixes CNVS-16520

test plan:
- set a start and end date for the term
- attempt to set a due date for an assignment that falls before term start
- should see error "Due date cannot be after before term start date"
- attempt to set a due date for an assignment that falls after term end
- should see error "Due date cannot be after term end date"
- attempt to set an unlock date that falls before term start
- should see error "Unlock date cannot be before term start"
- attempt to set a lock date that falls after term end
- should see error "Lock date cannot be after term end"
- no errors should appear for blank date fields
- repeat above process with VDD and for quiz due dates and graded discussions
- set a course start date that falls after term start, and a course end date that
  falls before term end, and check off "Users can only participate..." box
- validations should now occur for course start/end dates rather than term dates
  and state 'course' in error message
- disable "Users can only participate..." box - validations should revert to term
- create a section and set its start date before course start and end date after
  course end, and check off 'Users can only participate...'
- validations should now occur based off section dates and state 'section' in error msg
- uncheck 'Users can only participate...' for the section
- validations should be back to course/term
- check off "Users can only participate..." boxes for both course and section
- section dates should trump course dates
- remove dates from section and course, but leave boxes checked off
- validations should occur on term

Change-Id: Ic0a4d4ef656d39b5794a6abdb5cb832b51ff8bf0
Reviewed-on: https://gerrit.instructure.com/43426
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2015-01-05 16:00:52 +00:00
Chris Hart f4a4aa6737 Canvas UI Component Style Update - Modals
Fixes: CNVS-15547

This changeset updates the old jQueryUI-powered modal
boxes to match the look and feel of the new React-
powered modals. This is just a style/visual change.
Nothing has been improved in the current modals in
terms of functionality or accessibility.

Test plan:
- Here is what the jQueryUI modal boxes look like
  currently in master/production:
  http://cl.ly/image/0z3O133q3b44/modal-current.png

- Here is what they look like after this changeset:
  http://cl.ly/image/3O0N051S2w22/modal-new.png

- Click on a few modals around Canvas to make sure
  the new styles are being applied across the board

- NOTE TO QA: Many modals don't have the gray box
  footer, like this one:

  http://cl.ly/image/3S2J2x2y450D/mini-modal.png

  This is not a result of this commit.

Change-Id: I6e12a649e155ef0462661e8101bcc8b2d5772a54
Reviewed-on: https://gerrit.instructure.com/45635
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2015-01-05 14:35:05 +00:00
James Williams a48441ee99 submissions bulk grading api
test plan:
* see the API documentation for the new action
 "Grade multiple submissions"

closes #CNVS-17674

Change-Id: I3912d78ad64108a5a819585cfdfcc35dd27448b3
Reviewed-on: https://gerrit.instructure.com/46429
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2015-01-05 13:31:44 +00:00
James Williams 64db4bf9e5 fix numerical range answer ordering on course copy
test plan:
* create a numerical quiz question that accepts a range
* should not switch the ranges on course copy

closes #CNVS-1670

Change-Id: I33fc23d809e1b2905b902ea0dcaf279262b92e35
Reviewed-on: https://gerrit.instructure.com/46471
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
2015-01-05 13:31:28 +00:00
Simon Williams 890abc9170 add documentation for grade export csv format
closes CNVS-17720
closes gh-159

test plan:
- go to /plugins -> "Grade Export", choose an account, and click enable
- you should see a description of the format and how the export works

Change-Id: I54b829d624451e5ece49c2a4e48ebe7a96dcd14f
Reviewed-on: https://gerrit.instructure.com/46451
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2015-01-03 16:08:58 +00:00
Matthew Berns 9e2dc791c2 adds lock and unlock times to student view of assignment
fixes CNVS-9310

test plan
- create 3 assignments, 1 with a lock date, one with an unlock date, and
  one with both
- view these assignments as a student, the unlock/lock times should properly be
  displayed on their respective assignments
- the assignment with both dates should display the range and range's length in
  days/months

Change-Id: I3ab80df1164d0bf1150ff6e364c5fdcaedd481cd
Reviewed-on: https://gerrit.instructure.com/46191
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2015-01-02 23:49:08 +00:00
Simon Williams 2f66e3d479 normalize account quiz question bank permissions
the page itself checked :manage_assignments, but the logic to show/hide
the tab at the account level used :manage_grades.  this commit makes
them both use :manage_assignments

fixes CNVS-17714
fixes gh-139

test plan:
- give an account admin :manage_assignments but not :manage_grades
- the question bank tab should still show up at the account level, and
  they should be able to load it and modify content.

Change-Id: I9573d4e36dd3bc676b4dd2e2a4e3d61c36f965d0
Reviewed-on: https://gerrit.instructure.com/46447
Reviewed-by: Derek Bender <dbender@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-01-02 20:58:41 +00:00
Simon Williams 650633744e set collaborations tab as active when page is accessed
fixes CNVS-17721

test plan:
- go to /plugins and enable a collaboration tool (i used etherpad with
  dummy settings for this test)
- go to a course
- if the collaborations tab doesn't show up, you might have to clear
  a cache, which can be done by going to the course settings, tab
  navigation, and hitting save
- click on the collaborations tab
- it should be highlighted as "active" in the tab list
- it should have a navigation crumb in the top bar

Change-Id: I9441ee278dd416ef2fc6ff3ac2586199fba5c1af
Reviewed-on: https://gerrit.instructure.com/46453
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-01-02 20:44:56 +00:00
Jeremy Stanley d634a48950 fix parsing for module unlock date
fixes CNVS-17615

test plan:
 1. have a module in a course
 2. edit the module and check "Lock module until a given date"
 3. enter a date in M/D/YY format such as "3/4/15"
 4. save, then re-edit
 5. the expected date should be displayed in the box
    "Mar 4, 2015 at 12am", and not
    "Apr 15, 3" or other weirdness

Change-Id: I179b1fa180db95e29bce02aaf46fb2a555840ac0
Reviewed-on: https://gerrit.instructure.com/46370
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-01-02 20:29:15 +00:00
Simon Williams 174298e8ea add sis_term_id support to term api
closes CNVS-17710

test plan:
- as an admin with permission to manage sis, make sure sis ids are
  returned in the terms api
- try creating a new term with an sis id, it should work
- try updaing and existing term with an sis id, it should work
- updating without specifying an sis_term_id should not remove the id
- updating and specifying sis_term_id: '' should remove it

Change-Id: Ia91766d6ee04b360432de1a603d89d1e6ba89c8b
Reviewed-on: https://gerrit.instructure.com/46438
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
2015-01-02 19:43:01 +00:00
Simon Williams 0ba2821e3e extract terms inline style block into file
Change-Id: I64d7e52769ff015670527dad338345ec2f4e95e0
Reviewed-on: https://gerrit.instructure.com/46410
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-01-02 19:42:56 +00:00
Colleen Palmer ae6cdd069c Take off new style flags on styleguide
fixes CNVS-17517

This takes off the flag we had on the styleguide.

Test plan:

- with the flag off look at the styleguide, now turn the flag on and
you should see exactly the same thing :)

- note: a big indicator is the background color on the side nav, it
should consistently stay the light gray color from the original one

Change-Id: I95b1f0e8d86f53043fb64e8b62cd9fc76cc63fc5
Reviewed-on: https://gerrit.instructure.com/45825
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2015-01-02 18:50:49 +00:00
August Thornton 6db68d4280 gemification of moodle2cc
fixes CNVS-14280

test plan:

  - Verify importing Moodle 1.9 and 2.x .zip/.mbz files to Canvas still works
      - course => settings => import content => content type => moodle 1.9/2.x
  - Browse to canvas-lms/gems/plugins/moodle_importer/spec_canvas/fixtures
      - .zip files should import without error

Change-Id: I5d88c0913bf0a4576557f368cf3797f320e5798e
Reviewed-on: https://gerrit.instructure.com/45994
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: August Thornton <august@instructure.com>
2015-01-02 18:34:39 +00:00
Simon Williams d425f77307 api: allow admins to create/edit/delete enrollment terms
closes CNVS-17700

test plan:
- as an account admin, try creating, editing, and deleting enrollment
  terms
- it should all work
- try it on a sub-account, it should fail
- as someone who doesn't have permission to manage the root account, try
  it on the root account
- it should fail
- do a quick regression test of the terms UI interface

Change-Id: Ibfa45c08ac661e7d905311bc2d66b335be33a5e8
Reviewed-on: https://gerrit.instructure.com/46407
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
2015-01-02 17:28:24 +00:00
Chris Hart 03cc4acfeb Color contrast - Datepicker arrows (and restyle)
Fixes: CNVS-17371

1) UI tweak to increase foreground-background
   contrast in of the arrow buttons in the jQueryUI
   datepicker.

2) Some additional restyling to make the jQueryUI
   datepicker look more like the rest of Canvas
   (approved by Blake).

Test plan:

- Enable high contrast UI in Canvas (see above)

- Make sure the arrow buttons are now dark gray on
  a white background, thus meeting contrast requirements.

- The webAIM color contrast tester can be found
  here: http://webaim.org/resources/contrastchecker/

- Use the datepicker and make sure the style changes
  aren't affecting its operation:
  - The current datepicker appearance:
    http://screencast.com/t/541zh188
  - The new datepicker appearance:
    http://cl.ly/image/2V3Y3X3I3G1D/datepicker-new.png

Change-Id: I908ab765a54509a6ba52deb869bb006c7f39ee2a
Reviewed-on: https://gerrit.instructure.com/46193
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2015-01-02 17:25:03 +00:00
Chris Hart 6cbe863c01 Courses Global Nav - first item has incorrect width
Fixes: CNVS-15522

The first course listed in Courses drop-down menu has a
width of about half the width of other course names,
truncating course title text that would otherwise be
displayed.

This was due to the View All or Customize link above
being floated right. The layout has been redone with
flexbox to avoid the floated element dropping down
and causing the truncation.

Test plan:

- The current first item in the menu looks like this:
  http://cl.ly/image/3l3N3E24413q/nav-bug.png

- Now it should look like this in all supported browsers:
  http://cl.ly/image/2q0q0c0P2F01/nav-fixed.png

Change-Id: I339f0a97fe410760ee9af9adb1e44fa7253392de
Reviewed-on: https://gerrit.instructure.com/46391
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2015-01-02 17:24:53 +00:00
Chris Hart abe4f47310 Canvas UI Component Update - Admin links
Fixes: CNVS-16707

Changes the cog menu styles to match the look/feel
detailed in Blake's brand styleguide. Adds subtle
animations for all supported browsers.

Also did a little work in Discussions and Pages to
make the color of the admin links cog link more
consistent.

Current dropdown example:
http://cl.ly/image/000j260h1g3M/dropdown-old.png

New dropdown example:
http://cl.ly/image/3a2D3A0p1w2W/dropdown-new.png

Test plan:

- Go to the /styleguide and click on Cogs
  (Admin Dropdowns).
- Test out the examples.
- Click around the entire app where Admin Link
  menus are used (Pages, Assignments, Discussions,
  Settings, etc., to make sure everything is still
  working).

Change-Id: Ic875850beae4599020de95bbefb8e4c963e7c599
Reviewed-on: https://gerrit.instructure.com/43759
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2015-01-02 16:01:17 +00:00
Derek DeVries 65cd872f8e fix issue with event created at time not being set to utc time
fixes CNVS-17723

test plan:
  - as a teacher
    - create a OQAAT quiz with a few questions
    - publish the quiz

  - as a student
    - take the quiz
    - you should not get errors when answering questions

Change-Id: I5811e775112bd030d1ea3703985c7f3b194d4901
Reviewed-on: https://gerrit.instructure.com/46458
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
Tested-by: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Ahmad Amireh <ahmad@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
QA-Review: Ahmad Amireh <ahmad@instructure.com>
Tested-by: Ahmad Amireh <ahmad@instructure.com>
2015-01-01 04:34:55 +00:00
Brayden Lopez 4f60727014 Limiting number box to be minimum size of groups.
Fixes CNVS-17503

test plan:
- Go to canvas groups page
- Go to edit a specific group by clicking on group settings
- Make sure the number input can be incremented/decremented via keyboard.
- Make sure the number input can be incremented/decremented via on screen up/down buttons on the input.
- Make sure the number input doesn’t go lower than 2
- Make sure you can manually enter in a number that is empty or more than 2.

Change-Id: I42820b83b73bbb376889082f92d6718e27f42bc9
Reviewed-on: https://gerrit.instructure.com/46392
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-12-31 20:39:27 +00:00
Jeremy Stanley df8ee903d5 preserve published status of module items
test plan:
 - published status of module items (including external tool,
   external URL, text header) should be preserved across course copy
   (published items should stay published; unpublished items should
    stay unpublished)

fixes CNVS-17690

Change-Id: I18e2c1320084920baab02f84d4b49a6ebc287e9d
Reviewed-on: https://gerrit.instructure.com/46395
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-12-31 17:57:40 +00:00
Sean Lewis 90b2c91a8f spec: remove comment about CNVS-11195
tests were written to catch this in the future by cameron

Change-Id: I80e1c5d9c141232b5a976ade3def76d83bc96a15
Reviewed-on: https://gerrit.instructure.com/46426
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek Hansen <dhansen@instructure.com>
Reviewed-by: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2014-12-31 17:55:12 +00:00
Jon Jensen 3d763694b4 fix incorrect rebase resolution, refs CNVS-17663
this was inadvertently reverted; it should be .text, not .html

test plan:
1. date ranges should look correct in the calendar nav

Change-Id: I34eaf549527a10b4f3a285b59dbbdb925999c00a
Reviewed-on: https://gerrit.instructure.com/46422
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2014-12-31 17:41:15 +00:00
Clay Diffrient b98c177fb1 Makes hashes work properly in new files folder names
fixes CNVS-17694

Test Plan:
	- Enable New Files
	- Add a folder with a hash in the name (e.g. Chapter )
	- You should not get a 404 error when navigating to that folder.

Change-Id: I4f5f9e0e4388d4280e972b1ba1fcc47b6231a609
Reviewed-on: https://gerrit.instructure.com/46405
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2014-12-31 17:14:03 +00:00
Ben Young e204f53aca Use a symbolized 'student_id' in extra_params in child_topic
Fixes CNVS-17648

Test plan:
- Create a group set in a course, and add a student to a group in this set.
- Create a graded group dicsussion, using the group set adove.
- As the student, submit a post to this discussion.
- As a teacher, view the submission in speedgrader for this post.
- Attempt to use the 'view the full group discussion link'. The discussion should
load normally in the iframe

Change-Id: I8cbd560cd3085d960e0b28b9b4bb8db061b69114
Reviewed-on: https://gerrit.instructure.com/46241
Reviewed-by: Mark Severson <markse@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-12-31 17:00:19 +00:00
James Williams 73420c8fa6 add option to filter sis imports api index by date
test plan:
* should be able to supply a "created_since" argument
 for the SIS Imports API index (see the documentation)
 and only retrieve imports created past a certain date

closes #CNVS-17669

Change-Id: I31bb5a8cff9f1dff983f0f7ad9efdda7cec00bd8
Reviewed-on: https://gerrit.instructure.com/46310
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Tyler Pickett <tpickett+gerrit@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Tyler Pickett <tpickett+gerrit@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-12-31 16:57:05 +00:00
Brayden Lopez 8ab9af5900 Fix for firefox not clamping numeric values.
Firefox does not clamp values (between min and max) on inputs of type number.
Fixes CNVS-15205
test plan:
- Ensure the bug actually exists by testing it here: http://jsfiddle.net/6s4pyp0g/
- Go to canvas groups page
- Click on group cog (It will bring up “Edit Group Set” dialog)
- Check “Allow Self Sign-up”
- Make sure the “Limit groups to <number input> members” only has a minimum number of 2.
- Make sure the number input can be incremented/decremented via keyboard.
- Make sure the number input can be incremented/decremented via on screen up/down buttons on the input.
- Make sure the number input doesn’t go lower than 2
- Make sure you can manually enter in a number that is empty or more than 2.
Change-Id: Ie06c4694550ce533ab5ac058e3ca792defb77d91
Reviewed-on: https://gerrit.instructure.com/45649
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-12-31 16:42:29 +00:00
Jeremy Stanley bbeb63a27a remove non-draft-state module view
this was inadvertently re-added in g/45563

Change-Id: I8a99a62256df141513e9c2e591b3ec22dca3633e
Reviewed-on: https://gerrit.instructure.com/46368
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jeremy Stanley <jeremy@instructure.com>
2014-12-31 15:23:34 +00:00
James Williams beb5d633ae fix ChangeEnrollmentsRoleIdNull again
test plan:
* should be able to run migrations with duplicate
ObserverEnrollments as well

Change-Id: I15d811a31081177fc2c4c7b9b356858ab79db307
Reviewed-on: https://gerrit.instructure.com/46390
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-12-31 15:07:23 +00:00
Clay Diffrient ff85824941 Makes file preview work for user files
fixes CNVS-17683

Test Plan:
	- Enable New Files
	- Go to the user's files (/files)
	- Navigate to a course's files within the user's files
	- Preview a file, it should preview without a problem
	- Go to one of the users personal files
	- It should also preview just fine.

Change-Id: I7e688f25bef06a5dc8e5f66ff2ee6535d7b50ba6
Reviewed-on: https://gerrit.instructure.com/46361
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-12-30 23:56:25 +00:00
Clay Diffrient 1d2094e35d Hides groups from courses that are unpublished
closes CNVS-17635
closes gh-97

Test Plan:
- Create a course that is unpublished
- Add a student to the class
- Add the student to a group
- Login as the student
- Go to the courses index page (/courses)
- The group should not be shown
- Publish the course
- The group should now be shown with a link to it

Change-Id: I3588cbd323cd065a33898c91021f475507101dee
Reviewed-on: https://gerrit.instructure.com/46266
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2014-12-30 23:13:37 +00:00
Tyler Pickett 833d1e82ef Stop forcing existing assignments to post_to_sis
The original way this was implemented caused existing assignments show
that post_to_sis was true when the value hadn't ever actually been set.
This caused the feature to appear as on despite the fact that it was
not, this discrepancy caused some confusion as to what the actual state
of the feature was on existing courses.

Test Plan:
- With the Post Grades to SIS feature turned on and fully configured
- Edit an assignment created before the feature was enabled OR set an
  existing assignment's post_to_sis field to nil via the console
- The Post to SIS check box on the edit page should not be set
- Create a new assignment, the Post to SIS check box should default to
  being checked
- Uncheck the Post to SIS box and save the assignment
- Edit the same assignment again
- The Post to SIS check box should remain unchecked

Change-Id: I96783da06eab98b25e8c06ba4e09c517d2ca39ec
Fixes: SIS-744
Reviewed-on: https://gerrit.instructure.com/46374
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Tyler Pickett <tpickett+gerrit@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
2014-12-30 22:54:36 +00:00
Derek Hansen 01cec0c6ac A11y: Calendar headings which expand/collapse content are again accessible.
This is the other half of the fix for
efdb39da2b

Fixes CNVS-16979

Test plan:
- Visit the agenda view of the calendar with a screen reader.
- Confirm that all headings that are expandable/collapsable have a control
  that can be used by screen reader users, and that it is clear that the
  control can be interacted with.
- This should also be tested in the calendar navigator section.
- Verify that keyboard only users are also able to expand and collapse these
  sections.

Change-Id: Id809c32bdbc8ba7c702083699d28b4d8520a607d
Reviewed-on: https://gerrit.instructure.com/45482
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2014-12-30 21:54:23 +00:00
Michael Nomitch 185a068c3c close dates dialog on invalid save
fixes CNVS-17649

test plan:
  - with DA on
    - edit an assignment and remove the title
    - only assign it to one section and hit save
    - when you hit save the DA dialog opens
    - when you hit save on that, it closes and displays
      the no name error
  - with DA off
    - edit an assignment and remove the title
    - only give a date to one section and hit save
    - when you hit save the dates dialog opens
    - when you hit save on that, it closes and displays
      the no name error

Change-Id: I9e8f5900374f1c80428dba1dc6fafee22c6829b6
Reviewed-on: https://gerrit.instructure.com/46366
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-12-30 18:37:56 +00:00
Andrew Butterfield 65f7df7173 Group set drop-down is labeled
fixes CNVS-13939

Test plan:
* As a teacher, use NVDA and FF
* Go to Discussions
* When adding a new discussion, mark the checkbox to make it a group
  discussion
* Navigate to the combo box that appears which enumerates the various
  group sets available to pick from
* Ensure that the screen reader reads out that the combo box is for
  group sets

Change-Id: Ie0aa7e70251cb4bd396c52107ce542fb84cd0a8e
Reviewed-on: https://gerrit.instructure.com/45786
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2014-12-30 17:20:25 +00:00
Matt Zabriskie dbebb795ea Fixing issue with UI and state being out of sync with checkboxes
fixes: CNVS-15785

test plan:
  - Go to New Files
  - Place cursor in "Search for files" input (this is for convenience)
  - Use `tab` key until the checkbox shows up for the first file in the list (about 11 key presses)
  - Checkbox should activate by either clicking with mouse, or pressing `spacebar`
  - Checkbox should be checked

Change-Id: Ib5e68f78b0813ff54954ad3d7109a076e27e1c37
Reviewed-on: https://gerrit.instructure.com/46256
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2014-12-30 17:16:22 +00:00
Derek Hansen ccc108e7a8 Split apart spec/selenium/calendar2_spec.rb
Fixes CNVS-16488

Test Plan:
* Make sure jenkins passes

Change-Id: I5be6bea11991955ed1b493e4a202596f542c5352
Reviewed-on: https://gerrit.instructure.com/46279
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2014-12-30 16:37:31 +00:00
Derek Hansen d61372d717 spec has 3 sections that should be split to better match testrails structure.
fixes: CNVS-17672

Test Plan:
* Jenkins should pass specs

Change-Id: If01a5abb4c4b8658aeb796d338860ffafbe9150c
Reviewed-on: https://gerrit.instructure.com/46314
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2014-12-30 16:36:05 +00:00
Cody Cutrer eb7d0afd1c allow bundler 1.7.10
so we can have platform: :mri_22 in the Gemfile

Change-Id: I9be28f3de61d1c7905c6574c7f402f2c7b20d47b
Reviewed-on: https://gerrit.instructure.com/46381
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-12-30 15:49:44 +00:00
Bracken Mosbacker ee5bc21650 update rubric criteria api docs
Some properties were missing

Test Plan:
 * RubricCriteria object description should have outcome_id/vendor_guid/long_description

closes PLAT-811

Change-Id: I5a5d264c49a4d7ad6406e2574b5c3e6c69683ee9
Reviewed-on: https://gerrit.instructure.com/46196
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-12-30 15:37:49 +00:00
James Williams c0f14cec93 fix account notification roles for cross-shard users
test plan:
* account notifications should not break the dashboard
 for users located on other shards

closes #CNVS-17639

Change-Id: Ie350c4832f7a5a4c9e88a83674f41a41a1c04874
Reviewed-on: https://gerrit.instructure.com/46346
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-12-30 13:58:36 +00:00
Cody Cutrer 30ef04deee don't allow ruby 2.2 with rails 3
Change-Id: I0544ad72d48ace97a1c9ba85f34ee4a961d4460d
Reviewed-on: https://gerrit.instructure.com/46325
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-12-30 04:26:31 +00:00
Cody Cutrer 0d71b6b8ea remove duplicate key
thanks ruby 2.2!

Change-Id: I2f6071a355443b9f0c7b733b20498df9a4e428a2
Reviewed-on: https://gerrit.instructure.com/46324
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-12-30 04:26:16 +00:00