Commit Graph

10871 Commits

Author SHA1 Message Date
Tyler Pickett 01190e3e4a correctly show completion icons on peer review listings
Because of concerns with a potential race condition on using just the 
incomplete peer review count we've also added the total count of
assigned reviews to the cache key. These two additions still allow us
to take advantage of caching yielding a 90% performance improvement 
against a hot cache locally. These numbers may not translate perfectly
to production given that this page may have frequent cache misses. This
is something we should probably take a look at in the logs once this is
in beta/production.

fixes CNVS-7523

Test Plan:
- As an instructor build a class with at least 2 students
- Add an assignment to the class with peer review enabled
- Assign peer reviewers manually
  - These should start marked as incomplete with a yellow icon
- As the first student navigate to the assignment and submit it
- As the second student navigate to the assignment
  - In the sidebar this student should see that they have an incomplete
    review, indicated by the yellow icon
- Complete the review and view the assignment again
  - The review should indicate that it is complete with a green
    checkmark
- As the teacher view the peer assessments page
  - The review you previously completed should show as completed using
    the same green checkmark.

Change-Id: I8b71fd8f25c71b8031ab74b57d280c98add2c14e
Reviewed-on: https://gerrit.instructure.com/34420
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-05-15 21:10:50 +00:00
Michael Nomitch 3956ceefb1 assigments page keyboard menu working
fixes CNVS-12426

test plan:
  - with draft state on go to assignments page
  - hit ","
  - the shortcuts menu should pop open

Change-Id: I69b0e477fb638e1127cdef188c0bbcfcb6648ecb
Reviewed-on: https://gerrit.instructure.com/34824
Reviewed-by: Tyler Pickett <tpickett+gerrit@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-05-15 20:48:14 +00:00
Michael Nomitch 9adf036b53 discussion rubrics show points when used for grading
fixes CNVS-5378

test plan:
  - make a graded discussion
  - go to its show page
  - click add rubric in settings
  - use the rubric for grading
  - with the same # of points as the assignment
    - no warning should pop up
  - with a different number of point
    - a warning should pop up
    - the point value should be accurate
    - this should work multiple times without reloading
      the page
  - assignments rubrics work as usual

Change-Id: Iee12859b73a118b5339573ae26de9c589d41feb4
Reviewed-on: https://gerrit.instructure.com/33932
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-05-15 20:07:11 +00:00
Jeremy Stanley 6b09086fc8 remove params[:id] from ProfileController#communication
because it is an information leak and I can't imagine any
legitimate purpose for it

fixes CNVS-13057

test plan:
- you should not be able to retrieve other users' notification
  preferences by appending ?id=X to /profile/communication

Change-Id: I744792020d88ce15071a6332571ca1e3289885ed
Reviewed-on: https://gerrit.instructure.com/34939
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-05-15 20:06:21 +00:00
Cody Cutrer 154e1909c9 include hostname and pid in error reports
to make it easier to go from error reports to logs

Change-Id: I38015db9dd616460f84d9792db6c2bbbfbbde330
Reviewed-on: https://gerrit.instructure.com/34965
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>
2014-05-15 19:20:43 +00:00
Ahmad Amireh 58eb918f97 Ember Quiz Stats - Essay Questions
Essay stats include a donut chart of the ratio of students who received
full-credit, as well as an area graph showing the score distribution.

Also, the serializer now prepares the data in a way for ED to properly
populate the questionStatistics association with quizStatistics, so we
got rid of the hack in the route's #afterModel hook, and exterminated
the bug that caused the question stats not to be updated when the quiz
changes (e.g, via the URL).

Closes CNVS-12466, CNVS-13009, CNVS-13021

TEST PLAN
---- ----

  - create a quiz with essay questions
  - take the quiz by a number of students
  - before grading, take a look at the stats page, make sure nothing
    funny happens
  - grade the responses with different scores
  - revisit the page, make sure the graphs are rendered appropriately
  - clicking the View in SpeedGrader link should open a new tab with the
    SpeedGrader for the quiz
  - hover over the circles and verify that you get tooltips similar to
    those for MChoice and T/F questions
  - verify that sorting by DI/Position is again functioning correctly

Change-Id: I3ab6818d86632720c6da2c37b2126b4abe63cefa
Reviewed-on: https://gerrit.instructure.com/33991
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-15 18:58:19 +00:00
James Williams cbddb39443 optimize User#find_pseudonym_for_account
refs #CNVS-12929

Change-Id: Id3528896d9e8a6a0e098478dc30742a9b0a43c05
Reviewed-on: https://gerrit.instructure.com/34692
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-05-15 18:47:58 +00:00
James Williams fa9cdafdc6 only export active learning outcomes and groups
test plan:
* create a course with multiple learning outcomes
* delete one of them
* copy the course
* the deleted outcome should not re-appear in the copy

fixes #CNVS-4358

Change-Id: I2ec16a250d2bcaf70ab0e06d5711e18a2839c415
Reviewed-on: https://gerrit.instructure.com/34798
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-05-15 18:40:55 +00:00
Jason Madsen 8e412e06aa left-align quiz show dropdown items - order bug
links within the ember quiz show page should be left aligned. items in
the menu should be keyboard navigable and maintain order.

closes CNVS-13053

test plan:
  - enable ember quizzes
  - as instructor visit the quiz show page for a quiz
  - click on cog in top right corner
    - verify that items are left aligned within the dropdown
    - use keyboard arrows to move up and down the list
      - verify that selected item moves linearly through list

Change-Id: I52d5af3a7b4ae8a0da95425108fe1b83c5dd1831
Reviewed-on: https://gerrit.instructure.com/34915
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-05-15 18:34:38 +00:00
Jeremy Stanley 4e091e3278 scope account_user deletion to the calling user's account
test plan:
 1. have two root accounts, with no trust links between them,
    each with an account admin who is not a site admin
 2. as a site admin, go to Account 1's settings page,
    Admins tab, and inspect the element of the (X) icon that
    would delete the user. you will see a URL like this:
    https://<site>/accounts/1/account_users/1234
 3. as the admin of Account 2, go to Account 2's settings page
    and inspect the element of the (X) icon that would remove
    an admin (any admin, doesn't matter which).
    it should look like
      https://<site>/accounts/2/account_users/5678
 4. edit the page to change the last number in the URL found
    in step 3, to that found in step 2, then click the X
      e.g., https://<site>/accounts/2/account_users/1234
 5. you should get a page error. the admin from Account 2
    should not be able to demote the admin from Account 1

Note that an actual attacker probably doesn't know the
AccountUser ID of anyone in particular, but they could just
enumerate starting at 1 and ruin the day for a whole lot of
people (including us).

fixes CNVS-13032

Change-Id: If5436b10ec986f1b17635cb8cae46c951cb9ff83
Reviewed-on: https://gerrit.instructure.com/34859
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-05-15 18:32:27 +00:00
Stanley Stuart 410ddb3482 fix dropdown menu css so second menu item works correctly
Test plan:
  - The second dropdown menu on the ember quizzes show page should work
    smoothly instead of skipping focus over the second item.

fixes CNVS-13050

Change-Id: I7c7645f09571f8664cc5c09fe7ea805d46799f1c
Reviewed-on: https://gerrit.instructure.com/34909
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2014-05-15 18:32:02 +00:00
Liz Abinante 9df3965ee8 adds screenreader label for sidebar menu
fixes CNVS-11002

test plan
- inside of a course
- using a screenreader
- for the "Assignments", "Grades" and "Settings" left sidebar items
- verify they are each preceded with "Course" (ex: "Course Assignments")
- verify that menu does't change for sighted users

Change-Id: I727576bd70c49a3b0bff96bf40fcf5b6a40f95ba
Reviewed-on: https://gerrit.instructure.com/34907
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Liz Abinante <labinante@instructure.com>
2014-05-15 18:02:45 +00:00
Tyler Pickett ac39600083 make rubric description dialog preserve line breaks when displaying HTML
Originally we were simply extracting the text from the relevant textarea
and just dumping it into the html via $.fn.FillTemplateData,
the problem with that method is that it doesn't preserve the line breaks
the teacher entered into the field. The first attempt at fixing the
problem was to simply insert <br> tags and tell fillTemplateData that
we're always sending HTML data, unfortunately that opens up some
potential for XSS so we're escaping the content before messing with the
line breaks, and then shipping it off as HTML.

fixes CNVS-9748

Test Plan:
- as a teacher create an assignment
- add a rubric and include line breaks in the long description
- the dialog displaying the long description should have line breaks
  when not editing

Change-Id: I839bdde88ccd35bb55750ec63054d7c606ef05b6
Reviewed-on: https://gerrit.instructure.com/34472
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-05-15 17:30:52 +00:00
Cody Cutrer 267852c7fb include marginalia comment as source when creating job
fixes CNVS-12622

test plan:
 * don't have a config/marginalia.yml
 * queue up a delayed job
 * it should not have a source set
 * configure config/marginalia.yml
 * confirm queries are logged with marginalia info
 * queue up a delayed job
 * it should have source set to the marginalia info

Change-Id: I6460da3f45de5af38282aa5104ec09cd64d233d5
Reviewed-on: https://gerrit.instructure.com/34760
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-05-15 16:49:40 +00:00
Michael Nomitch f9f79bab06 tiny mce toobar now responsive
fixes CNVS-4660

test plan:
  - go to the places with tiny MCE
    - text submissions
    - quiz questions
    - calendar events
    - syllabus
    - outcomes
    - wiki page edit
    - discussions
    - profiles(?)
  - make sure it looks okay & resizes well

Change-Id: Ifd6406a0b738c43ed890d18ca3347ff2dc529bf0
Reviewed-on: https://gerrit.instructure.com/34583
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-05-15 16:14:30 +00:00
Derek DeVries c8048b5334 add module sequence footer to new ember quiz page
fixes CNVS-12832

test plan:
  - as a teacher
  - create a module
  - add a quiz to the module
  - add some item before/after the quiz in the module

  - turn on fabulous quizzes
  - visit the quiz in the module
  - make sure that the module footer appears
  - make sure that the prev/next module navigation buttons work

Change-Id: I3c91c5137528893dd45f8d80fefc485eb73f626c
Reviewed-on: https://gerrit.instructure.com/34902
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-15 16:09:18 +00:00
Nick Cloward 96d14b8717 event stream is requiring a cassandra database to be configured.
fixes: CNVS-13056

Test Case:

  Make sure cassandra is not configured in cassandra.yml.
  Event stream should not complain about it not being configured.

Change-Id: If6a6583be355672f9a24769caf5e2da663a336a8
Reviewed-on: https://gerrit.instructure.com/34926
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-05-15 15:04:44 +00:00
Cody Cutrer c5176a47bb fix deadlock between stream items (touching) and stream items (fk checks)
fixes CNVS-12621

bulk inserts do fk checks, so be sure to do them in user id order

Change-Id: I83a1fee981c6b597a1ee80e44ce5d77309e1389f
Reviewed-on: https://gerrit.instructure.com/34736
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>
2014-05-15 05:30:36 +00:00
Cody Cutrer cdac660ffe upgrade debugger gem to work with 1.9.3p545
Change-Id: I0d49d7af9a6a688e6ef04c1ee6ed1e9a86102ff3
Reviewed-on: https://gerrit.instructure.com/34808
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>
2014-05-15 04:16:06 +00:00
Eric Adams ead4eb7ffd add full origin in json post to sis_app
fixes SIS-260

Change-Id: I0c40000111a527b602b74638d1ebc8685e14a7b2
Reviewed-on: https://gerrit.instructure.com/34592
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Duane Johnson <duane@instructure.com>
Product-Review: Duane Johnson <duane@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
2014-05-14 20:09:20 +00:00
Ahmad Amireh cdab6bdad5 Ember Quiz Stats - FIMB & Multiple-Dropdowns
This patch adds stats support for two new question types. Their answer
sets act like tabs and can be toggled to show metrics for each answer
set.

Closes CNVS-12989

TEST PLAN
---- ----

  - create a quiz with those question types and a bunch of possible
    answers
  - take the quiz by a number of students
  - visit the ember stats page and verify:
    - each answer set/blank has its own button in the question block
    - when you activate a blank:
      - the correct response ratio donut chart updates to reflect how
        many students chose/filled in the right answer for that blank
      - the answer distribution bar chart plots the number of students
        who picked each possible answer (only ones that are pre-defined,
        if they entered something funny, it shouldn't show)
      - toggle the question details:
        - verify that the answers are displayed below
    - choose another blank
      - verify that everything updates

Change-Id: I8d29eb12287b5f6cd8fb4b1d4ac794eed618a7a1
Reviewed-on: https://gerrit.instructure.com/34804
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-05-14 19:41:42 +00:00
Sterling Cobb a275db19c8 fix module item icon padding
fixes #CNVS-12999

Padding was off when draftstate is disabled.

Test Plan
----------
As a user of any type
Given that draft state is disabled on a course
And I have a module with module items
And some of those module items are indented
When I go to the modules page
I should see the module item icon next to the module item title
And the icon should not be overlapping the module item title

Change-Id: I75238535ff2326c8bcbad3f4a0b76df7e65ec2a4
Reviewed-on: https://gerrit.instructure.com/34743
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2014-05-14 19:23:31 +00:00
James Williams 3aed5e220f fix content_migration_spec for non-qti build
Change-Id: I32b5edd73bc2af40a806008801c87e2844370f28
Reviewed-on: https://gerrit.instructure.com/34880
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-05-14 19:23:02 +00:00
Nick Cloward 19ea2789dd canvas event stream
fixes: CNVS-10477

Test Plan:

Make sure auditing still works.

Change-Id: I021c0772ad0cf337d452b55bf690d15ce1a61a09
Reviewed-on: https://gerrit.instructure.com/31494
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-05-14 19:09:24 +00:00
Nick Cloward 76c192a289 fix audit log api scoping
fixes: CNVS-13026

Test Plan:

  Make sure you cannot search cross account objects in the event audit logs.

Change-Id: Ie64e59e7f144400076073d4b9c5ae2c0ad8b5285
Reviewed-on: https://gerrit.instructure.com/34827
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-05-14 18:46:08 +00:00
Derek DeVries e1381ae75c publish and unpublish with the api instead of changing workflow state directly
fixes CNVS-12975

test plan:
  - create a quiz with two questions (save but don't publish)
  - turn on fabulous quizzes
  - view the number of questions for the quiz on the ember quiz index page
  - it should show you the correct number
  - publish the quiz
  - refresh the page
  - it should continue to show you the correct number of questions

Change-Id: If9cd041f47b339771f8ffa3e9e3953195efc540d
Reviewed-on: https://gerrit.instructure.com/34835
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-14 16:54:50 +00:00
Joel Hough 51aad5eefb remove beta conversations message
test plan
- open conversations
- ensure that there isn't a message above the 'no conversations
 selected' message and envelope icon saying something about this
 being a beta feature

Change-Id: Ibd95af1806234cf2d2cc1e844f34266b3a2e2bdd
Reviewed-on: https://gerrit.instructure.com/34853
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-05-14 16:37:07 +00:00
Derek DeVries d712cb2dab fix embedded youtube videos in the quiz description
the javascript in instructure.js does a bunch of stuff that we should eventually
move to ember so that it's not this global javascript that magically happens if
a div happens to have a certain class name. Until then, we need to make sure
that the logic in there happens so things don't break.

fixes CNVS-12853

test plan
- as a teacher
  - create a quiz with a link to a youtube video
  - save the quiz
  - enable fabulous quizzes
  - view the quiz
  - the clickable thumbnail that embeds the video should be present

Change-Id: I75e1db2318112c687680c715dbffc6506feefea5
Reviewed-on: https://gerrit.instructure.com/34863
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-14 16:24:40 +00:00
Derek DeVries a6375a537d add an option to the settings menu to view student quiz results
the setting is kept because it's always been there, but now it simply sends us
over to the moderate tab.

fixes CNVS-12437

test plan:
  - as a teacher
    - create a quiz
    - enable fabulous quizzes
    - visit the quiz
    - click on the settings menu for the quiz
    - click on "Show Student Quiz Results"
    - you should be navigated to the moderate tab
    - it should display a message that this info is now on the moderate tab

Change-Id: Ie228c52a469cc582b1d24415651656a22b090317
Reviewed-on: https://gerrit.instructure.com/34793
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-14 14:59:19 +00:00
Derek DeVries fcc751ae1b fix issue with date dates not showing up on fabulous quizzes index
When switching to use assignment overrides to build the dates, we switched to
camel case for the dates.

fixes CNVS-12900

test plan
- as a teacher
  - create a quiz with a due date
  - create a quiz with a lock date
  - create a quiz with multiple due dates / lock dates
  - enable fabulous quizzes
  - visit the quizzes index page and make sure that with fabulous quizzes
    on/off that the due/lock dates display the same way.

Change-Id: Id54e9e481b3ada26eaa0f91a85d3a194b8611323
Reviewed-on: https://gerrit.instructure.com/34811
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-14 14:47:37 +00:00
Cameron Sutter b4380dd510 assignment index page cog menu keyboarding
fixes CNVS-11563

test plan:
 - on the assignment index page (with draft state on)
 - using only the keyboard
 - activate any of the assignment cog menus and confirm
   that all items are read by the screenreader
   and properly focused on screen when arrowing up and down
   with the keyboard
 - confirm that all items in the menu can be activated
   by pressing enter

Change-Id: I6ea47fc529243214549a804a5970085df0ddff5c
Reviewed-on: https://gerrit.instructure.com/33020
Reviewed-by: Liz Abinante <labinante@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cameron Sutter <csutter@instructure.com>
2014-05-14 14:39:04 +00:00
James Williams 413e30a4de only try to import active outcomes and groups
test plan:
* create an account-level outcome group
* create an outcome in that group, but then delete it
* in a course, find and import the account-level group
* should not import a broken outcome link to the deleted outcome

fixes #CNVS-2015

Change-Id: I59d3404038960e156cd7b3e8540df286f27d1569
Reviewed-on: https://gerrit.instructure.com/34797
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-05-14 12:31:29 +00:00
James Williams 5f927946c5 import/export learning outcome alignments
test plan:
* create a course with a question bank and
questions
* create learning outcomes (either on the course
or account level)
* align outcome(s) to the question bank(s)
* copy the course, or import/export it
* confirm that the question banks in the new course
retain their alignments

fixes #CNVS-5917

Change-Id: I16a80371af4433a4debdcc29d09d7fa1f43bc41e
Reviewed-on: https://gerrit.instructure.com/34572
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2014-05-14 12:31:11 +00:00
Transifreq a7888df1ec Updated ar translation 2014-05-14 05:07:19 -06:00
Tyler Pickett b8b13db632 make rubric display dialog into a modal
fixes CNVS-4142

Test Plan:
- create a quiz or assignment with a rubric
- view the quiz or assignment
- using the gear drop down open the rubric display dialog
  - the rubric display dialog should now have a gray background
    separating it from the rest of the page

Change-Id: I42ce260345b5f04e162d6ef0a8e287ca9d85aa1b
Reviewed-on: https://gerrit.instructure.com/34556
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Tyler Pickett <tpickett+gerrit@instructure.com>
2014-05-13 22:51:46 +00:00
Cody Cutrer 3e38c56d60 fix deadlock with concurrent module touches
Change-Id: I1ea3123857a68b7cbdd923b7966cd06814e95d35
Reviewed-on: https://gerrit.instructure.com/34799
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-05-13 22:41:33 +00:00
Jon Jensen 275bd78c68 pass back state during auto-accept oauth flows, fixes CNVS-13006
test plan:
n/a, see specs ... needs an implementation

Change-Id: If429c925b5089036a32839653b609cdd8b82d95d
Reviewed-on: https://gerrit.instructure.com/34781
Reviewed-by: Dave Donahue <ddonahue@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-05-13 21:10:05 +00:00
Jason Madsen 880b17c76f refresh submission data from ui button click
closes CNVS-12447

allow users to hard refresh moderate table with a button click of
spinning arrow icon in top right of moderate table. moderate table loads
the first users (pagination is not a part of this commit), even when there
are no user submissions.

test plan:
  - enable ember quizzes
  - visit moderate tab as instructor
  - in another browser, as a student, take the quiz again
    -which may mean:
      - disable ember quizzes
      - take quiz
      - re-enable ember quizzes
  - in instructor browser (don't refresh)
    - click the refresh icon in top right of moderate page
    - ui should update with student submission data
  - create and publish a new quiz as an instructor
    - visit the quiz moderate tab
      -first page of students should display with blank submissions
  - create and publish a quiz with unlimited attempts as instructor
    - visit the quiz moderate tab
    - first page of students should display
      - Remaining Attempts column should display 'Unlimited'

Change-Id: I2ee517a16a87c128498eb1cad41e1a2e9e15d177
Reviewed-on: https://gerrit.instructure.com/34477
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ahmad Amireh <ahmad@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-05-13 20:56:00 +00:00
Cody Cutrer 4777aac2df Merge pull request #445 from sfu/feature-sis-user-names
Add full & sortable name fields to SIS User Import

Change-Id: Ib8617572802ca69913b422d22301299ab75c211f
Reviewed-on: https://gerrit.instructure.com/34548
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-05-13 14:26:23 -06:00
Derek DeVries 27ed262e61 fix error when showing time limit for fabulous quizzes
fixes CNVS-12843

test plan:
  - as a teacher
    - create a quiz with a time limit
    - enable fabulous quizzes

  - as a teacher
    - view the quiz overview tab
    - the time limit should display correctly

  - as a student
    - view the quiz overview tab
    - the time limit should display correctly

Change-Id: Ibdc32b731c5ece94b8f9990a7d69e3500dec2524
Reviewed-on: https://gerrit.instructure.com/34792
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-13 20:03:56 +00:00
Mark Severson 8609d9d622 fix long floating content in pages
test plan (with draft state enabled):
 * create a wiki page with long floating content
   e.g. <div style="float:left">
 * add the page to a module
 * navigate to the page (through modules)
   - the progression Next/Previous buttons should not overlap
     the content of the page

fixes CNVS-12377

Change-Id: Id1ff73d61713aeac6c18733ae830d6ba3782d667
Reviewed-on: https://gerrit.instructure.com/34712
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-05-13 19:53:52 +00:00
Derek DeVries 0ecec1a16c don't show the 'everyone' assignment date if all sections have overrides
fixes CNVS-13002

test plan:
  - as a teacher
    - create a quiz with assignment overrides for every section
    - enable fabulous quizzes
    - visit the quiz
    - make sure that it doesn't show an extra date for "Everyone"

  - as a teacher
    - check the courses/{id}/quizzes/{id} jsonapi end point
    - there should be a new 'section_count' attribute

  - as a student
    - check the courses/{id}/quizzes/{id} jsonapi end point
    - there should *NOT* be a 'section_count' attribute

Change-Id: I1cf33be890c76df07d73cfa278dcbc550abf1090
Reviewed-on: https://gerrit.instructure.com/34791
Reviewed-by: Ahmad Amireh <ahmad@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-13 19:41:33 +00:00
James Williams 8fd8304974 re-enable deleted rubrics on import
test plan:
* create a course with a rubric
* copy the course into another course
* delete the copied rubric
* recopy the original course into the copied course
* the rubric should be available again

fixes #CNVS-12958

Change-Id: Ic8ddb8b9c629d8d27baea9f1a08db60c7d8317d0
Reviewed-on: https://gerrit.instructure.com/34728
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-05-13 19:35:02 +00:00
Cameron Sutter c879e5b9c0 change 'switch gradebooks' links text
fixes CNVS-13004

test plan:
 - in gb2, click the 'Switch to Individual View' link
 - srgb should now be your default gb view
 - in srgb, click the 'Switch to Grid View' link
 - gb2 should now be your default gb view

Change-Id: Ib747e31802590d8a556a688bc2bf02b266f54928
Reviewed-on: https://gerrit.instructure.com/34772
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
2014-05-13 19:22:18 +00:00
Michael Nomitch 02f7d71c0f curving gpa_scale grades works
fixes: CNVS-12707

also srgb doesnt show curve grades button
if there are no possible points

test plan:
  - make an assignemnt that is gpa_scale
  - populate gb2 with grades
  - curve grades
    - all the grades shouldn't disappear
    - grades should make sense
  - non gpa_scale curving should work
  - curving on srgb should work as well

  - if an assignment has no points possible
    - neither gb shows the curve button/link

Change-Id: I59bc736da1095ee508bf7fa17d5097fa05eacab6
Reviewed-on: https://gerrit.instructure.com/34002
Reviewed-by: Tyler Pickett <tpickett+gerrit@instructure.com>
QA-Review: Tyler Pickett <tpickett+gerrit@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-05-13 19:13:41 +00:00
Cameron Matheson 4932e6d450 canvadocs: configurable mime types
closes CNVS-12992

Test plan:
  * configure canvadocs with more mime  types (e.g.
      Setting.set('canvadoc_mime_types',
        (Canvadoc.mime_types + %w[application/rtf text/rtf text/plain]).to_json)
  * restart your server
  * upload some documents of the newly added types (rtf or txt)
  * they should now preview in canvadocs

Change-Id: Ic3a1cb907f4da39cc8510221caa8b794b9d7f9f1
Reviewed-on: https://gerrit.instructure.com/34697
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2014-05-13 18:48:07 +00:00
Michael Nomitch eea46e9101 change srgb title
fixes CNVS-13001

test plan:
  - go to srgb, the page title (in your browser tab)
   should say "Gradebook: Individual View"

Change-Id: I985f855057536e18a39fe43872c358ca1e092951
Reviewed-on: https://gerrit.instructure.com/34749
Reviewed-by: Liz Abinante <labinante@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
2014-05-13 18:39:48 +00:00
James Williams 1b831688a9 don't double escape single quotes in rails 2 erb tags
test plan:
* edit a text field generated through erb (e.g.
 change the account name through account settings)
* use a single quote (')
* save the result
* confirm that when going to edit the field again, that
 it does not contain a double escaped quote ("&#x27;")

fixes #CNVS-11652

Change-Id: Ic643e00bbc56fe410a7a61ebdf4a57e9198b1f69
Reviewed-on: https://gerrit.instructure.com/34794
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-05-13 18:05:48 +00:00
Cody Cutrer c6090faa0a allow enrolling users via sis from another root account
fixes CNVS-12963

test plan:
 * set up a trust from account A to account B
 * enable sis imports for account A and account B
 * add a user to account B with an SIS ID
 * add a course to account A with an SIS ID
 * do an sis import to account A for enrollments as user
   that is an admin in both account A and account B;
   specify the course from account A as the target,
   the user from account B, and add another column
   root_account with account B's domain
 * it should succeed, and enroll the user from account B
 * unenroll the user manually
 * do the import as a user that's an admin in account A,
   but not account B - it should fail citing permissions
 * remove the trust link from A to B
 * do the import as the user that's an admin in both;
   it should fail citing no usable login

Change-Id: Ie5b7b71bfe563da9c49d3aa2321586994634ccb5
Reviewed-on: https://gerrit.instructure.com/32133
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-05-13 17:19:48 +00:00
Derek DeVries 07630a7eda fix lock/unlock date ranges for assignment overrides
after a discussion with product/design we decided to get rid of the fancy date
range since it is likely that they have 'only' a lock or unlock date. Instead
we're going to put these in a table like it does in the non-fabulous version

fixes CNVS-12872

test plan
- as a teacher
  - create a quiz with multiple dates for various sections
  - add a date for a section with only a lock date
  - add a date for a section with only an unlock date
  - add a date for a section with both a lock and unlock date
  - make sure they all continue to look nice and display similar to they do now
    in the non-fabulous version

Change-Id: I6d76848fa20955757b018ed853a373e18608acc3
Reviewed-on: https://gerrit.instructure.com/34746
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-13 17:19:27 +00:00