Commit Graph

13297 Commits

Author SHA1 Message Date
Duane Johnson 447e51feb5 api docs: use array type instead of 'tags'
We had incorrectly implemented the swagger 1.2 spec with regard to
arguments that accept arrays. Rather than using a "tags" key, we
should have been using an "items" key. Change the canvas swagger
json generator to use "items": { type: "<type>" }

Test Plan:
- JSON output from `rake doc:api` should not have any "tags" keys
- JSON output should have, e.g. "items": { "type": "string" } in
  APIs whose arguments are array types and previously were
  described as "tags"

Fixes SIS-647

Change-Id: I262b1ced1d659332b430890fb5a2cf6e5c8909ee
Reviewed-on: https://gerrit.instructure.com/44246
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ken Romney <kromney@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Tyler Pickett <tpickett+gerrit@instructure.com>
2014-11-12 18:27:39 +00:00
Duane Johnson 80bb90078f bring API docs up to swagger spec
- conversations_controller
  - "properties", "audience", "audience_contexts", and
    "participants" were incorrectly using "type": "[string]"

- discussion_topics_controller
  - FileAttachment and DiscussionTopic ids were missing

- quizzes/quiz_submission_questions_controller
  - "answer" was missing a datatype

- sis_imports_api_controller
  - spec does not support arrays of arrays, so use array of
    strings for now

- submissions_api_controller
  - add Submission @model
  - reference the Submission model in return type of List-
    Submissions

- submissions_controller
  - remove Submission @model since it is not reference in this
    file (and must be referenced at least once for YARD to
    include it in its output)

Test Plan:
- make sure above changes don't break anything in API docs

Fixes SIS-648

Change-Id: I6c051c1e0ee58688b10f964272918c53b7e82c34
Reviewed-on: https://gerrit.instructure.com/44247
Reviewed-by: Ken Romney <kromney@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Duane Johnson <duane@instructure.com>
2014-11-12 18:17:16 +00:00
James Williams e57c1fb978 fix account settings page with account notification roles
test plan:
* on the accounts settings page, add a global announcement
* should not return an error after refreshing

fixes #CNVS-16850

Change-Id: I33c80c7abb95590fc43555006ddd3cf2c502907b
Reviewed-on: https://gerrit.instructure.com/44326
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
2014-11-12 18:12:41 +00:00
Sterling Cobb 01a1bffcb1 make editing profile page accessible
fixes CNVS-13993

Things were not being labeled correctly. They are now.

Test Plan

Given you've enabled profiles for your account
And you're using a screen reader
When you go to the profile page
And you edit the profile page
And you edit the "Bio" text
Then the bio text area should be labeled
And when you add or edit a link
Then the links title label should be read
And the links url should be read

Change-Id: I417948c62ec9fe34c805b350f0cdd39cde9c3109
Reviewed-on: https://gerrit.instructure.com/44272
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Sterling Cobb <sterling@instructure.com>
2014-11-12 17:27:51 +00:00
Sterling Cobb 8b528e45eb make external tool list accessible
fixes CNVS-14932

Items should have been displayed in a link and list. They are now
displayed that way so should work in screen readers.

Test Plan

Given you have an external tool configured for a course
When you go to the modules page
And you add a new module item
When you select the "External Tool" dropdown option
Then you should see the external tool listed
And you should be able to click on it whith a mouse
And you should be able to select it with the screenreader and keyboard

Change-Id: I3ace34739c0eda3e45dc53df2d13f48cdf69077b
Reviewed-on: https://gerrit.instructure.com/44229
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Sterling Cobb <sterling@instructure.com>
2014-11-12 17:27:45 +00:00
Sterling Cobb 981f397033 add a file not found error message
fixes CNVS-16157

Currently if you try to go to a file link that doesn't exist, it will
just show you a page not found error. This leads people to contact
support. Now, you see an error message that tells students to contact
their instructure.

Test Case
As a teacher
Given you have exported a course, but only export a courses wiki pages into a canvas
package
And that course you exported has a link to a file in the wiki page
And you create a new blank courses
And import your export the exported course into the new blank course
Then when you navigate to the new courses wiki page
And click on a link in the wiki page
Then an unauthorized access page should appear
And that page should instruct students to contact their instructor

Change-Id: Ic926bb06c931fd61bc56bd42fe6d8b7edefeefae
Reviewed-on: https://gerrit.instructure.com/42475
Reviewed-by: Sterling Cobb <sterling@instructure.com>
Product-Review: Sterling Cobb <sterling@instructure.com>
QA-Review: Sterling Cobb <sterling@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
2014-11-12 17:26:36 +00:00
Dan Minkevitch 7c130e409d Adds email/phone validation to "Add Email/Contact"
Adds client-side validation to the modals in the user
settings for adding "Ways to Contact".

fixes CNVS-16681

Test Plan:
* Log in as a Student
* Go to Settings (/profile/settings)
* Click "Add Email Address" under "Ways to Contact"
  on the right sidebar
* In the "Email Address" field, add an invalid email
  address/<script> tag/link/etc.
* Click "Register Email"
* It should display an error saying the email address
  is invalid

Change-Id: I5c31901f304f117d14b52ebf262dea0dbed2ddd7
Reviewed-on: https://gerrit.instructure.com/44273
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
2014-11-12 17:18:50 +00:00
Aaron Cannon 675ddfe4e3 A11y: Assignment due dates are now read by screen readers
Fixes CNVS-16169

Test plan:
- Create assignments with and without due, start, and end dates.
- Using a screen reader, on the show assignment page, verify that such dates
  are visible to screen reader users, and all of the  information contained
  in the tooltip that shows up on hover is also read.
- Verify that appropriate text is read when no date is set.
- Verify that the visual appearance remains unaffected.

Change-Id: I0daaf64945673f5187602454a122ddf79290ad6c
Reviewed-on: https://gerrit.instructure.com/44030
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2014-11-12 17:12:10 +00:00
Jon Jensen 5e82318681 spec: don't run content migration specs twice
also speed up large_courses specs (3:26 -> 0:26)

Change-Id: Ie2447b14d1829851762d1cd133adaaaeafe97a04
Reviewed-on: https://gerrit.instructure.com/44316
Reviewed-by: Hannah Bottalla <hannah@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-11-12 16:32:01 +00:00
Karl Lloyd 51ceed0f40 update link in api doc to request a Developer key
Change-Id: I1f3e47d253eea6a16b9fecaf8fe3e5eb5c5381a4
Reviewed-on: https://gerrit.instructure.com/43516
Product-Review: Brad Humphrey <brad@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
QA-Review: Brad Humphrey <brad@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-11-12 16:07:26 +00:00
James Williams 193b95ed29 UI and API update for role overrides to allow editing name
also a bit of refactoring

test plan:
* test the role_overrides update API endpoint and confirm
 that a custom role's name is able to be updated
 (using the "label"  parameter)
* test the permissions UI, confirming that you can edit
 the name of a custom role and all things behave as before

closes #CNVS-14159

Change-Id: Ib6d5b08b96293d7b660a047bce4e2342f6d52e65
Reviewed-on: https://gerrit.instructure.com/43936
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2014-11-12 15:29:36 +00:00
James Williams 7372523690 refactor role type definitions to fix circular dependencies
Change-Id: I7cca4a22ef7dc310ba1b94fd81d67854a6fe1daf
Reviewed-on: https://gerrit.instructure.com/43833
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-11-12 15:29:33 +00:00
Jon Jensen 2e9bd0197e fix lolcalization
this broke w/ the i18nliner commit

test plan:
1. run canvas w/ LOLCALIZE=true
2. there should be lols

Change-Id: I346fca2d6ebf243849e07990673fadf5aba50e3b
Reviewed-on: https://gerrit.instructure.com/44288
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Michael Ziwisky <mziwisky@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-11-12 00:16:01 +00:00
Josh Simpson 9975ca24df add submission_versions to user_merge
refs CNVS-16530
closes CNVS-16568
This commit addresses the fact that while the versions table is handled
in user_merge, submission_versions (a proxy, indexable table) is not.

Test plan
- Create two users, A and B
- Enroll users A and B into a course with 3 assignments
- Grade one assignment for user A
- Grade a different assignment for user B
- Grade a third assignment for both users
- As a teacher, make a request to the gradebook history api
(/courses/:course_id/gradebook_history/feed?user_id=:user_id)
for both users
- Note the data returned (scores should be distributed per user as they
  were graded prior)
- Merge user B into user A
- The grades for user A should reflect the grades for user B, as well as
  their original grades

Change-Id: I9557b14875f4276ad18c219a456408a0a959d2ff
Reviewed-on: https://gerrit.instructure.com/43603
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2014-11-11 23:52:23 +00:00
Nick Houle 97785c9d7e add translations to SIS Import plugin
fixes SIS-627

Test Plan:
- To allow Canvas to be translated you must start canvas with
  these options:
-- RAILS_LOAD_ALL_LOCALES=true USE_OPTIMIZED_JS=true rails s

- Confirm all translations in these screenshots are translated
-- http://screencast.com/t/DUuU85s0
-- http://screencast.com/t/HDawR9681i
-- http://screencast.com/t/QOVas4gfd

NOTE:
- If you're using the LOLCALIZE=true option to test translations
  months, days, etc. will not be translated by LOLCALIZE but will be
  translated in another language.
- If you're using Spanish or French as the language be aware that
  some of the short hand months are the same as english becasue
  they are related closely to english.

Change-Id: Ia14a3ec4408f40c9bcdd309c7088c5165519a1f9
Reviewed-on: https://gerrit.instructure.com/43983
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jayce Higgins <jhiggins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Nick Houle <nhoule@instructure.com>
2014-11-11 23:45:26 +00:00
James Williams 46bdd91fda fix add_role_id_columns for inactive roles
Change-Id: I19d60fee85e4cb4cd1bddf606adc53be1caa36eb
Reviewed-on: https://gerrit.instructure.com/44296
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-11-11 22:38:49 +00:00
Ahmad Amireh da11cb0cbd QuizLogAuditing - JS core
- workflow for modular event tracking
- two basic event trackers: PageFocused and PageBlurred
- events are buffered, and are stored in localStorage when possible
  - they will also be (re)loaded when the page is reloaded
- events can be submitted in bulks to the API

backend changes:

  - renamed "answers" column to "event_data"; answers is now an alias
    for nicer API when dealing with EVT_QUESTION_ANSWERED events
  - renamed EVT_ANSWERED to EVT_QUESTION_ANSWERED for consistency with
    how we're naming events
  - API now accepts and stores the "event_data" attribute
  - The optimizer in the Snapshot parser is now more aggressive; it will
    do as many passes as needed to achieve 0 data redundancy

Closes CNVS-16177

TEST PLAN
---- ----

  - create a quiz
  - take it
  - open the developer's console, go to the Resources tab and also leave
    the console open (i left some messaging in to make this easier)
    - move the cursor out of the window then back in
    - look at the console, you should see messages like
      "Enqueuing event ... for delivery"
    - click the little reload/refresh icon in the dev tab
      + verify you see an entry called "qla_events"
      + the value of this entry should be a JSON that looks something
        like what's shown below
    - in a few seconds, if you look at the Network tab, you will notice
      a request to a URL like
      "/api/v1/courses/1/quizzes/1/submissions/1/events"
    - (optional) look up the records in the database and verify they
      make sense (don't really need to do this if the request was
      successful :)

Sample of PageFocused and PageBlurred events serialized in localStorage:

    [
      {
        "type": "page_focused",
        "created_at": "2014-10-09T14:55:50.887Z"
      },
      {
        "type": "page_blurred",
        "created_at": "2014-10-09T14:55:51.131Z"
      }
    ]

Change-Id: I7efbbef281faece5df90f09c299bfa3260abcff6
Reviewed-on: https://gerrit.instructure.com/42466
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-11-11 22:25:02 +00:00
Ben Young fc0c786b29 Parse formula question values to float when sorting for median
Fixes CNVS-1630

Test plan:
- Add a formula question to a quiz.
- Add a median formula with 3+ values.
- Generate a large number of possible combinations.
- Check all of these to verify that the correct number is given as the median.

Change-Id: I909ed89cb26be248b0fa012822735fd032c1e577
Reviewed-on: https://gerrit.instructure.com/43541
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-11-11 22:19:06 +00:00
Ethan Vizitei 22fb7ca76e add specs for preventing nil zones in util presenters
refs CNVS-16799

No behavior change, just proving that when you
explicitly pass in a nil object to a date or time
presenter as a zone override, it uses the default
Time.zone correctly. the actual behavioaral change
went out in a hotfix in /c/44148

TEST PLAN: specs should pass

Change-Id: I59da9cf68d5738b1006ae1579db2946731468539
Reviewed-on: https://gerrit.instructure.com/44159
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2014-11-11 22:10:04 +00:00
Rob Orton c627167636 add missing dropped columns to dropped columns.rb
refs CNVS-15481

Change-Id: Id9e0a0ce5fc671b52948a1376e95bf54b57c471a
Reviewed-on: https://gerrit.instructure.com/44256
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2014-11-11 21:48:36 +00:00
Clay Diffrient 2aa6871c25 Improves a11y for the content migrations page.
Adds a new flash message type for screenreader which is exclusively announced.

closes CNVS-15142

Test Plan:
	- Go to the course migrations (using a SR of course)
	- Start a migration
	- The SR should announce that a migration was queued.
	- The SR should announce progress being made on the migrations.

Change-Id: Idec9dc27ea81a3a2617670b9e255f5a37565bd57
Reviewed-on: https://gerrit.instructure.com/43933
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2014-11-11 20:38:14 +00:00
Clay Diffrient 8f07642cb1 Improves folder renaming with keyboard navigation
fixes CNVS-16810

Test Plan:
	- Enable Better File Browsing
	- Use your keyboard to go to the add folder button
	- Add a folder and press 'Enter' to finish it.
	- Focus should be on the new folder
	- Add a folder again, but this time press 'Escape' to cancel editing
	- Focus should be back on the Add Folder Button
	- Use your keyboard to go to a file and use the gear menu to
	  edit it's name, press enter.
	- The file should have focus
	- Edit a name again, this time pressing escape to cancel
	- The file should have focus

Change-Id: Ic6eb42943ca757c49cd8d9e65bea4f4af006c8d0
Reviewed-on: https://gerrit.instructure.com/44221
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2014-11-11 20:37:58 +00:00
Clay Diffrient c88572d32c Makes the view option truly hidden on New Files
fixes CNVS-16809

Test Plan:
	- Enable Better File Browsing
	- Go to the search box (with no files selected)
	- Press tab
	- Focus should go to the "+Folder" button, not the hidden View link.

Change-Id: Iac7371dc3b178359b55aeb279194dccfcf525ca4
Reviewed-on: https://gerrit.instructure.com/44206
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2014-11-11 20:37:44 +00:00
Ahmad Amireh cb498b345f canvas-partman & quiz log auditing partitioning
A small gem for abstracting partitioning at the model layer, as well as
helpers for dynamically creating the partitions needed for quiz
submission events.

You can read more about the gem's API in its README file.

Closes CNVS-16795

TEST PLAN
---- ----

  - check out the patch
  - run `bundle exec rake db:migrate`
  - run `bundle exec rake canvas:quizzes:create_event_partitions`
  - run the rails server and visit any page:
    + if you got this far, and jenkins has passed, things are good

Change-Id: I7d6b77c62db8510e09a54fbae00048a14b5366bb
Reviewed-on: https://gerrit.instructure.com/44145
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-11-11 19:06:00 +00:00
Cody Cutrer 63faa87f67 fix sharding skip for rspec 3
fixes CNVS-16812

Change-Id: If638a2cc3d9a72746af5b66fa86411a5e7b0c22b
Reviewed-on: https://gerrit.instructure.com/44200
Product-Review: Rob Orton <rob@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-11-11 18:55:35 +00:00
Benjamin Porter 20a1406c9a Create Outcomes: Make "New Outcome" go away when clicked
When creating a new outcome, the default title is "New Outcome".  In
almost every case, the user wants to change the title.  When they click
the text box, we will now erase the default title for them.  We only do
this the first time it is created, so if the outcome is saved with the
default title of "New Outcome" we won't wipe out the title the next time
it is edited

Fixes CNVS-16763

Test Plan:

    - Create an outcome
    - Click in the title text box
    - Observe that the title is a placeholder that disappears when you
      start typing

Change-Id: If39c3aaef375254f57d6759fbde801711ddab142
Reviewed-on: https://gerrit.instructure.com/44066
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
2014-11-11 17:42:59 +00:00
Jacob Fugal 957e21be15 specs: explicitly require JSON
fixes CNVS-16777

rails autoloading doesn't always work in gem-engines, I haven't tracked
down the root of the behavior, but I found a lot more explicit requires
necessary in analytics as well.

Change-Id: I780d2176dc4e1da12687b217806069647d2d31b7
Reviewed-on: https://gerrit.instructure.com/44255
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
2014-11-11 17:39:04 +00:00
Sean Lewis e1279dbc8a spec: fix quiz question creation spec
it was expecting an item that doesn't exist
so i changed it to look for the quiz title item

Change-Id: Ic1902aa40a7d74217aa93ef4e17e545635768f4a
Reviewed-on: https://gerrit.instructure.com/44227
Product-Review: Kyle Rosenbaum <kyler@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
QA-Review: Kyle Rosenbaum <kyler@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-11-11 17:24:15 +00:00
Jahnavi Yetukuri 9726a390a2 Fix errors in context_modules_spec.rb
Change-Id: Icb907b3498882bde9ce34d52412a899a464ef8bc
Reviewed-on: https://gerrit.instructure.com/44129
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
QA-Review: Kyle Rosenbaum <kyler@instructure.com>
2014-11-11 16:31:37 +00:00
James Williams 6272acceb4 improve add_role_id_columns migration performance
Change-Id: I6550a53b2cde3ff9e5638c5af9c60ed77698e9b7
Reviewed-on: https://gerrit.instructure.com/44208
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-11-11 14:47:02 +00:00
Benjamin Porter f78fd9a755 Rubrics - Change "Find Outcome Criterion" to "Find Outcome"
Fixes CNVS-16760

Test Plan:

    - If necessary, add an outcome
    - Create/edit an assignment and click "Add Rubric"
    - Observe that the text next to the magnifying glass says "Find
      Outcome" instead of "Find Outcome Criterion"

Change-Id: I1026224351b1f4b6466de64bc26b230618431d51
Reviewed-on: https://gerrit.instructure.com/44060
Product-Review: Hilary Scharton <hilary@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
2014-11-11 03:20:54 +00:00
Sean Lewis c2e94b1e51 spec: remove assignment tab spec
nuke the assignment header tab spec since we removed that tab
from canvas

Change-Id: I13e60548e2dd32648233b85c877309cc7f46389d
Reviewed-on: https://gerrit.instructure.com/44223
Product-Review: Kyle Rosenbaum <kyler@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
QA-Review: Kyle Rosenbaum <kyler@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-11-11 00:24:48 +00:00
Rob Orton b0cccba800 fix admin controller index api find
fixes CNVS-16807

test plan
 - account admin index should find user by sis_id

Change-Id: Ife67825c388c9d08802e12e2bfc2155aee573da1
Reviewed-on: https://gerrit.instructure.com/44219
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2014-11-10 23:36:58 +00:00
Cody Cutrer 0c5e957e12 validate group_category_id in discussion topics
refs CNVS-16708

test plan:
 * post a new discussion topic for a group
 * it should work

Change-Id: I0e98b1000383297f21273fe66f2175af9a69d009
Reviewed-on: https://gerrit.instructure.com/43874
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <braden@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-11-10 22:59:52 +00:00
Shawn Meredith 5173e51a09 spec: intermittent specs pending while fixed
Change-Id: I596b52ec545c5240335864d7c269dc542e49206b
Reviewed-on: https://gerrit.instructure.com/44216
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
2014-11-10 22:34:58 +00:00
Braden Anderson adaa82e3fe LTI: include_host for return_url on new_tab launches
test plan:
  * create an LTI assignment with "Launch in a new tab" enabled
  * launch the assignment
  * verify that, in the POST request, the launch_presentation_return_url
      parameter includes protocol and hostname

Change-Id: I54e903cf7916627ed77a2a0cccb4b95da40c6316
Reviewed-on: https://gerrit.instructure.com/43726
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2014-11-10 21:30:36 +00:00
Brad Humphrey 732551f72d refactor lti setting/selection_type to placements
- specs should pass

Change-Id: Iefdeb4b4dbc4a878fd11c7b4dec8caa81c741084
Reviewed-on: https://gerrit.instructure.com/42922
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Brad Humphrey <brad@instructure.com>
2014-11-10 21:28:20 +00:00
Rob Orton 4c86adfed9 allow api_ids on admin controller index
fixes CNVS-16807

test plan
 - account admin index should find user by sis_id

Change-Id: Idecb3b606e189c1e8f062498092357462efd4b90
Reviewed-on: https://gerrit.instructure.com/44163
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-11-10 20:42:07 +00:00
Shawn Meredith c7b95e817d spec: selena rspec specs shared spec fix
Change-Id: Ia0c90b7ed0a140c5e0ae69c9bb7a3034f774de5e
Reviewed-on: https://gerrit.instructure.com/44183
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2014-11-10 19:50:18 +00:00
Derek DeVries 14591b07ad remove non-draft-state features from quizzes
fixes CNVS-16048

test plan:
  - do regression testing around publishing / unpublishing quizzes
    - all publishing / unpublishing scenarios should work correctly
    - make sure to check publishing on:
      - quizzes#index
      - quizzes#show
      - from modules
      - from module items
    - make sure that warnings about unpublished quizzes work
    - make sure that warnings about not being able to unpublish quizzes with
      submissions work
    - make sure that the module sequence footer still works on the quizzes page
    - make sure we can still review published quizzes in speedgrader

Change-Id: I1112e3b28ed6388077bfc165056bb1ab0d84b3fd
Reviewed-on: https://gerrit.instructure.com/42258
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-11-10 19:15:24 +00:00
Sterling Cobb 042dfb3233 add keyboard shortcut help to syllabus
fixes CNVS-16721
fixes CNVS-15961

This adds the blue help icon next to HTML Editor text.

Test Plan
As a user that can edit the syllabus
When you go the the syllabux page
And you click on the 'edit' button
Then you should see the tinymce editor
And there should be a blue help icon next to "HTML Editor"
And clicking on it should show the keyboard shortcuts help menu

Change-Id: I3e629506b9c331a7d4a3640d0bceb4071506f21f
Reviewed-on: https://gerrit.instructure.com/43971
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
2014-11-10 18:23:08 +00:00
Sterling Cobb cd0e4ee27d add tinymce help menu when creating or editing wiki pages
fixes CNVS-16720

The help icon should now appear next to the toggle the tinymce
editor/html button.

Test Plan
- Test this on both the new wiki page and edit wiki page
As a user that can creating or editing a wiki page
When I'm on the new wiki page, or edit wiki page
I should see a help icon next to "HTML Editor" text (blue circle with
"i" in it)
Clicking the help icon should open the shortcut help dialog

Change-Id: Ic988af3bda092d053e683edc0c0b1ef53cac2fd4
Reviewed-on: https://gerrit.instructure.com/43963
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
2014-11-10 18:19:12 +00:00
Shawn Meredith e6c68202d7 spec: tweak single thread sel spec rake
Change-Id: Ia7c9a7eb2219b04dcbea2650a168d42446e9ae3f
Reviewed-on: https://gerrit.instructure.com/44070
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2014-11-10 18:04:50 +00:00
Mark Severson 54f34c67ca allow lti tool to set a beforeunload message
refs CNVS-16272

test plan (in supported browsers):
 * post this message from an lti tool:
    parent.postMessage(JSON.stringify({
      subject: 'lti.setUnloadMessage',
      message: 'Interrupting navigation'
    }), '*')
 * attempt to navigate away from the page
 * a navigation confirmation dialog should be shown
 * post this message from an lti tool:
    parent.postMessage(JSON.stringify({
      subject: 'lti.removeUnloadMessage'
    }), '*')
 * attempt to navigate away from the page
 * the navigation should be successful without a confirmation

Change-Id: I9b41d18b79e7830145445137a75c01aeb61f748c
Reviewed-on: https://gerrit.instructure.com/43844
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-11-10 17:57:41 +00:00
Simon Williams bbd7ffa7d7 fix default zone argument
Stepping through the code, old and new, zone is set to nil when the call
to ::Time.zone happens in the default argument position, but not when it
happens as the first line of the function.  I don't yet know why.

fixes CNVS-16799

test plan:
- create an assignment with a due date
- view the assignment as a student.  the due date should match

(repeating test plan from commit that caused the regression)
- Create a new course shell and go to the courses settings page and set
  the courses time zone as Eastern and save the change.
- Create a new assignment and put a due date of whatever day you want,
  but have the time be 11pm and save it.
- When the page reloads, hover your mouse over the due date.
- The due date should be correct (on the day after).

Change-Id: I048d766f1552f2c244b5cdebbd7cc3445ed92969
Reviewed-on: https://gerrit.instructure.com/44148
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-11-10 16:15:12 +00:00
Jayce Higgins d72e2b2923 Fixes post-grade date picker to not stick on last change
Fixes: SIS-383

Modifies the date picker to check onClose instead
of on change, so that no update is made to the
errors count until the calendar is no longer up.

Test-Plan:
--With Post to SIS feature flag turned on--
1.) Make at least 1 assignment with no due date
2.) Navigate to grades
3.) Click post to sis
4.) Verify that you can update the due-date without
	it locking the calendar on the screen

Change-Id: I7ca143343d65393e5012a62f5b757b1caf47d936
Reviewed-on: https://gerrit.instructure.com/43886
Reviewed-by: Nick Houle <nhoule@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
2014-11-10 16:05:06 +00:00
Rob Orton 95a6ecc63c fix routes issue on forgot_password
fixes CNVS-16791

test plan
 - forgot password should work

Change-Id: I0bbbfe96d569f4fef1f7666edc3ddaa013f698f4
Reviewed-on: https://gerrit.instructure.com/44142
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-11-08 21:33:05 +00:00
Jacob Fugal 34288b6986 single shard transaction on stream item generation
fixes CNVS-15415

we suspect the accidental use of user_ids when it meant user_ids_subset
(the subset of user_ids local to Shard.current) could contribute to long
run times of this method when user_ids is moderately large and contains
ids from multiple shards. users is a busy table and trying to grab locks
on it unnecessarily is both slow and adverse to other users.

additionally, the only reason for the updates on the users is to
invalidate cache entries; give a little personal space on users that may
have already been updated very recently; it's highly unlikely that the
relevant caches have already been repopulated in those few seconds, and
if they were, a little cache staleness on stream items isn't the end of
the world.

Change-Id: Ibbda9af75aa0e727bd2e7d0a128ee2e3470433eb
Reviewed-on: https://gerrit.instructure.com/44045
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
2014-11-08 17:03:33 +00:00
Brian Palmer 35f1d2f8db fix conferences routes to allow GETs again
for now

Change-Id: I6db47d461961bfc83a8d3d1e6f5c060616879c16
Reviewed-on: https://gerrit.instructure.com/44137
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-11-08 16:10:17 +00:00
Cody Cutrer c7b7deb633 bump canvas-jobs
Change-Id: I787ea4e49f1196aada27a8f170cb00d52408c6e1
Reviewed-on: https://gerrit.instructure.com/44130
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>
2014-11-08 01:23:36 +00:00