Commit Graph

6038 Commits

Author SHA1 Message Date
Jacob Fugal 6656cc779a update limit_privileges... on course shard
the enrollment for a user in a course lives on the course's shard.
activate that shard while updating the enrollment for
Course.limit_privileges_to_course_section!

Change-Id: Ia7475669b5c2be282640ca3ab857986cd0b0233d
Reviewed-on: https://gerrit.instructure.com/17567
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
2013-02-15 18:27:04 -07:00
Zach Pendleton da39be5307 stop yard api doc generation warning.
previously generating api documentation would display
a warning about not being able to resolve a link. solution
was to add some spacing.

test plan:
  * bundle exec rake doc:api;
  * verify that a warning is not displayed re:
    search_controller.rb:40;
  * verify that the search documentation for recipients
    displays as expected.

Change-Id: Ic3654321452f914104fc68e6d9bb9d67955b6b24
Reviewed-on: https://gerrit.instructure.com/17638
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
QA-Review: Joel Hough <joel@instructure.com>
2013-02-15 17:49:15 -07:00
Eric Berry dcfa75b772 disabled peer review and group assignment abilities for moocs
when an assignments course is flagged as a mooc (large_roster=true)
the group assigment and peer reviews checkboxes and labels are hidden

fixes CNVS-3092

test steps:
- create an assignment for a course
- in the database, update the course field 'large_roster' to true. this
  flags the course as not being a mooc
- go to the edit view of the assignment
- ensure that you have the ability to check 'This is a Group Assignment'
  and 'Require Peer Reviews'
- in the database, update the course field 'large_roster' to false. this
  flags the course as a mooc
- refresh the edit assignment view
- ensure that the group assignemnt and peer review options are no longer
  there

Change-Id: I481102d0c1947ea7de2140c3a7b5d5d6a2d08ccd
Reviewed-on: https://gerrit.instructure.com/17697
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-15 17:39:29 -07:00
Eric Berry e0460850f0 integrated adobe connect gem
fixes CNVS-3418

test plan:
  - create a conference room and start/enter it
  - in a different browser (or private) log in as someone else and
    join the same conference
  - ensure that both people can connect to the conference

Change-Id: Id043e2c69a1fea13197cccffc8fda5f41b798718
Reviewed-on: https://gerrit.instructure.com/17709
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-02-15 17:39:22 -07:00
Mark Severson 6501fe7bd9 fix incorrect translations showing up randomly in breadcrumbs
test plan:
 * start/restart canvas server
 * navigate to an assignment
   (not just the assignments list)
 * note the "Assignments" breadcrumb
 * change language (or to a user with a different language)
 * navigate to the same assignment
 * verify that the "Assignments" breadcrumb changed languages

closes #CNVS-1449

Change-Id: I7539c56ad6fe1307f251689840883391e67d5bed
Reviewed-on: https://gerrit.instructure.com/17732
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-02-15 17:01:21 -07:00
Mark Ericksen 2eaba178c2 disable speedgrader in courses with large_roster flag.
fixes CNVS-3111

test plan:
  * enable the 'large_roster' flag on a course and verify
    that, in that course, links to the speedgrader are
    hidden in the following places:
    - graded discussion topic gear menu;
    - graded discussion entry gear menu
    - quiz show page (right side bar);
    - assignment show page (right side bar);
    - gradebook1 assignment header dropdown;
    - gradebook1 grade cell popup;
    - gradebook2 assignment header dropdown;
    - gradebook2 grade cell popup;
  * also verify that attempting to navigate to the
    speedgrader directly via /courses/:id/gradebook path
    displays a message that the speedgrader is disabled
    for that course.

Change-Id: Iab82bd7281208f6e2d3745bb3184c90068090535
Reviewed-on: https://gerrit.instructure.com/17710
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Eric Berry <ericb@instructure.com>
Tested-by: Eric Berry <ericb@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-02-15 16:38:45 -07:00
Jon Willesen e2cbbbd9a7 Add multiple inbox support to IncomingMessageProcessor
fixes CNVS-3781

test plan:
 - See test email accounts on the IncomingMessageProcessor wiki
   page.
 - Configure config/incoming_mail.yml with multiple test email
   accounts as specified in the incoming_mail.yml.example file
   (the config should be in the development section).
 - Restart rails to pick up the new configuration.
 - Set a student's notifications for discussion topics to ASAP.
 - Create a new discussion topic.
 - Go to /messages for the student and find the notification
   for the new discussion topic.
 - Copy the "+" data from the reply-to field. For example, from
   "notifications+deadbeef-4242@example.com" you would copy
   "+deadbeef-4242"
 - Send a real email to one of the test accounts, adding the
   "+" data to the address. For example "test1@example.com"
   would become "test1+deadbeef-4242@example.com"
 - After 1 minute, the IncomingMessageProcessor should pull the
   message from the test account and post the body of the email
   message to the discussion.
 - Send another email as above but to a different test account
   you've configured. It should also appear in the discussion.
 - Reconfigure incoming_mail.yml with one account as it appears
   in the original production settings. Restart rails and make
   sure this configuration still works.
 - When you're done testing, remove your
   config/incoming_mail.yml file and restart rails.

Change-Id: Ie4a584c32bf0cc7025619341584d454cf15ce07f
Reviewed-on: https://gerrit.instructure.com/17714
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-15 14:40:51 -07:00
Eric Berry afe72f41f0 display edited/deleted by and date on discussion entries
when a discussion entry is updated or deleted, it now shows
the text "Edited by __NAME__ on __DATE__".

FYI: there is an issue where the first reply to the main discussion
topic cannot be edited. Also, the edited/deleted message does not
show the proper data until the browser is refreshed. These will be
added as additional tickets.

fixes CNVS-2999

test steps:
- Create a discussion
- Add a reply to the discussion
- Add a reply to the reply
- Edit the reply and refresh the browser. It will show the message.
- Delete the reply and refresh the browser. It will show the message.

Change-Id: Ie636bbd0f507c24b46a00419facc3aff09786010
Reviewed-on: https://gerrit.instructure.com/17637
Reviewed-by: Jon Willesen <jonw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-15 13:58:20 -07:00
Duane Johnson 0f7138699a add Portugese to list of supported languages
fixes CNVS-3819

Change-Id: Icd4d2bf2a15545402be3649c48c473a95fb71763
Reviewed-on: https://gerrit.instructure.com/17760
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-02-15 13:00:25 -07:00
Simon Williams 13e4d70cc9 redirect to assignment/quiz when editing from assignment index
when using the quick editor in the assignment index page, clicking "more
options" on quiz or discussion type assignments will redirect to those areas of
canvas.  this is because you can no longer edit the assignment associated with
these discussions/quizzes directly.

closes CNVS-2403

test plan:
- on the /course/x/assignment spage
- start create a new assignment, set it's type to discussion, and hit more
  options. it should take you to the discussion page with the fields you
  entered pre-populated (like it does with regular assignments).
- edit an esiting discussion assignment, and click more options.  same thing.
- repeat for quizzes (caveat: quizzes ignore the points possible parameter,
  since points possible are based on quiz questions)

Change-Id: Idb367af6d13d1825853911de56d98cccbea59b71
Reviewed-on: https://gerrit.instructure.com/17673
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-02-15 12:53:23 -07:00
James Williams 1c6ae6979e use root account uuid for lti tool_consumer_instance_guid
switch it so it isn't dependent on domain or shard

fixes #CNVS-3829

Change-Id: I29f168b2ee345874437cbf2e1d759e55aebe63d6
Reviewed-on: https://gerrit.instructure.com/17655
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Bracken Mosbacker <bracken@instructure.com>
2013-02-15 12:21:13 -07:00
Zach Pendleton 86c71954c7 fix display issue on scheduler.
fixes CNVS-3738

previousy, display of the scheduler page would be off if
only one, nameless appointment was present and the user
attempted to click its gear menu.

now we expand the height of the appointment group list to
avoid clipping and layout issues.

test plan:
  * enable calendar2 and scheduler on an account;
  * as a user with permissions to create an appointment,
    create an appointment with no name;
  * reload the page, click the gear menu, and verify that
    the layout of the page is not affected.

Change-Id: I6daddd5672760c427b34c103912d86976af1e7e0
Reviewed-on: https://gerrit.instructure.com/17690
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-15 11:03:56 -07:00
Jacob Fugal 679578aef8 use correct shard in Course#enrollment_allows
when checking if a user has an enrollment in a course that allows a
permission, check for the enrollments on the course's shard

test-plan:
 * create user A on shard X
 * create course B on shard Y
 * enroll user A in course B
 * in course B's account, have a permission that depends on course
   enrollment that should be true for user A's enrollment
 * exercise that permission in course B as user A

Change-Id: I143ecebd25da15fc59c94c7119a664633d4fdb7c
Reviewed-on: https://gerrit.instructure.com/17565
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
2013-02-15 10:48:09 -07:00
Cameron Matheson 0b9e0d2f5e gradebook_to_csv: order assignments like gb2
refs CNVS-3606

this commit also removes the unused assignment_id option

Test plan:
  download some gradebook csv, make sure the column order is the same as
  gb2

Change-Id: I8dde6122805498a4513126bf288f93713b745c58
Reviewed-on: https://gerrit.instructure.com/17620
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-02-15 10:34:25 -07:00
Stanley Stuart 4f8afc4506 fix assignments edit page specs
Fixes some selenium specs for the assignments edit apge that were trying
to interact with form elements before they were available.

test plan:
  - ensure specs pass.

Change-Id: I37e931a4ce3e701188cb3fd145c64544f7312083
Reviewed-on: https://gerrit.instructure.com/17741
Reviewed-by: Jake Sorce <jake@instructure.com>
QA-Review: Jake Sorce <jake@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-02-15 10:22:17 -07:00
Duane Johnson a03439f5c2 ADD portugese, UPDATE arabic, spanish, russian
Update translation files

fixes CNVS-3819

Change-Id: I3a74f4d12481d71fc3064b38af50572b54a9b11e
Reviewed-on: https://gerrit.instructure.com/17750
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-02-15 09:38:25 -07:00
Zach Pendleton c8b88c4432 properly persist disable announcement comments setting.
fixes CNVS-3810

when re-enabling comments on course announcements, properly
persist that change.

test plan:
  * disable announcement comments on a course;
  * re-enable announcement comments on a course;
  * verify that the setting persists across page loads.

Change-Id: I8c89ca793bc7baa97e0ce11056f739917de4300f
Reviewed-on: https://gerrit.instructure.com/17632
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-14 16:40:18 -07:00
Stanley Stuart b50ffa951c ensure selenium specs always wait for requests for context modules
Fixes an issue in context module specs where Selenium wasn't waiting for
a link to appear before clicking it. The link it was trying to click is
hidden or displayed based on an AJAX request, so it was sometimes
unavailable.

test plan:
  - ensure specs pass.

Change-Id: Ifc88b07ba18c50bbe1297ad1f65a2278aff4ab1f
Reviewed-on: https://gerrit.instructure.com/17740
Reviewed-by: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-02-14 16:00:18 -07:00
Chris Hart bb514d737a Fix button styles in Rubric edit mode - especially IE10
https://instructure.atlassian.net/browse/CNVS-2985

Change-Id: I42236b1968762d8ae827650541a87aaad033819c
Reviewed-on: https://gerrit.instructure.com/17252
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-02-14 15:23:50 -07:00
Simon Williams 9814b3a40b spec: fix quiz validation specs for ruby 1.8
Change-Id: I7a5e87e9327d77924a74c50e88373afe3ad210e7
Reviewed-on: https://gerrit.instructure.com/17726
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jake Sorce <jake@instructure.com>
QA-Review: Jake Sorce <jake@instructure.com>
2013-02-14 14:32:58 -07:00
Ahmad Amireh f6b74d7b86 show quiz action icons on touch devices
The Edit, Delete, and Move action icons for a question in the quiz edit
form were not visible on touch-enabled devices as the CSS would only
show them based on the :hover state of their container which isn't
always eligible when using touch devices.

The issue was reported by some users using Chrome and Firefox on a
regular non-touch device, however I was unable to reproduce the issue
on any of the following platforms/browsers:

Windows 7 (x64)
	Chrome:  17.0.963.83,  18.0.1025.168, 19.0.1084.56, 20.0.1132.57,
           21.0.1180.89, 22.0.1229.94,  23.0.1271.97, 24.0.1312.57
  Firefox: 3.6.28, 4.0.1, 5.0.1, 17.0.1, 18.0.2

Windows 8 (x64)
  Chrome:  24.0.1312.57
  Firefox: 18.0.2

Linux (Arch x64)
  Chromeium: 24.0.1312.69
  Google Chrome: 23.0.1271.64
  Firefox: 18.0.2

However, the issue was reproducible on:
  1. iPhone 4S (iOS 6)
  2. iPad 4 (iOS 6.1)

-- NOTE --

The committed change will apply to "hybrid" browsers which may report
both touch and no-touch capabilities by FALLING BACK to the touch mode
(the icons will be visible regardless of the hover state). So, they will
be accessible but not optimal.

-- Test plan

  * create a quiz with one or two questions
  * using an iPad or an iPhone, edit the quiz
  * look at the question containers, the edit and delete buttons to the
    right should be shown, and the move icon to the left as well
  * using a desktop (or any no-touch device) browser, edit the quiz
    and the icons should be hidden unless you hover over the question

closes CNVS-2022
see also CNVS-6966
see also gerrit-8825 (https://gerrit.instructure.com/#/c/8825/)

Change-Id: If8c8221523ce11fc469e19fe58e9337b8bcd635c
Reviewed-on: https://gerrit.instructure.com/17679
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-02-14 13:15:08 -07:00
Brian Palmer 32122840f7 spec: fix multipart form builder StringIO filename in 1.8
In 1.8 StringIO responds to path but returns nil, so it was using a different
filename. That wasn't harmful, but was inconsistent (and made the spec
fail in 1.8).

Change-Id: Ifdc37c47b4cab3a5834cd71e48453658c21c4083
Reviewed-on: https://gerrit.instructure.com/17724
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-02-14 12:34:48 -07:00
Simon Williams 6380d4d5b8 spec: don't use new 1.9 hash syntax yet
Change-Id: I0ab582dc8cc2b43024bfce8b8b0e787802ec1977
Reviewed-on: https://gerrit.instructure.com/17721
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2013-02-14 11:38:51 -07:00
Joel Hough ba402c0915 disable quiz statistics page for MOOCs
fixes CNVS-3427

test plan
- as a teacher of a non-mooc course with a quiz, view a quiz
- ensure that the "Quiz Statistics" button shows on the right side
  bar
- navigate to the quiz statistics page
- ensure that the quiz statistics page loads
- activate the mooc flag
- view the quiz
- ensure that the "Quiz Statistics" button does not show on the
  right side bar
- navigate to the quiz statistics page (you will have to enter the
  url manually)
- ensure that you are redirected to the quiz page and that a notice
  informing you that the page is disabled displays

Change-Id: Iaaea98172cdd07f7f0ed95f916676e8be5eff161
Reviewed-on: https://gerrit.instructure.com/17659
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-14 11:33:38 -07:00
Joel Hough 6d718f89ac hide grade distribution for MOOCs
fixes CNVS-3121

test plan
- grade at least five submissions for an assignment
- as a student, ensure that the box-and-whisker graph for grade
  distribution shows for that assignment on the course grades page
- activate the mooc flag
- as a student, ensure that the graph is no longer there

Change-Id: I2d605f7f71d096ed21258023bd965fde5135bbf3
Reviewed-on: https://gerrit.instructure.com/17630
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-14 11:33:23 -07:00
James Williams 2a899439cb fix intermittent content import submit button error
test plan:

* go to import content from a migration
* clicking on the import button should not
 occasionally fail and take you to a screen
 with the text "{success: true}"

fixes #CNVS-3057 #CNVS-3715

Change-Id: Ida1d0f9a6b062c87ccd9a75eef8e58d24d03a088
Reviewed-on: https://gerrit.instructure.com/17680
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-02-14 10:47:35 -07:00
Jon Jensen fe08b9ba59 set correct table name for subclasses
allows you look stuff up on the subclass, e.g. CourseProfile.where(...)

test plan:
N/A, this is needed for https://gerrit.instructure.com/17695

Change-Id: I9588cdd1386b05dc7607e497a78dcab81eccc2ef
Reviewed-on: https://gerrit.instructure.com/17696
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2013-02-14 10:42:16 -07:00
Joe Tanner 5dcd248db6 prevent 'undefined class/method ...' errors with Marshal.load
fixes #CNVS-3576

test plan:
1. before checking out this commit *
1.1. in script/console run:
     r = Canvas.redis
     r.set('foo', Marshal.dump(WiziqConference.new))
1.2. restart script/console and run:
     Marshal.load(r.get('foo'))
1.3. that command should throw this error:
     undefined class/method WiziqConference
2. checkout this commit *
2.1. run 1.2 again, the command should return an instance of WiziqConference

Change-Id: I966531cd89e1e15dab30c1548d865da589e3bddf
Reviewed-on: https://gerrit.instructure.com/17515
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
QA-Review: Joe Tanner <joe@instructure.com>
2013-02-14 10:28:18 -07:00
Jon Willesen 0ebaa016a8 add a batch_update method to conversations api
The batch update runs in a background job and updates a
Progress record while it runs. Based on the recently added
course controller's batch_update method.

fixes CNVS-2962

test plan:
 - read and check the api documentation for the conversations
   batch_update call
 - create some conversations for a user using the GUI
 - use the new api call to perform batch updates on that user's
   conversations
 - refresh the user's inbox and verify the conversations were
   updated properly.

Change-Id: I185bb5402675b6f0475efed21a525c5d4d8a39cb
Reviewed-on: https://gerrit.instructure.com/17556
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
2013-02-14 09:36:36 -07:00
Zach Pendleton fc2982a072 generate js i18n stubs with LOCALES environment var.
fixes CNVS-3601

to avoid clientside missing translation errors on languages
that don't exist at js compile time, allow creation of
empty translation keys by passing in LOCALES environment
var during rake i18n:generate_js.

test plan:
  * run `LOCALES=zx,zy,zz bundle exec rake i18n:generate_js;
  * inspect public/javascripts/translations/_core_en.js and
    verify that the zx, zy, and zz keys are present in the
    translation hash (and are empty JS objects).

Change-Id: I3b7dc5fdcdfcab4f1a89317e7ec44aa3ca197e0f
Reviewed-on: https://gerrit.instructure.com/17629
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-14 09:07:57 -07:00
Zach Pendleton f828b6be88 remove collaborations editing from course files page.
fixes CNVS-3404

test plan:
  * navigate to course files page and click the
    collaborations folder;
  * verify that 'Manage collaborations' link is present in
    the files interface header;
  * click the link and verify that it links to the
    collaborations page.

Change-Id: Id1a67ced14d220f98b10c1e63b6b651c97d2b473
Reviewed-on: https://gerrit.instructure.com/17633
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-14 08:38:22 -07:00
Ryan Florence 57fb1e1d90 disable uploading scores in large_roster courses
closes CNVS-3091

test plan:
1. visit gradebook2
   - note the ability to upload scores
2. set large_roster to true for a course in
   script/console
3. visit gradebook2 again
   - note the option to upload scores is gone

Change-Id: I1995cbf878cd6898eee1167d0e80f25ef21261b6
Reviewed-on: https://gerrit.instructure.com/17649
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-02-13 22:20:14 -07:00
Bryan Madsen efff7b5146 spec: adding 2 spec files that fail intermittently to parallel_exclude
Change-Id: Ibbdd78cf7bcc7c7c6951f0eea95cf77bd8e1a43d
Reviewed-on: https://gerrit.instructure.com/17706
Reviewed-by: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-02-13 16:31:20 -07:00
Zach Pendleton 742e7a342f better handle small browser windows in discussions.
fixes CNVS-3720

test plan:
  * open an existing discussion as a user w/ edit
    permissions (e.g. topic author, teacher, or admin);
  * shrink your browser window and verify that the collapse
    and expand entries buttons in the header properly
    collapse below the search input.

Change-Id: Iecfd077fdedc51a973711cdf607cf0d2b7d5f62f
Reviewed-on: https://gerrit.instructure.com/17652
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-13 15:44:47 -07:00
Zach Pendleton 0c763cb0ed hide discussion gear menu from users w/ no gear options.
fixes CNVS-3746

if a user does not have permissions to execute any of the
actions exposed by the header gear menu in a discussion,
hide the menu.

test plan:
  * as a student, create a discussion topic;
  * as the same student, comment on the topic and reload
    the page;
  * verify that the gear menu in the discussion topic
    header (next to the edit button) is hidden.
  * verify that the menu still exists for teachers.

Change-Id: I358895b3f295d564db3cb3949fe74cb6109ba075
Reviewed-on: https://gerrit.instructure.com/17650
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-13 15:44:39 -07:00
Mark Severson 22dbdc5bd4 convert the course syllabus page to use Backbone
use the calendar_events api and appointment_groups api rather than
being statically rendered

modify the i18n strftime to allow formatting of numeric only dates
without needing to introduce internationalization into the tests

test plan:
 * syllabus events
   * should show all course events, assignments, and appointment groups
     (including overridden due dates)
   * should be in the user's configured timezone (not the browser's)
   * should be sorted in date and time order
   * should be sorted by title (if the date and time are the same)
   * overrides should indicate why they are overridden
     Note: if the user is a student and therefore only sees the event
     once, there should _not_ be an override indicator
   * should show more than one page of results for each type
     This is controlled by the 'api_max_per_page' and
     'syllabus_per_page' settings; default is 50 per page

 * interaction
   * hovering a mini calendar day
     * should highlight the day
     * should highlight associated syllabus events
   * hovering a syllabus event
     * should highlight the event
     * should highlight associated mini calendar day
     * should highlight associated (overridden) events
   * mini calendar next/previous buttons
     * should change the calendar month
     * should show indicators on days with syllabus events
   * "Jump to Today"
     * should change to today's month
     * should highlight today
     * should highlight syllabus events for today
   * "Hide/Show ... specific dates"
     * should not be visible unless there are overridden events
     * should collapse overridden events (events w/override indicators)
     * no mini calendar indicator for syllabus days that are now hidden

 * "Edit Syllabus Description" should still work

 * run qunit tests

fixes #CNVS-442

Change-Id: I25650fb939e7f18e771803e6a33822ca9b834a34
Reviewed-on: https://gerrit.instructure.com/16959
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-02-13 13:28:09 -07:00
Mark Severson 9b85dc6ce0 convert syllabus page javascript to coffeescript
test plan:
 * verify mini calendar navigation
   * including 'Jump to Today' link
 * verify hovering the mini calendar highlights syllabus events
 * verify hovering a syllabus event highlights the mini calendar
 * verify editing the syllabus description works

refs #CNVS-442

Change-Id: I611c19d5569fabf4a2ab91ebbb1c0892fb6f4b11
Reviewed-on: https://gerrit.instructure.com/17096
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-02-13 13:27:58 -07:00
Cody Cutrer af353779e5 Enrollment#sis_user_id convenience method
Change-Id: Ib37e4ce1d494b5489490c9d582793447188ebf16
Reviewed-on: https://gerrit.instructure.com/17528
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2013-02-13 12:58:29 -07:00
Jacob Fugal 82d9419244 allow specifying shards for HasManyAssociation#with_each_shard
this stub doesn't do anything with them, but specific sharding
implementations can use them, and the signature should allow that.

Change-Id: I11a27e52e1e98e7aa77818dcf5a00d829bdaef41
Reviewed-on: https://gerrit.instructure.com/17578
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2013-02-13 10:07:12 -07:00
Cody Cutrer 023e5151d0 limit facebook user searching to pertinent shards
closes CNVS-3834

test plan:
 * facebook app should still work

Change-Id: Ifd892a0b00afa173ec1d9d1f973955c3fbb806a1
Reviewed-on: https://gerrit.instructure.com/17662
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
2013-02-13 09:26:20 -07:00
James Williams b0a8cdb3a1 add option to include term info in course json for api
test plan:
* make an api request for a course, supplying
 "term" as an "include" option
* confirm that the response includes the
 tern name and id of the course

fixes #CNVS-3204

Change-Id: I1694736b35dc398e3f730b9365332d4ea23c93df
Reviewed-on: https://gerrit.instructure.com/17612
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-02-13 08:36:53 -07:00
James Williams e43827e68d fix account page course search autocomplete
fixes a javascript error on the course search box
on the account show page (e.g. "/accounts/1")

test plan:
* go to the account page for an account with
 at least one course
* type in the first few characters of the name
 of a course in the account
* confirm that a box for the course pops up
* confirm that clicking on the box takes you
 to the courses page

fixes #CNVS-1577

Change-Id: Iec2c589d8b02993adb7bf79840e9b900ab853be3
Reviewed-on: https://gerrit.instructure.com/17608
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-02-13 08:26:05 -07:00
Zach Pendleton 738f8f3951 allow edits of a discussion that has replies.
fixes CNVS-2987

previously, editing a discussion topic with replies of its
own would result in a circular JSON structure that would
result in the edit failing to persist.

test plan:
  * create a threaded discussion topic;
  * as a student or teacher (user A), reply to the original
    topic;
  * as a different user (user B), reply to the user A's
    response;
  * as user A, reload the page and attempt to edit your
    reply; verify that it saves without throwing a
    javascript error;
  * reload the page to verify that the edit was persisted;

Change-Id: I28795a65d4d19cbdb22c990e4630a570eddc66b0
Reviewed-on: https://gerrit.instructure.com/17606
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Eric Berry <ericb@instructure.com>
Tested-by: Eric Berry <ericb@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-02-13 07:40:21 -07:00
Brian Palmer d118c9ede1 don't log an ErrorReport for 450 Recipient address rejected
This isn't an actionable error. Though at some point it'd be nice to
display a message to the user if their emails are consistently failing.

Change-Id: Ia760214c355976592373404b03a41d9ff64034e7
Reviewed-on: https://gerrit.instructure.com/16566
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
2013-02-12 17:45:10 -07:00
Shawn Meredith d1a6006a1c jenkins build and rerun summary
Change-Id: I6f24cf17204006290c5e1108510bbe011bdd3305
Reviewed-on: https://gerrit.instructure.com/17405
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jake Sorce <jake@instructure.com>
QA-Review: Jake Sorce <jake@instructure.com>
2013-02-12 16:02:54 -07:00
Jon Jensen 62ab539d01 add course and account level large_roster settings, fixes #CNVS-3773
there is no ui for this (yet)

test plan: N/A

Change-Id: Ifed7192dc23b7e92681bd03bc68ad16ace509205
Reviewed-on: https://gerrit.instructure.com/17614
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2013-02-12 15:54:41 -07:00
Dave Jungst c94997f5ed added better css selectors to links
Change-Id: Ib26fe17d3dba3823e740043e41e4857aa5ffdc3a
Reviewed-on: https://gerrit.instructure.com/17648
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jake Sorce <jake@instructure.com>
QA-Review: Jake Sorce <jake@instructure.com>
2013-02-12 15:47:52 -07:00
Ryan Florence a70a6d91fc CollectionView and SearchView updates
- fixed issue where items weren't being inserted
  because they couldn't find the sibling element
  in CollectionView
- typos in View.coffee
- abort old requests in SearchView
- doc formatting changes

Change-Id: I0851d994338c8b5050865354b4e4bf4c3ffb1a45
Reviewed-on: https://gerrit.instructure.com/17618
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
2013-02-12 13:34:06 -07:00
Stanley Stuart fe4cbf8ee9 add varied due date functionality to the assignments edit page
closes CNVS-747

test plan:
  - go to the assignments edit page
  - you should be able to create new assignment overrides as a teacher
  - you should be able to update existing assignment overrides as a
    teacher
  - make sure you are able to delete assignment overrides
  - make sure that using the "add due date" button, you cannot add more
    overrides than the number of the sections of the course + 1 (the +1
    is for the due date representing everyone else.
  - make sure that you can not remove the last override when hitting the
    remove buttons to the right of overrides when you have more than one
    override.
  - make sure the remove button disappears when you only have one
    override, and reappears when you add an override.
  - ensure the dates you enter on this page propogate to the assignments
    show page and other areas of Canvas.

Change-Id: I974924797d9d4783c7f6ae93a25c356112fc0f54
Reviewed-on: https://gerrit.instructure.com/17342
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-02-12 13:23:22 -07:00
Simon Williams 5cc715b967 refactor assignment show/edit to use backbone
change and clean up the assignment show and edit pages to use new code
standards and to follow the style guide.  separates the logic for viewing and
editing an assignment and moves editing into a backbone model.o

closes CNVS-930

test plan:
- make sure you can still view and edit existing assignments.
- make sure all fields in the assignment form work (enable turnitin and
  assignment freezing for a comprehensive test)
- make sure submitting an assignment as a student still works
- make sure downloading and uploading submissions as a teacher still works
- make sure adding a new assignment group, group category, grading standard,
  and rubric still work
- make sure the show page renders correctly for both a student and a teacher.

Change-Id: I9ca6c5d56eb386d35a62f6b816a03ebebda662d4
Reviewed-on: https://gerrit.instructure.com/16823
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
2013-02-12 13:22:18 -07:00