Commit Graph

8095 Commits

Author SHA1 Message Date
Transifreq 33801520c8 Updated zh translation 2013-09-25 02:04:28 -06:00
Shawn Meredith ee54a3c71c spec: sel\ff upgrade spec fixes
Change-Id: If43f47cc5f44e2e163ea4b479d252ecbf6aa9493
Reviewed-on: https://gerrit.instructure.com/24393
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-25 01:57:36 +00:00
Liz Abinante a37211bc80 moves drag and drop icons to the left for groups and items
fixes CNVS-8274

test plan
- check that assignments index and quiz index collapsable groups are aligned properly

Change-Id: Icc7640775e74e2e880f5e8e19b0c3926ca93090f
Reviewed-on: https://gerrit.instructure.com/24562
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Liz Abinante <labinante@instructure.com>
2013-09-24 20:22:25 +00:00
Liz Abinante aa0ba1189a replace loading arrow with message if no assignments
fixes CNVS-8002

test plan:
- as a teacher, make a new course
- publish the course
- go to assignments page
- verify that arrow is replaced
- verify message: "No Assignment Groups found"
- verify that spinning arrow still shows initially

Change-Id: I02a1ed68b386dff718eb2ddf9fd464aed972dee0
Reviewed-on: https://gerrit.instructure.com/24431
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Irish <mirish@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: David Scoville <davids@instructure.com>
2013-09-24 20:20:40 +00:00
James Williams 9d4660b641 fix respondus question bank and quiz importing
test plan:
* publishing through respondus should work for question banks
and for quizzes when settings are applied

fixes #CNVS-8276 #CNVS-4297

Change-Id: I3b254c6375aa5524f6ecf78c31e64d34a13ba4a7
Reviewed-on: https://gerrit.instructure.com/24566
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
2013-09-24 19:39:51 +00:00
Ahmad Amireh 2141e0482e [WebAIM] @title attributes for icons in quiz views
Some <a> tags included icons (marked by <i> tags with a @class of
"icon-" something) and had either a descriptive @title or @text set
but the icon elements did not and that was affecting the accessibility
of these icons. So, all icons that are parented by an anchor with a
description now have a @title that mimics that description accordingly.

Specs had to be adjusted to properly locate accessible anchors since
their text() value now returns "duplicated" values, once for the anchor
itself, and once for any embedded span.screenreader-only elements.

I've added/modified a few helpers to quizzes_common.rb to accommodate
these changes.

closes CNVS-6546

Note 1: there are a few cases that were not handled as I didn't know
what to actually do with them, more on that in the related JIRA issue.

Note 2: the number of affected files is large because the ticket
requested that not only the reported items be fixed, but any other
related items as well.

Change-Id: Ie34048d7d68b41b74461696b76751340e000344f
Reviewed-on: https://gerrit.instructure.com/24493
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2013-09-24 17:16:48 +00:00
James Williams c06b1a1287 accessibility fix for modal dialogs
test plan:
* with a screenreader program, 'click' a button to open
any modal dialog
* should read the content that appears immediately

fixes #CNVS-7429

Change-Id: Ie9f5d0aed96dd91a6c02a8f4ab44fd27b05face2
Reviewed-on: https://gerrit.instructure.com/24502
QA-Review: Hannah Bottalla <hannah@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-24 17:13:27 +00:00
Stanley Stuart 76803e670b fix file upload questions for IE 9 & 10
Also fixes an issue in Backbone.syncWithMultipart where an error would
be thrown if iframe.contentWindow was null/undefined.

test plan:
  - as a student, take a quiz with a file upload question type in IE9,
    IE10, Firefox, Safari, and Chrome.
  - You should be able to upload files, remove files, and upload files
    again in all of these browsers.
  - Refreshing the page while taking the quiz should have your uploaded
    file displayed to you in the UI.
  - As a teacher, make sure you can access the file once the student is
    done taking the quiz.

fixes CNVS-7480

Change-Id: I9b62c9c0590624172a058df6512b7f1c661bd801
Reviewed-on: https://gerrit.instructure.com/24605
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2013-09-24 16:45:14 +00:00
Jon Jensen 5a805e8065 make Filterable search case-insensitively
Change-Id: I2bcf2f54ff6d0413e2f7987fc29ed25ec118e7b9
Reviewed-on: https://gerrit.instructure.com/24629
Reviewed-by: Mark Ericksen <marke@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-09-24 15:22:52 +00:00
Zach Pendleton 1251493f2f fix layout bug for long conversation participants
when a conversation has two participants with long
usernames, they overflow the message date.

test plan:
  * create two users with long usernames;
  * send a message to those two users in the new
    conversations UI;
  * verify that the message displays in your sent pane's
    left pane and doesn't have a wonky layout;

Change-Id: Icf8e1ba1c6718d61c92fa7df31b2ede381b8fb7d
Reviewed-on: https://gerrit.instructure.com/24636
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-09-24 03:04:42 +00:00
Zach Pendleton d231a48e2c fix messaging to all teachers/students in course
test plan:
  * from the new conversations ui, attempt to send a
    message to all teachers or all students in a course;
  * verify that the message sends.

Change-Id: I64d782b10fc932e24bf4df223c93dfd3117e6c32
Reviewed-on: https://gerrit.instructure.com/24637
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-24 02:57:38 +00:00
Zach Pendleton 59f55aec30 allow bulk messaging in new conversations
fixes CNVS-8045

test plan:
  * as a teacher with new conversations, navigate to new
    conversations and click the compose button;
  * verify that the "Bulk message" checkbox appears
    below the subject line;
  * attempt to send two messages to an entire class: one
    with the bcc checkbox selected, and another with it
    unchecked;
  * as a student in the class using old conversations,
    navigate to conversations and verify that you have two
    messages: one group conversation with the entire class,
    and one group conversation between you and the
    instructor.

Change-Id: Ic3bab8ce406c565a50ca50ad19d74b949f1caad1
Reviewed-on: https://gerrit.instructure.com/24515
Reviewed-by: Braden Anderson <banderson@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-24 00:29:53 +00:00
Simon Williams ad4371b7b7 don't validate frozen assignment fields
fixes an issues where, since the assignment title label was disabled, the data
wasn't being collected for save (correct), and so the validations mistook that
as the field being empty (incorrect).

fixes CNVS-8245

test plan:
- set up a frozen assignment
  * enable assignment freezer
  * edit assignment to be frozen
  * copy course
  * view copied assignment as a teacher (not admin)
- you should be able to edit the due date

Change-Id: I4f29107b47999d602193454ec9b2754efd408b8b
Reviewed-on: https://gerrit.instructure.com/24550
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Liz Abinante <labinante@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2013-09-24 00:10:49 +00:00
Mark Severson 888744cf37 fix editing a wiki page to only prompt to save true changes
test plan:
 - with draft state enabled
 * edit a wiki page already containing elements such as:
   - <br>
   - <hr>
   - consecutive  spaces
 * if no changes have been made, you should not be prompted
   to save changes
 * once changes have been made (to the body or title), you
   should be prompted when attempting to navigate away from
   the page in any way

fixes CNVS-8146

Change-Id: Iab650bfe7caab757b6f7d9111061973aed4c18a3
Reviewed-on: https://gerrit.instructure.com/24549
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-23 22:53:01 +00:00
Braden Anderson ca67e9355a admin-links: open menu on enter or space
fixes CNVS-8154

test plan:
  * open a page with a cog menu, such as assesments
    or discussions (JAWS testing is important)
  * bring your focus to the cog menu
  * press enter or space
  * verify that the menu opens
  * close the menu and repeat
  * verify that the menu still opens
  * open a discussion topic page in Chrome or Safari
  * focus the topic settings gear button
  * verify that the focus outline wraps the button neatly

I'm happy with my change to admin-links here--I like having it just pass
through the event instead of having special-case magic. I'd appreciate
feedback on my jquery UI popup changes, though.

Change-Id: I72dcb150e467748c59428fe2bdd4c8c2ddf22823
Reviewed-on: https://gerrit.instructure.com/24499
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
2013-09-23 22:32:08 +00:00
Cody Cutrer bc3d59d3c7 Merge pull request #353 from sfu/fix-alerts
Fix permissions check for interaction alerts
2013-09-23 15:07:00 -07:00
Ahmad Amireh 1acb7f7d94 [WebAIM] quiz answer indicators not read by SR
Quiz answers should be read by the screen reader when their
corresponding element receives focus.

closes CNVS-6634

Test plan:

  - As a Teacher, create a quiz with questions of (preferably) all types
  - Make sure the quiz has one "Fill in the blanks" question as it
    represents an edge case
  - Publish the quiz
  - As a Student, take the quiz, and get some answers right!
  - Using JAWS or a SR, advance to the radio buttons or text fields
  - Confirm that the SR speaks "Correct", "You Answered" appropriately

Notes:

When viewing the quiz attempt, the display of answers of some question types
are not consistent (namely, FITB and Numerical questions) in that the
correct answer is set inside a text field (<input />) while the other
answers (or the student-supplied one) are set in nodes of different
types (<div />). This causes these other answers _not_ to receive focus
by the screen reader.

However, this is not related to this issue (only that it affects it.)

Change-Id: I12c38d22768fdc759b5a3719e91c03d78b8fca90
Reviewed-on: https://gerrit.instructure.com/24300
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2013-09-23 21:56:47 +00:00
Patrick Cox b8a9975044 added quiz regrade tour
added tour popover to quiz edit/questions for teachers
when they edit quiz question on regrade

test plan:
edit a question of a quiz that students have already taken,
change the answer to reveal regrade options and verify popover
exists. Verify that its Ok, got it button works.

Change-Id: I13446746d90e05fb6da3a8632a045871c067e92b
Reviewed-on: https://gerrit.instructure.com/23680
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-09-23 21:56:33 +00:00
Brian Palmer 7c8466bb05 properly handle exceptions in reserve_capacity
Passing a nil cost to increment was raising an error, masking the
original error that the block raised in the first place

Change-Id: I7970ed7d454d8b04309087daf557f969e5adb057
Reviewed-on: https://gerrit.instructure.com/24610
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-09-23 19:53:53 +00:00
Brian Palmer 5cd9b153d4 include canvas revision in health_check json response
test plan:

curl -H 'Accept: application/json' http://<domain>/health_check

If you have a VERSION file in your canvas dir it'll report that
version, otherwise "Unknown"

Change-Id: I43c72140541ea441d4ec96a4c179d8db775843b7
Reviewed-on: https://gerrit.instructure.com/24595
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-09-23 19:53:08 +00:00
Jacob Fugal 0f8b2775ab don't delete s3 objects on attachment destruction
refs CNVS-8056

we don't want to actually delete objects from s3 (at least not due to
the Attachment being destroyed). With our root attachment deduplication
scheme it just gets too messy and buggy.  We'll just GC them later.

test-plan:
 - be using s3
 - upload a file, call this a1
 - upload the same file again, call this a2. a2 should have a1 as its
   root attachment
 - in script/console, call a2.destroy!. a2 should be removed completely
   from the database
 - a1 should still work (its s3object should not be gone)

Change-Id: Ie1f488e28b44c983a0d8528d61ce8ae99b8c6736
Reviewed-on: https://gerrit.instructure.com/24280
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2013-09-23 19:47:13 +00:00
Jacob Fugal 2f40b2ab93 don't dedup against broken attachments
refs CNVS-8056

when uploading a new attachment that matches the md5 of an existing
attachment, but that existing attachment's s3object is missing, promote
the new attachment to root attachment instead of throwing away the new
copy of the s3object that was missing.

test-plan:
 - be using s3
 - upload a file once, call this a1.
 - upload the same file again, call this a2.
 - in script/console, execute `a1.s3object.delete`. a1 and a2 should now
   both be broken.
 - upload the same file a third time, call this a3.
 - all of a1, a2, and a3 should now work.

Change-Id: I163b8093d2a9e9f69e3428ba10d1fbb58e437957
Reviewed-on: https://gerrit.instructure.com/24278
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2013-09-23 19:47:00 +00:00
Cody Cutrer 803ca91821 includes create bad queries. don't use them for content lists
Change-Id: I4afafae06d4a799aaa626f40f37f49dae4af7c13
Reviewed-on: https://gerrit.instructure.com/24609
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-23 18:15:03 +00:00
Jon Jensen c4914183bc don't fire jstcss guard on sass errors
test plan:
1. put some invalid sass in a jst stylesheet
2. you should see the error in the guard output, but guard shouldn't die

Change-Id: Idd07ba3c64f89d35e79e3f6a886a28a26f8e8a1c
Reviewed-on: https://gerrit.instructure.com/24557
Reviewed-by: Mark Ericksen <marke@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2013-09-23 16:57:10 +00:00
Cody Cutrer 2e3cc7fa67 be nicer in add_foreign_key_if_not_exists to retry partially created FKs
Change-Id: I4feb4871456a0307e87fb9ac5eff623997c23102
Reviewed-on: https://gerrit.instructure.com/24535
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-23 16:49:17 +00:00
Brian Palmer 3fbb9a6574 fix typo in module definition
Change-Id: I9d1eef6b423f81c4ce1e471e95d3cb5c1f0fa6ae
Reviewed-on: https://gerrit.instructure.com/24574
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-09-23 15:57:26 +00:00
Zach Pendleton 4070cd57b7 remove site admin restriction on new conversations
fixes CNVS-8293

test plan:
  * navigate to conversations' old interface as a user
    who is not a site admin;
  * verify that the help menu is now a dropdown that allows
    you to select new conversations.

Change-Id: I9a7cea07e9010423ac9f717d4732619d6866f719
Reviewed-on: https://gerrit.instructure.com/24570
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-09-23 14:32:15 +00:00
Brandon Broschinsky e7513df263 enable saml login when multiple non-saml authorization configs
**TEST PLAN**
Create a non saml authorization config
via rails console create a saml authorization config
saml authentiation should work when calling saml_consume endpoint

fixes PS-649

Change-Id: I95c3203056c614c241383d6f11a997def6547a76
Reviewed-on: https://gerrit.instructure.com/24452
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-09-23 14:00:50 +00:00
Mark Severson f3de574f9d add locked page indicator
test plan:
 - with draft state enabled
 * navigate to a locked page (e.g. locked by module)
   - locked by module progression
   - locked by date
 * the page should show an informative locked page message

fixes CNVS-7514

Change-Id: I5c5095ad548ed313cef7ff3655388efda963a095
Reviewed-on: https://gerrit.instructure.com/24510
Reviewed-by: Sterling Cobb <sterling@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Mark Severson <markse@instructure.com>
2013-09-20 22:24:56 +00:00
Mark Severson 409c8bbddd fix module sequence footer tooltips to not have html
test plan:
 - using a screen reader (e.g. VoiceOver)
 - with draft state enabled
 - navigate to a wiki page in a module
 * confirm that the help text of Next and Previous buttons
   is plain text only (no html)

fixes CNVS-8155

Change-Id: Ia874af1350aea1a5a70b24aba2c38bdaeb4c9941
Reviewed-on: https://gerrit.instructure.com/24387
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Reviewed-by: Sterling Cobb <sterling@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-09-20 22:19:56 +00:00
Joel Hough 51a751c720 canvas side support for embedded chat
test plan
- test the embedded chat commit

Change-Id: I8fc75efdeb35415749623770a49640708f5eaa4b
Reviewed-on: https://gerrit.instructure.com/24277
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2013-09-20 22:14:47 +00:00
Braden Anderson 04f8234416 required field accessibility
fixes CNVS-6444

test plan:
  * visit your settings page with a screenreader
  * select "Add Contact Method" from the right pane
  * focus the "Cell Number" field
  * verify that you hear the 10-digit format hint
      (this takes a long time in Safari)
  * verify that SMS Email is described as required
  * try to submit the form with no SMS Email
  * verify that you get an error message

My change which marks required fields in the interface is global.
Quick testing of other validated forms would be useful.

Change-Id: I06f56057b03227db31d0957fbff86467b83c57a1
Reviewed-on: https://gerrit.instructure.com/24414
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
2013-09-20 21:57:44 +00:00
Braden Anderson ac0e511b41 conversations: allow admins to send context-free conversations
fixes CNVS-8184

test plan:
  * open new conversations as an admin
  * open compose message dialog
  * verify that you can choose recipients without choosing
      a course as the context of the conversation
  * verify that you can send the message successfully
  * open new conversations as a non-admin
  * verify that you must select a context
  * as an admin with conversations beta enabled,
      open a user's profile page
  * click the "Message" button in the right pane
  * wait for the page to fully load
  * verify that the user is present in the recipient list

Change-Id: I213b863348b113a3bd3c06b5be415ecd13db2e62
Reviewed-on: https://gerrit.instructure.com/24436
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
2013-09-20 21:08:02 +00:00
Cameron Sutter e757426a65 drag/drop maintain state of expand/collapse
fixes CNVS-7962

test plan
 - collapse an assignment group on the new assignment index page
 - drag that group and drop it
 - it should remain collapsed
 - the arrow should be pointing to the right

Change-Id: I584147de1034c64784d1587ee4ba9998d511e6b7
Reviewed-on: https://gerrit.instructure.com/24225
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-20 20:34:29 +00:00
Cody Cutrer 032d0b262e add global js and css to mobile auth pages
fixes CNVS-8175

test plan:
 * configure global css and js for an account
 * go to /login?mobile=1
 * check the source, and make sure they both got pulled in

Change-Id: I058f3cec5cbfefa393803d16309b32551c4a7ab9
Reviewed-on: https://gerrit.instructure.com/24405
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-09-20 19:57:29 +00:00
Simon Williams 8ae0e614fa send assignment times in iso8601 utc
when setting up a time in the assignment index page and then clicking 'more
options', the time is routed through the url params to the edit page.
it was using a format like "Fri Sep 20 2013 13:00:00 GMT-0600 (MDT)" which
Time.zone.parse does not parse correctly.

fixes CNVS-8063

test plan:
- in an environment with the server system TZ != local system TZ, use the
  assignment index page more options link (with draft state enabled)
- it should not shift your time
- also try changing your user preference timezone. multiple edits from either
  the index or edit page (or going through more options) should not cause time
  "drift"

Change-Id: Icaa6912463cdc0edd30518842d0298f14fa62c72
Reviewed-on: https://gerrit.instructure.com/24464
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2013-09-20 19:40:57 +00:00
Cody Cutrer 082e0c647c add foreign keys part 7
refs CNVS-6202

Change-Id: I0120c2490ebe5b882a5e5b1174958ed3eb9dce81
Reviewed-on: https://gerrit.instructure.com/11536
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-20 19:34:36 +00:00
Cody Cutrer 805ba8cba6 fix problem with sanitizing nested hash conditions
Change-Id: Icca6c874390dfe8975a7d3871789a3d33d24476e
Reviewed-on: https://gerrit.instructure.com/24494
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-20 19:34:13 +00:00
Cody Cutrer fc3291652c do some data fixups before applying constraints
refs CNVS-6202, CNVS-7414

Change-Id: I59859896b15f879d25c19a6c4626be5851cc0604
Reviewed-on: https://gerrit.instructure.com/24527
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-20 19:32:36 +00:00
Cameron Sutter 0186ae5847 search box on assignments index page
fixes CNVS-7191

test plan:
 - type a search term into the search box
 - assignment groups without a matching assignment should disappear
 - assignments that do not match should disappear
 - assignment groups that were collapsed should
     expand if there are matching assignments and then
     collapse when the search box is empty

Change-Id: Ibecfd35bc74403dd97bee928eb3be427f6cc554a
Reviewed-on: https://gerrit.instructure.com/24120
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Sutter <csutter@instructure.com>
2013-09-20 19:14:17 +00:00
Joel Hough edd4625b63 fix typo in DiscussionTopic::user_can_see_posts?
fixes CNVS-5460

test plan
- create a graded group discussion that requires posting before
 seeing replies
- make some replies to the group discussion
- as a student in the group who has not made any replies, ensure
 that no replies are visible
- as the student, make a reply
- ensure that the replies are now visibile

Change-Id: Ic3e87af0022267bd1b632c5258b92be001e3909d
Reviewed-on: https://gerrit.instructure.com/24542
Reviewed-by: Braden Anderson <banderson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-09-20 18:48:37 +00:00
Shawn Meredith 7a019889fa gemfile fixed to handle ruby2.0 for test
Change-Id: I4ebbaec7107859a882d8f64e1b4c4521c5b4e6ef
Reviewed-on: https://gerrit.instructure.com/24551
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2013-09-20 17:53:53 +00:00
Liz Abinante 51dcfd8410 remove empty space after hiding speedgrader w/unpublish
fixes CNVS-7931

test plan:
 - as a teacher:
 - go to the assignments show page for a published assignment
 - verify that SpeedGrader link is in the right place
 - click unpublish
 - verify that the SG link has moved and there is no empty space
 - click publish and verify that the SG link comes back in the right spot
 - go to show page for unpublished assignment
 - verify no SG link or empty box appears

Change-Id: I0f55049cafb49cc1a88acda0a47f73b5ee649f49
Reviewed-on: https://gerrit.instructure.com/24538
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Liz Abinante <labinante@instructure.com>
2013-09-20 17:45:57 +00:00
Nathan Mills 2494329163 add collapsible item groups to styleguide
refs PS-574

test plan

*verify styles work across supported browsers

Change-Id: I14d822efa103b1ecde377a6a6df54c8303d2e8a7
Reviewed-on: https://gerrit.instructure.com/24315
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-09-20 17:40:01 +00:00
Cody Cutrer 83e582c284 use better indexes on external feed entries
* asset_id and asset_type aren't used for queries
 * we often look up by both uuid and url, so add an index on url, and
   split the index on (external_feed_id, uuid) into two

Change-Id: I654e7521d3246fc86a74babf8f190c86a7b6c005
Reviewed-on: https://gerrit.instructure.com/24403
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-20 17:35:06 +00:00
Brian Palmer 9250807988 ensure redis gems are loaded before calling LeakyBucket.lua
Change-Id: Ib9696b6a9ec8bfbd75c9fa49741cf42810f27561
Reviewed-on: https://gerrit.instructure.com/24559
Product-Review: Dave Jungst <dave@instructure.com>
QA-Review: Dave Jungst <dave@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-20 17:23:11 +00:00
Cody Cutrer 2c9cefe6a5 update API documentation on usage of SIS IDs
refs CNVS-7814

Change-Id: I492b6b0f3bce2f328a85c642394b5aa2fe1ad0f8
Reviewed-on: https://gerrit.instructure.com/24519
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-20 16:56:11 +00:00
Zach Pendleton f0f39ec2cb add reply/reply all options to old conversations
fixes CNVS-8112

when replying to a conversation message created in the
new conversations ui, the old conversations ui should
display reply/reply all buttons instead of a single
send button.

the reply button should send a message to only the thread's
original author, while the reply-all button should reply to
every person in the conversation.

test plan:
  * as a user with the new conversation ui enabled, send a
    message to at least two users who are still using the
    old conversations ui;
  * as one of the users with old conversations enabled,
    view your conversations and verify that you see a new
    group message from the first user;
  * verify that when you view the message you have the
    option to reply or to reply all;
  * send a reply message;
  * verify that as another user in the group conversation
    you cannot see the reply message;
  * verify that the original thread author can view the
    reply message;
  * as the user who sent the reply message, send a reply
    all message;
  * verify that all users in the conversation can view the
    reply all message.

Change-Id: I6c9540817c8ad0096242db44a717545c53880437
Reviewed-on: https://gerrit.instructure.com/24430
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
QA-Review: Zach Pendleton <zachp@instructure.com>
Tested-by: Zach Pendleton <zachp@instructure.com>
2013-09-20 16:28:15 +00:00
Derek DeVries 130735d59c hide scores from students in attempts table for muted submissions
fixes CNVS-8208

test plan:
  - create a new quiz as a teacher
  - mute the quiz in gradebook
  - have a student take the quiz
  - the student score in the attempts table should say "Not yet graded"

Change-Id: Ief963ee17fdf42117ebd0a47bf206493e82dcab1
Reviewed-on: https://gerrit.instructure.com/24540
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-09-20 15:09:26 +00:00
Stanley Stuart 72181144ef remove AddWorkflowStateForQuizQuestions migration
This data fixup would be very expensive to run in production, as it
touches every quiz question record in the database. Besides, quiz
questions will update their workflow_state to "active" the next time
they are saved, .active? responds true for questions with nil
workflow_state, and the `active` scope on QuizQuestion already includes
quiz questions whose workflow_state is nil.

Change-Id: I72fecc53e2f46fd1c2086ec2dc13d448d74486ab
Reviewed-on: https://gerrit.instructure.com/24553
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-09-20 14:57:08 +00:00