Commit Graph

12834 Commits

Author SHA1 Message Date
Cody Cutrer 9157d52bc5 bump encrypted_cookie_store
it has a rails 4 fix

Change-Id: I059d0d59ceb9db3e1ce6fe03c992d26470858d43
Reviewed-on: https://gerrit.instructure.com/42077
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-10-01 15:03:20 +00:00
James Williams 5a5c1c33e8 fix assessment content id prepending
test plan:
* create a course
* import a quiz into it (doesn't matter how)

* import a qti/cc file, making sure not to check
 the "overwrite content box"
* re-import the same file, this time, checking the
 "overwrite content box"

* should have overwritten the assessment content

closes #CNVS-15844

Change-Id: I13532e2c4cbd332d2a4d84a2339dcc529df1b167
Reviewed-on: https://gerrit.instructure.com/41826
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-10-01 13:20:11 +00:00
James Williams 0054e3940d show the true published state for module items
test plan:
* reproduce a state where a module item's content has
 a different workflow state than the module item (either
 manually or through a reproduction step for one of the
 associated tickets)
* should show the true workflow state of the item on the
 modules page

close #CNVS-15400

Change-Id: I72e3caf335fee112266da526c4efd2272820e0f2
Reviewed-on: https://gerrit.instructure.com/42002
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-10-01 11:29:47 +00:00
Transifreq 20259c000c Updated zh_Hant translation
Change-Id: Ie4ae9dc061380b489385228cf69b5cbd020996f5
2014-10-01 05:06:57 -06:00
Derek DeVries dfca01f13c fix issue when a student visits a manually unlocked quiz with one time results
fixes CNVS-15869

test plan
  - as a teacher
    - create a quiz
      - with a lock date in the past
      - give a time limit
      - allow multiple attempts
      - let students see their quiz responses
        - only after their last attempt
        - only once after each attempt

    - moderate the quiz
      - manually unlock the quiz for a student

  - as a student
    - attempt to take the manually unlocked quiz
    - you should be able to take it

Change-Id: Idd0ee39f818439ad12f4da5436f2bd02fd4a36b9
Reviewed-on: https://gerrit.instructure.com/41882
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Ahmad Amireh <ahmad@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-10-01 07:20:53 +00:00
Benjamin Porter a25ec862a0 SubmissionsController - download files when we're supposed to
When the link on the page says download, the user expects the result
to be that the file is downloaded rather than displayed inline.

The FilesController is responsible for the actual downloading,
and it uses a parameter called :download_frd that is set to
true to indicate a forced download instead of displaying inline.
When :download_frd is true, a special header is sent to the
browser instructing it to download the page.

Because the SubmissionsController receives the request for the file,
a redirect is made from the SubmissionsController to the
FilesController.  Previously the Subissionscontroller was omitting
the :download_frd parameter from the redirect.  This fixes that.

Test Plan:

1. Create an assignment that allows text type file submissions
2. As a student - submit an affected filetype (.txt, .c, .py, .html,
.css, etc)
3. As the instructor - view the submission in speedgrader
4. Click on "download the file" button and see that it now downloads
correctly

Fixes CNVS-8898

Change-Id: I568d8a52eb430895316cf04414e73e1081643e70
Reviewed-on: https://gerrit.instructure.com/41629
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
Reviewed-by: Matt Berns <mberns@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
2014-09-30 23:26:16 +00:00
Cody Cutrer 95ecf20e73 use Rails' base_class
and remove base_ar_class, that does the same thing

Change-Id: Id76a2dcc375cfea397ff4b4853f50d660b6b044c
Reviewed-on: https://gerrit.instructure.com/41783
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-30 21:14:22 +00:00
Cody Cutrer 0f139489b0 clean up routes for rails 4
fixes CNVS-15128

 * don't use :as when it's already what it will be
 * use get/post/delete instead of match, to specific the actual
   method allowed
 * don't use 'path' => 'controller#action' when the action is the
   default; just use :action
 * use as instead of path_name (path_name is gone)
 * use path instead of path_prefix (more inline with rails 4 options)
 * make ApiRouteSet not duplicate the same route name
 * remove a few duplicate route names
 * since I rewrote most the file anyway, fully convert to 1.9 hash
   syntax

Change-Id: I6666f3b9839572916ac0b20cc20c6e44c18f803c
Reviewed-on: https://gerrit.instructure.com/41557
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-09-30 21:14:08 +00:00
Erin Hallmark 8940f42a1e reworded sentence to address comma splice and typo
Change-Id: I6e1593e74c47ce681951af8bf2631e2ee08ad439
Reviewed-on: https://gerrit.instructure.com/41218
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-09-30 20:55:18 +00:00
Dan Minkevitch 02c66e208e Fix permissions and multi-select for SearchResults
Before, you were not able to select multiple items when searching
for files.  You also wouldn't be able to edit those items even
if you had manage_files permissions.  This fixes both of
those bugs.

fixes CNVS-15800
fixes CNVS-15834

test plan:
- Enable Better File Browsing feature flag
- Go to any course's Files section
- Search for an existing file
- Click on the search result(s) in the main file pane
- A toolbar should appear above allowing you to
  view and download the file(s), as well as other
  editing abilities if you have manage_files permissions.
  Also, if you have manage_files permissions, a PublishCloud
  button should appear on each search result item,
  as well as additional options in the ItemCog to edit, move,
  etc that file (more than just the Download link).

Change-Id: Ie818fd1cf4cd7dcaa0520260babf5a540ca816e4
Reviewed-on: https://gerrit.instructure.com/41801
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
2014-09-30 20:35:00 +00:00
Ryan Taylor 1c6eaa8d5d Controller/model features for Outstanding Quiz Submissions
Outstanding quiz submission management is now contained in a dedictated
model, and this controller action provides access to the quiz scoped
actions of #search and #grade.  The API endpoint provides JSON access to
these actions.
Closes CNVS-15501
Test Plan:
  - Create quizzes with outstanding (unclosed, but overdue) quiz submissions
  - Hit the endpoint
  /api/v1/courses/:course_id/quizzes/:quiz_id/outstanding_quiz_submissions
  - GET JSON to retrieve quiz_submissions which are outstanding
  - POST JSON with something like {"quiz_submission_ids": [1,2,3,4]} to grade the QS
Change-Id: I7fe0341379d4dbd70ed25c667bd1c4dc7969b077
Reviewed-on: https://gerrit.instructure.com/41229
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Ryan Taylor <rtaylor@instructure.com>
2014-09-30 19:46:01 +00:00
Cody Cutrer 826a20fa08 update active_polymorph for rails 4.0
fixes CNVS-15774

test plan:
 * take a quiz. it shouldn't asplode

Change-Id: I090fc549cd5d7986d6963fb4ae6be441eda2c675
Reviewed-on: https://gerrit.instructure.com/41659
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-09-30 19:17:42 +00:00
Cody Cutrer 1f8028f163 don't use preload_associations
it's a shim of the rails 2 variety, and breaks in rails 4 in the
common case because the options became a scope

Change-Id: I712a8fed35ee0a9747a13c1495f7d51b8dac6823
Reviewed-on: https://gerrit.instructure.com/41716
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-30 18:04:00 +00:00
Cody Cutrer 5cfaa2c031 remove AR serialization overrides
fixes CNVS-15784

restores default behavior of a nil column returning a blank object,
rather than nil

had to adjust turnitin code that expected a nil rather than blank,
and a few specs

test plan:
 * regression test turnitin integration

Change-Id: I62968cabdba15f2e59ebdfed9b946781a1b0561c
Reviewed-on: https://gerrit.instructure.com/41647
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-30 17:58:12 +00:00
Jason Madsen 596848acc0 implement drag and drop upload
closes CNVS-11668

test plan:
  - enable new files UI feature flag
  - in the new files interface:
    - drag a file from your OS to the folder area in the canvas UI
    - UI should update to reflect a dropable zone
    - drop the file
    - UI should return to normal state
    - previous upload process should take over

Change-Id: Ifbf66eec86f431c5d29a50b3e6e05e21b20bc410
Reviewed-on: https://gerrit.instructure.com/41670
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-09-30 17:26:50 +00:00
Ryan Shaw bf2d25d962 speed up & simplify rails controller for newfiles
fixes:  CNVS-15789

we don't need to do this check if a user can
"read_contents" of the root folder of the course
because if they can't the api request to get it
will just 401.

Change-Id: I4787bb8c3340f9215f7bfadf6e708e7c29a38aaa
Reviewed-on: https://gerrit.instructure.com/41705
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2014-09-30 16:29:47 +00:00
Bracken Mosbacker a9f3d373cd add enrollment_term_id to courses api response
this is core information about a course and should be included

Test Plan:
 * Fetch a course through the api at both /courses and accounts/:id/courses
 * the enrollment_term_id should be on the course object

closes PLAT-665

Change-Id: If60e347fc40dc2c510ba999f05e058ea3bccbcc7
Reviewed-on: https://gerrit.instructure.com/41943
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-09-30 16:01:41 +00:00
Cody Cutrer a5e8c6e352 bump switchman
rails 4 compatibility issue

Change-Id: Ib663144fa32ae33df93e8159a6959f07e1889248
Reviewed-on: https://gerrit.instructure.com/41781
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-30 14:40:33 +00:00
Ahmad Amireh 4b9c41bf82 Update Respondus SOAP endpoint to use Quizzes NS
Since the namespacing of Quizzes, their "asset_strings" have become
"quizzes:quiz" instead of just "quiz" which was causing this endpoint to
not locate the quiz objects from the content migration.

Closes CNVS-11732

TEST PLAN
---- ----

See https://www.pagehub.org/canvas/quizzes/tickets/cnvs-11732#test-plan

Change-Id: I97369f9c50881dc1c6541fc0a824d9f332c99e0e
Reviewed-on: https://gerrit.instructure.com/41905
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-09-29 22:53:51 +00:00
Sean Lewis dd09f32384 fix submitting on assignment with # in url
added if statement to catch urls with lone #'s at the end when
  submitting assignments

  fixes CNVS-15812

  Test Plan:
  -Navigate to a published file upload assignment as a student.
  -Submit the assignment with a file.
  -Notice it succeeds.
  -Add a #<any text here> to the end of the assignment url so it should
  look like this: /assignments/:id/#<your text here> and refresh the
  the page until it actually reloads.
  -Submit the assignment again.
  -Notice it submits successfully
  -Navigate to /assignments/:id/# (make sure it actually reloads the page)
  -Submit the assignment.
  -The page should refresh and the Submit section of the page should have disappeared.
  

Change-Id: Ic81b4e7e51de96a20f7eae8c2fa609b82be6965a
Reviewed-on: https://gerrit.instructure.com/41756
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-09-29 21:52:28 +00:00
Cody Cutrer efc2a6ee4f disable_ddl_transaction! is built into rails 4
Change-Id: I04d12180680b9cb85b5797ca3dbab0aff912c503
Reviewed-on: https://gerrit.instructure.com/41791
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-29 20:42:06 +00:00
Matthew Berns 6dfa8242ce fixed speech to text and true/false check for Chrome
Chrome's x-webkit-speech was deprecated, replaced it with javascript API
added functionality:
now actively tracks interim results and displays them to the user
added variety of error messages and prompts

fixes CNVS-13432

test plan:
- use Chrome (Version 35 or 36)
- navigate to an assignment, then to speedgrader
- click the microphone/pencil icon under the comment box
- dialog should pop up. Click record (then 'allow' if prompted)
- begin speaking
- interim results should appear in blue while talking
- final results should turn black
- when you hit stop, spoken text should appear in comment box
- should generate error for mic not allowed or no text spoken
- should bring up error if recording times out after long silence
- cancel button should discard spoken text w/out adding comment
- ensure mic does not appear in FF, Safari, or IE

Change-Id: I46eae92892dd37e0a3906023150653aaaf2e2ece
Reviewed-on: https://gerrit.instructure.com/38833
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-09-29 18:14:03 +00:00
MFairbourn f0237cd84b fixes typo for CNVS-15738
Test plan:
- Ensure that " Better File Browsing" feature flag is enabled
- Select the course
- Click on Files from the left navigation panel
- Select Multiple files in the right hand pane
- Download Zip button is displayed in the top
- Verify hover over tool tip text on the button is' Download Zip'

Change-Id: I2ce5664a1dbf89e43d71de34116045692983df1c
Reviewed-on: https://gerrit.instructure.com/41861
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-09-29 17:02:46 +00:00
Dan Minkevitch d6d09ec9b5 Bug fix for pressing enter key on add course form
Before this fix, if your pressed or held down the enter key
when creating a course on the Add Course dialog, duplicate
courses would be created.  This prevents that from happening.

fixes CNVS-13480
fixes CNVS-14154

test plan:
- Go to one of your accounts
- Click the "Add a New Course" button
- Put in a Course Name and Reference Code
- Press Enter
- The form should only submit once and only one course
  should be created.
- Go to /courses
- Click Start a New Course
- Enter a Course Name and press Enter
- The form should submit and take you to that course's page
- Go back to /courses
- There shouldn't be duplicates of the course you just created

Change-Id: I32980445e2e6748188f84232cb8c0740c660c8a0
Reviewed-on: https://gerrit.instructure.com/41825
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Product-Review: Dan Minkevitch <dminkevitch@instructure.com>
2014-09-29 16:11:33 +00:00
Cody Cutrer 06f2a39a8e backport not dumping schema after migrations in prod from Rails 4.1
slightly different implementation, because it's easier to
monkeypatch it like this, rather than redefine entire methods

test plan:
 * remove db/structure.sql
 * run rake db:migrate in development mode; db/structure.sql should
   regenerate
 * remove it again
 * add `config.active_record.dump_schema_after_migration = false` to
   config/environments/development-local.rb
 * run rake db:migrate in development mode again; db/structure.sql
   should not regenerate

Change-Id: I13e85070b9adeac48e5f31a1548a683081cf934e
Reviewed-on: https://gerrit.instructure.com/41891
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-09-29 16:03:03 +00:00
Spencer Olson 1989ca6664 corrected the preview message for a quiz with all changes published
when previewing a quiz, the preview message now correctly displays
whether the quiz is a draft or published.

fixes CNVS-13984

test plan:
- Create a quiz in a course with at least one question in it.
- Publish the quiz.
- Click on the gear icon in the top right corner of the quiz description page and click "Preview".
- Notice the message correctly displays "This is a preview of the published version of the quiz".
- Unpublish the quiz.
- Click on the "Preview" button in the top right corner of the quiz description page.
- Notice the message correctly displays "This is a preview of the draft version of the quiz".

Change-Id: Ia3db9b602f927a2d04098987bdd7174a71114bf1
Reviewed-on: https://gerrit.instructure.com/41838
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2014-09-29 14:00:59 +00:00
Chris Hart a7be422065 Color contrast - assignments page
Fixes: CNVS-15577

Multiple small UI tweaks to increase foreground-
background contrast in Assignments section.

IMPORTANT: This ticket is only for the high-
contrast UI. To enable the high-contrast UI, go
to Settings then scroll down and make sure
"Use High Contrast Styles" is set to ON.

Test plan:
- Enable high contrast UI in Canvas (see above)
- Go through each issue Nathan entered into
  JIRA and compare with the updated UI to make
  sure it is fixed.
- The webAIM color contrast tester can be found
  here: http://webaim.org/resources/contrastchecker/

Change-Id: I0fd9441b5e23137be2ca17970f52a7194d378233
Reviewed-on: https://gerrit.instructure.com/41769
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-09-29 13:48:25 +00:00
Cody Cutrer 13b297c04b don't write a non-attribute onto models
refs CNVS-15830

this is deprecated in rails 3, and raises an error in rails 4

test plan:
 * dashboard and course streams should still work

Change-Id: I180ae447ac7f384659d91d6e8382e5a7d5703576
Reviewed-on: https://gerrit.instructure.com/41788
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-09-27 17:11:25 +00:00
Transifreq 1561d1ca0f Updated zh_Hant translation
Change-Id: I84a177e3697bad78f79e7145b5debeef9d37f901
2014-09-27 05:05:20 -06:00
James Williams d6613a74dc fix updating state of graded group discussions
test plan:
* create a graded group discussion
* as a student reploy to the discussion (thus ensuring
 that it cannot be unpublished)
* closing it for comments or pinning it on the
 group discussions page should work

fixes #CNVS-13904

Change-Id: Ia02222b578be15b22dd1cc267cf26771032be266
Reviewed-on: https://gerrit.instructure.com/41786
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-09-27 02:15:21 +00:00
Brad Horrocks 06dc725a50 CC author on conversation create
Now it is possible to set a notification preference to receive
notifications when you create a conversation.

Fixes: CNVS-13744

Test plan:

Set conversation created notification preference
go to inbox
create a new message and send it
go to /messages to verify there is a notification for the new conversation

note: you will have to have a verified channel to see the new message

Change-Id: I662f2eb62806183871adcce39602d639dbbfc0a3
Reviewed-on: https://gerrit.instructure.com/40873
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
2014-09-26 22:23:00 +00:00
Mark Severson 834aba7d2e allow external tool to resize iframe
refs CNVS-15735

test plan:
 * load a page with an lti tool embedded
 * using the browser's console, post a message to the window, e.g.:
   window.postMessage('{"subject":"lti.frameResize", "height":250}', '*')
 - the lti window should resize to the given height

test plan (alternative):
 * load a page with an lti tool embedded that knows how to issue resize
   messages to canvas
 - the lti window should be resized as the lti tool wishes

Change-Id: Ief192a0552ed96ca829ea1048bdb1a202b377676
Reviewed-on: https://gerrit.instructure.com/6578
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
2014-09-26 22:17:46 +00:00
Simon Williams 744f3fbd3e look up user notification policies on the correct shard
fixes CNVS-15829

test plan:
- in a course that contains a user from a different shard
- change a due date on an old assignment (at least 3 hours old)
- all appropriate users should get a dashboard notification

Change-Id: I36c92e91be495dfb5ccaa6ce592af97780f6a678
Reviewed-on: https://gerrit.instructure.com/41830
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-09-26 21:34:46 +00:00
Ethan Vizitei 2a84044f56 break up long quizzes selenium specs into many files
fixes CNVS-15691

files won't be parallelized
by testbot, so when they get really big
they prevent us from taking full advantage of
the performance available.  this helps our ability
to speed up builds by splitting up the longest
running quizzes selenium specs into smaller files
that can be parallelized.

TEST PLAN: only changes specs; if specs
are passing, we're good

Change-Id: I3724658b32b1f58126a0827eedca68e6f72cd94a
Reviewed-on: https://gerrit.instructure.com/41754
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2014-09-26 21:10:31 +00:00
Cody Cutrer 550a35ee5c don't use write_attribute for student count
refs CNVS-15830

test plan:
 * courses list for root account should still show student count and
  teacher names

Change-Id: Ib65af09e3e06f7a0176fcc517d579b3ae4204053
Reviewed-on: https://gerrit.instructure.com/41804
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-09-26 20:32:32 +00:00
Cody Cutrer 007aae754b remove only-non-defaulted-columns-on-insert from rails 4
rails 4 does it natively

Change-Id: I1bef20f36ca49a6afc4273794e54d68ccca27cb6
Reviewed-on: https://gerrit.instructure.com/41793
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-26 20:23:30 +00:00
Sterling Cobb 00d34e36b7 add permissions dialog with multi select for files
closes: CNVS-15380
closes: CNVS-15382
closes: CNVS-15770

This commit changes the restricted access dialog modal to be a
permissions dialog modal. Icons will be updated later.

This also closes the multi select ticket.

Test
As a user that can access new files
Given I'm on the new files page
And I have files and folders
When I click on the permissions button (either a cloud, link icon or
calendar icon next to the files admin gear)
Then I should see a dialog modal
And there should be 4 options in that dialog modal
And those option should be publish, unpublish, make a hidden link and
schedule restricted access
When I select one of those options
And then I save
The option selected should be saved
And the icon corresponding to that action should update(ie turn into a
publish could or paperclip depending on what you selected)
When you re-open the permissions dialog modal by clicking the icon
Then you should see the permissions dialog modal maintains the correct
permissions state.

As a user that can access new files
Given I'm on the new files page
And I have files and folders
When I select multiple files or folders
Then the publish icon should appear in a toolbar above the file/folder
list
When I click on that icon
The Permissions Dialog should appear
And nothing should be selected by default
And you should be able to select an option
And selecting an option will enable the update button
And pressing the update button should update all files/folders in the
list

As a user that can access new files
Given I'm on the new files page
And I have files and folders
When I select multiple files or folders
Then the publish icon should appear in a toolbar above the file/folder
list
When I then select multiple items that have permissions in common
The Permissions Dialog should appear
And the common permissions should be selected by default
And pressing the update button should update all files/folders in the
list

Change-Id: Iae168abde26827dca3954b8c7b02c2d0e125f8c8
Reviewed-on: https://gerrit.instructure.com/41191
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2014-09-26 20:13:08 +00:00
Nathan Mills 1a78196fc5 create an api to return lti launch definitions
fixes PLAT-639

test-plan:
*the following api endpoints should return lti launch definitions
for each tool installed

GET api/v1/courses/:course_id/lti_apps/launch_definitions?
placements[]=module_item&placements[]=resource_selection

GET /api/v1/accounts/:account_id/lti_apps/launch_definitions?
placements[]=module_item&placements[]=resource_selection

Change-Id: I36ce6176f5cbb83dad7cd8578985acc2a02afdfd
Reviewed-on: https://gerrit.instructure.com/41427
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2014-09-26 19:05:48 +00:00
Jason Madsen 0738723169 dont reupload file(s) when selecting existing ones
fixes bug where selecting an existing file in the UI would re-trigger
the last file(s) upload process

closes CNVS-15678

test plan:
  - enable new files
  - upload a file
  - select any file in the UI
    - a new upload of the previously upload file(s) should not happen

Change-Id: I572855a1cfb9d77d40d84960aa98c4fc9e951e75
Reviewed-on: https://gerrit.instructure.com/41533
Reviewed-by: Sterling Cobb <sterling@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-09-26 17:57:23 +00:00
Jason Madsen c0fc48117b expand zip files into folder when requested
CNVS-15288

test plan:
  - enable new files
  - add a zip file to upload
  - modal window should ask if you want to:
    a) upload zip as is
    b) upload and expand files into current folder
  - select the later
    - progress bar should update as zip is uploaded and expanded
    - once complete, files from the zip should be viewable in the
      current folder

Change-Id: I758f1f96b67ac849bdd08139ed38cdafce759ac9
Reviewed-on: https://gerrit.instructure.com/41004
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
Reviewed-by: Dan Minkevitch <dminkevitch@instructure.com>
2014-09-26 17:56:17 +00:00
Clay Diffrient 95c383492a Adds react-modal to Canvas
Test Plan:
  - Nothing really testable, since it just adds a library

Change-Id: Ib5977abeffdc759a57c5373e193a9b113af54a49
Reviewed-on: https://gerrit.instructure.com/41835
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
QA-Review: Jason Madsen <jmadsen@instructure.com>
2014-09-26 17:19:24 +00:00
Transifreq ec0f90bc08 Updated zh_Hant translation
Change-Id: I5f340d89540fcbf9e491fd6cfacf402a58503a26
2014-09-26 10:35:49 -06:00
Rob Orton f8950fc472 remove rails 2 scripts that no longer work
Change-Id: I6d93611421613d09aee01195d84625db67cb914d
Reviewed-on: https://gerrit.instructure.com/41776
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-09-26 16:09:30 +00:00
Nathan Mills 791eaad7cb add scope to allow selection of placements
fixes PLAT-656

test
*specs pass

Change-Id: I824bb17df3d20c89224d453c858237969a869a24
Reviewed-on: https://gerrit.instructure.com/41785
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
QA-Review: Nathan Mills <nathanm@instructure.com>
2014-09-26 16:09:19 +00:00
Matthew Berns ce3d9a1634 updated module locked page when module is time locked
updated discussions page to match module locked page used on assignments and
quizzed. updated module locked page to show module's unlock time if module is
timelocked

fixes CNVS-6314

test plan:
- create a discussion topic, assignment, and quiz
- add them to a module that is timelocked
- attempt to view all three as a student
- error pages on all 3 should match, stating the unlock time of the module

Change-Id: I099b645387321b5514d442d477a47ebffdfb88c4
Reviewed-on: https://gerrit.instructure.com/40711
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Janelle Seegmiller <jseegmiller@instructure.com>
2014-09-26 15:57:38 +00:00
Brad Humphrey 60e60a8688 add allowfullscreen tags to the rce
test plan:
- add add a video in an iframe in the rich content editor
- it should be able to become full screen

fixes PLAT-647

Change-Id: I05ad81fdebc32353af9746605e9847947e614582
Reviewed-on: https://gerrit.instructure.com/41728
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
2014-09-26 15:20:45 +00:00
Chris Hart ee2061f802 Increase link and text color contrast
Fixes: CNVS-14594

Note: The only changes here are to the Canvas
high-contrast UI, not the regular UI.

To enable the high-contrast UI, go to Settings
from the top-right user menu, then scroll down
and turn Use High Contrast Styles to ON. Then
refresh the browser.

Per Dana, the solution to the issue of text color
and link color contrast is to make all text links
underlined by default when Canvas is in high-contrast
mode. When the links are hovered, the underline
should go away -- this is the opposite of the default UI.

**Exceptions are links in the main Canvas menu and
sidebar menu, as well as buttons.**

QA Test Plan:
- Enable high-contrast mode and refresh the browser
- Check to make sure text links in Canvas are now
  underlined by default, like in this example:
  http://cl.ly/image/411a1n082X0b/link-underline-example.gif
- Turn high-contrast mode OFF, and click around to
  make sure links in Canvas are no longer underlined
  by default.

Change-Id: I36dae3536dec288a42cb1912078c5275e761074e
Reviewed-on: https://gerrit.instructure.com/39768
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
2014-09-26 14:35:17 +00:00
James Williams 2f78d4c747 don't reuse question banks on import unless specified
test plan:
* import a qti quiz package into a course
* re-import it, making sure to *not* check the
 "Overwrite assessment content with matching IDs" checkbox

* should not put all of the questions into the same question bank

* repeating the previous while checking the box should behave as
 it currently does

closes #CNVS-14669

Change-Id: Ibfed20a191986fa29e52d7a08313b879c917d5a6
Reviewed-on: https://gerrit.instructure.com/41735
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-09-26 14:08:50 +00:00
James Williams 0381cebef3 fix user list e-mail parsing with unicode
test plan:
* use the course users page to add users
with names that include unicode characters
(such as accents)
* should not fail with "unparseable" errors

closes #CNVS-15085

Change-Id: Ieee80adbabed05f42aab8040c4351e35b680a75e
Reviewed-on: https://gerrit.instructure.com/41766
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-09-26 13:56:14 +00:00
James Williams 13a0b11676 add full_url to tabs api json
test plan:
* using the tabs api, confirm it returns a full_url

closes #CNVS-1737

Change-Id: I655cf06ab2819ac6ab079b8f2767c2b5333556b0
Reviewed-on: https://gerrit.instructure.com/41689
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-09-26 13:05:35 +00:00