Commit Graph

6411 Commits

Author SHA1 Message Date
Brian Palmer 701e12ba09 fix up production.rb config
Change-Id: I0121f66bf31e93826532419ba91080707805c97b
Reviewed-on: https://gerrit.instructure.com/18914
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
Tested-by: Brian Palmer <brianp@instructure.com>
2013-03-22 19:33:34 +00:00
Brian Palmer cb5e957965 start adding rails 3.0 support
This can successfully load rails console and rails server. There are
many, many problems still. The idea is this won't change anything under
rails 2.3, it's all backwards compatible.

closes CNVS-4711

test plan: `touch RAILS3` in your Canvas Rails.root directory. The run
`bundle update` and verify that you get rails 3 installed. Run `bundle
exec rails c` to load console or `bundle exec rails s` to start a
webrick server. You can login, though the dashboard currently breaks.
Also jammit isn't working yet.

But more importantly, Rails 2.3 should still work same as ever. All
tests should pass, and a basic regression sanity check would be good too.

Change-Id: Idd6f35de88adde84cd2db3a650f44b71bd6e9684
Reviewed-on: https://gerrit.instructure.com/18453
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-03-22 19:08:40 +00:00
Shawn Meredith e6ed6445ab paragem version bump
Change-Id: Ie439d4eb9a91ee8230542b5eb1adc43474cba518
Reviewed-on: https://gerrit.instructure.com/18911
Reviewed-by: Jake Sorce <jake@instructure.com>
Product-Review: Jake Sorce <jake@instructure.com>
QA-Review: Jake Sorce <jake@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-03-22 18:55:47 +00:00
Sterling Cobb 0f308db11d add admin tools for undeleting courses
You can now restore a course if you have its id from the admin tools
page.

Test Plan
1. Go to an accounts page.
2. Click on 'admin tools' in the left hand navigation.
3. Enter the ID of a deleted course into the field under 'Find a deleted
course'
4. Click 'Restore'
5. View the course and ensure its now in an Unpublished state.

Permissions Part
1. Go to the permissions page
2. In account permissions change the course restore permission to be an
X for all roles.
3. Log into an account that can see course settings for the account you
changed the permission on.
4. The "Account tools" should not show up.

fixes CNVS-3797
fixes CNVS-3692

Change-Id: I009fbdc8f1d5cf86a9ccd1b6652d0153cfb363c9
Reviewed-on: https://gerrit.instructure.com/18492
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-03-22 17:59:24 +00:00
Erik Lyngved 317898d1ac fix quiz question group edit view styles
* Fixed the action buttons used when creating or editing a question
  group in a quiz
* Refer to http://www.screencast.com/t/iuR4330CPbu

fixes CNVS-4695

Change-Id: I35a98ddc4987b631db700ea0905dd9b7c187e5d9
Reviewed-on: https://gerrit.instructure.com/18713
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
2013-03-22 17:39:59 +00:00
Jacob Fugal 64a4a47699 cross-shard filter conversations by user
fixes CNVS-4625

test-plan:
 - create four shards A, B, C, and D.
 - create three users A, B, and C on shards A, B, and C, respectively.
 - create conversation on shard A between users A and B:
   - on shard A as user A, filter by user B
   - on shard B as user A, filter by user B
   - on shard C as user A, filter by user B
   - on shard B as user B, filter by user A
   - on shard C as user B, filter by user A
 - create conversation on shard A between users B and C:
   - on shard A as user B, filter by user C
   - on shard B as user B, filter by user C
   - on shard C as user B, filter by user C
   - on shard D as user B, filter by user C
 - create users D and E on shards A and B, respectively.
 - create conversation on shard A between users A and D:
   - on shard A as user A, filter by user D
   - on shard B as user A, filter by user D
 - create conversation on shard A between users B and E:
   - on shard B as user B, filter by user E
   - on shard C as user B, filter by user E
 - create conversation on shard B between users D and E:
   - on shard B as user E, filter by user D
 - create user F on shard A.
 - create conversation on shard B between users A and F:
   - on shard B as user A, filter by user F

Change-Id: If41a801f5b6b8a79c8fc0717b10293467ba92c19
Reviewed-on: https://gerrit.instructure.com/18522
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
2013-03-22 15:26:10 +00:00
Jacob Fugal 69c235ea57 Shard#relative_id_for stub
Change-Id: I39358c7f18054cb17fc260ed9be052e7cc75b76e
Reviewed-on: https://gerrit.instructure.com/18898
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2013-03-22 15:25:58 +00:00
Jacob Fugal 19edc5dcb9 searchable messageable users
fixes CNVS-1170

test-plan:
 - be able to find messageable users and contexts from any shard,
   regardless of the shard you're on

Change-Id: I5c5828a9c66eb3e6eb9f3e713f389723d514784c
Reviewed-on: https://gerrit.instructure.com/18146
QA-Review: Clare Hetherington <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2013-03-22 00:24:54 +00:00
Jacob Fugal 3399c417a2 spec: kill enable_jobs{} helper
the implementation was rife with potential race conditions, and active
records query cache doesn't play nicely with threading.

Change-Id: I0e1c3d5cc05ad78e2f91f304490e6a1b5a925ab2
Reviewed-on: https://gerrit.instructure.com/18880
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2013-03-21 23:47:12 +00:00
Jon Jensen de9d56b7f0 fix iframe dialog button positioning, closes CNVS-4815
restores some css that got removed in the bootstrap commit

test plan:
1. allow self enrollment in a course, make it public, and have a join
   button on the course home page
2. as a new user, click that button
3. confirm that the gray button bar in the dialog is at the bottom
   (rather than somewhere in the middle)

Change-Id: I6ac756446c8c48d2089b18fa1f663903a09e9556
Reviewed-on: https://gerrit.instructure.com/18849
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
2013-03-21 22:44:17 +00:00
Brian Palmer cdedd99f90 i18n rake task improvements
* allow passing the source files as rake args
* strip invalid utf8 from the translation file

Change-Id: Icbdd09860c38f5f805e2a81e82f631595d210e27
Reviewed-on: https://gerrit.instructure.com/18754
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-03-21 20:54:08 +00:00
Stanley Stuart 96eff50742 round grades on students grade page to two decimal places
test plan:
  - As a teacher, create an assignment with grading type of 'points'
    (this is the default when you create a new assignment).
  - Add a grade for a student in the course from the Gradebook. Then,
    open the console and change the submission score to something with
    a large amount of decimal places like "100.546789" and save!
    like so:
      assign = Assignment.find(1) # Replace this with your assignment's id
      sub = assign.submissions.first
      sub.score = 100.546789
      sub.save!
  - As the student, view the Grade Summary page. You should only see two
    decimal places instead of many decmimal places and the score should
    be visible.

fixes CNVS-4185

Change-Id: Iaf61349b69fffaf57440ece7f29cf96024f7ffbd
Reviewed-on: https://gerrit.instructure.com/18544
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
2013-03-21 20:46:22 +00:00
Rob Orton 76778d34e5 fix typo on accounts course page
fixes CNVS-4266

Change-Id: Id57c0680560abf127bda77f154b7297315650f3c
Reviewed-on: https://gerrit.instructure.com/18761
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
2013-03-21 20:09:52 +00:00
James Williams 2fb206d453 bootstrap view/edit grading scheme dialog touches
test plan:
* go to edit course settings
* enable course grading scheme
* click set grading scheme
* click to edit the grading scheme
* confirm that the rows are aligned better

closes #CNVS-4697

Change-Id: I7344931c3808cc537ebfc314e7ef0f6ebd2796c2
Reviewed-on: https://gerrit.instructure.com/18770
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-03-21 19:20:59 +00:00
Jacob Fugal a2f9b5a11b cross-shard conversations with multiple tags
fixes CNVS-4763

test-plan:
 - create two users on different shards that can message each other
 - create two shared contexts between them (e.g. both are in each of two
   courses)
 - try and initiate a conversation between them
 - the conversation should be initiated without error and the
   conversation tagged with both contexts

Change-Id: I396475e0525873edbfff6c6f2c9777e0071947cc
Reviewed-on: https://gerrit.instructure.com/18735
QA-Review: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2013-03-21 18:37:47 +00:00
James Williams cce1932a08 bootstrap touches for content migration choose items forms
test plan:
* confirm that the form for choosing items looks better when
 importing a migration and when copying a course

fixes #CNVS-4696

Change-Id: Ibecc691a8c3164255a379a00e3ba26e75b6a078f
Reviewed-on: https://gerrit.instructure.com/18796
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-03-21 18:19:13 +00:00
Cody Cutrer a3acc3609c sort CoursesController#users correctly
refs CNVS-4115

test plan:
 * with postgres, ensure that it sorts case insensitively, and with
   shorter last names first

Change-Id: I7eff0f1832d4494909be62f6d0e8f7baea0aee08
Reviewed-on: https://gerrit.instructure.com/18067
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-03-21 17:25:04 +00:00
Cody Cutrer d68fb99a82 fix lock scope to accept 0 params
refs CNVS-4706

Change-Id: I792e1bd911129bb3164b3972c8fafa25d85b3161
Reviewed-on: https://gerrit.instructure.com/18811
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-03-21 16:57:51 +00:00
Jeremy Stanley b838324c8d bootstrap: fix layout of account settings tab
fixes CNVS-4762

test plan:
 - go to account settings tab
 - ensure things line up
   (see screenshot on CNVS-4762)
 - ensure styling is consistent

Change-Id: Id80136b7834c8b8c03207151f0d6ba36fe3c55d0
Reviewed-on: https://gerrit.instructure.com/18762
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-03-21 16:50:51 +00:00
Jeremy Stanley 3a3e7ae47d Bootstrap: fix layout of Course Details tab
fixes CNVS-4744

test plan:
 - go to course settings / "Course Details" tab
 - click "Edit Course Details" button
 - ensure layout/alignment of things is reasonable
   - see screenshot attached to CNVS-4744

Change-Id: I7305d5770a787d6f7aa1c1daf46ce113054b3eaa
Reviewed-on: https://gerrit.instructure.com/18707
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-03-21 16:50:45 +00:00
Zach Pendleton d5f3767daa fix display of conversations search results.
fixes CNVS-4729

test plan:
  * as a user in a course, navigate to the inbox;
  * attempt to locate a recipient for a new message
    using the "To" field and verify that the results
    are spaced properly and that the active result (e.g.
    the one w/ the blue background) text is light enough
    to read;
  * search existing conversations using the "filter" text
    input and verify that its results also display
    properly.

Change-Id: I7564d860e8ff0c6989ea65dfd885a69f38b7b0f6
Reviewed-on: https://gerrit.instructure.com/18813
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Eric Berry <ericb@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-03-21 15:07:21 +00:00
Joe Tanner 8fa31d9af3 set hidden tracking fields, refs #CNVS-4198
helper commit needed for a plugin

Change-Id: I4de2ce865ed064853233cf46c170b50ea03037d6
Reviewed-on: https://gerrit.instructure.com/18760
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
Product-Review: Joe Tanner <joe@instructure.com>
QA-Review: Joe Tanner <joe@instructure.com>
2013-03-21 04:21:23 +00:00
Joel Hough 37d829ec9f spec: don't use user for user_id in communication_channel_model
fixes CNVS-4791

it might work with ruby 1.8.7, but it sets user_id to 1 in 1.9
which lets duplicate paths through sometimes

anyway, it's redundant because communication_channel_model sets
channel.user to @user already

Change-Id: I7b4a8f24efdbf6022a57a77145ef91325153ffb1
Reviewed-on: https://gerrit.instructure.com/18747
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2013-03-20 22:47:22 +00:00
Joel Hough f7205f5c06 add course code to calendar feed items
fixes CNVS-3504

the course code finding logic is a "best effort" affair. it should
be able to find codes for events one step removed from a course. i
only promise that it will find course codes for:
- course events
- group events for course groups
- course assignments

test plan
- create an assignment
- create an event for a course
- create an event for a course level group (as opposed to an
  account level group)
- ensure that the calendar feed items for these things includes
  the course's code in the summary

Change-Id: I0a9af6b6b1d963be7c3741a403bf66757c5900da
Reviewed-on: https://gerrit.instructure.com/18719
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2013-03-20 22:37:14 +00:00
Jon Jensen 1261e82bb2 don't warn browsers we don't recognize, fixes CNVS-4754
treat minimums as a blacklist, and assume that anything we don't recognize
is supported

test plan:
1. load canvas in unsupported browsers (e.g. IE 8), confirm you get a
   warning
2. load canvas in supported browsers (e.g. IE 9), confirm you don't get a
   warning
3. load canvas in an unknown browser (e.g. Android), confirm you don't get
   a warning

Change-Id: I87ed90e97d031431f6a48c814dfa874b785ea777
Reviewed-on: https://gerrit.instructure.com/18801
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Joe Tanner <joe@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
2013-03-20 22:16:16 +00:00
Cody Cutrer 77eeebd8b8 make Account.get_special_account re-entrant for creation
for if a plugin hooks into account creation, and calls
Account.get_special_account

Change-Id: I3a46e82f1396ca755a366f49ca62e0df144e809e
Reviewed-on: https://gerrit.instructure.com/18642
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-03-20 21:13:39 +00:00
Jon Willesen 995b22728b restore border and header styles on the collaborator picker
fixes CNVS-4052

test plan
 - Go to the collaborations page for a course and check the
   collaborator picker interface for proper styling.

Change-Id: I9f78db713308540f83e1920a6ec6af6d699fc7b6
Reviewed-on: https://gerrit.instructure.com/18505
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Reviewed-by: Eric Berry <ericb@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
2013-03-20 19:20:23 +00:00
Eric Berry 34ea35abf6 bootstrapified the edit group form on the groups view
also updated the 'Start a New Group' and 'View Course Roster'
button icons with the new style

fixes CNVS-4574

test steps:
- visit the groups page
- add a group
- hover over the group name on the left side and ensure
  the buttons on the right look good
- click on the 'edit' button while hovering over the name
- click 'cancel' and make sure it works
- modify the name and click 'save' and make sure it works

- log in as a student
- visit the course groups page
- confirm that the buttons on the right are using the new bootstrap
  font icons

note: there is a regression issue with the name removing the link
      after saving the group name

Change-Id: I8212828c5545d3166c52fcd33f194ad6887c2d91
Reviewed-on: https://gerrit.instructure.com/18694
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
2013-03-20 18:51:20 +00:00
Eric Berry 8ea8408b27 revised plugins page with better ui
fixes CNVS-4666

test steps:
- visit /plugins as an account admin
- ensure that the ui and functionality of the page is ok

Change-Id: I462074dbcfae7b6344891b88455ec7ff2608c59b
Reviewed-on: https://gerrit.instructure.com/18650
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-03-20 15:27:01 +00:00
Brian Palmer 9c6f628bcf spec: mark two specs pending in 1.8
a bug with mocha stubbing class methods causes these to fail in 1.8

Change-Id: I2f4900f2786ddcbb1e5cb74a1ad143c92df937e1
Reviewed-on: https://gerrit.instructure.com/18779
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>
2013-03-20 15:11:53 +00:00
Stanley Stuart f9faf26434 spec: fix teacher speed grader spec fix
wraps clicking the link to the gradebook in a "expect_new_page_load"
call in order to avoid race conditions for elements to become stale.

Also adds an ID to the gradebook link in speed grader because the
previous selector was based on an element with two links, this stops the
chance of Selenium selecting the wrong list inadvertently causing the
spec to fail.

test plan:
  - specs pass.

Change-Id: If6cd81ac3a801fcbab1a00814d6dac32bf670717
Reviewed-on: https://gerrit.instructure.com/18748
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2013-03-20 15:10:04 +00:00
Brian Palmer 04baec6a43 strip invalid utf8 data when importing content from other systems
fixes CNVS-4642

test plan: import a course data package that contains invalid utf-8
data, it should import without error and the invalid data stripped out.

Change-Id: I790059a7c3ee7026d47407f12467a3774016fbad
Reviewed-on: https://gerrit.instructure.com/18632
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2013-03-19 17:09:24 -06:00
Kyle Rosenbaum a33b39fbe5 spec: fix intermittent failures context_modules
Change-Id: Id0fe9ba9d0a03efec1d8c90607f549ddb848c15e
Reviewed-on: https://gerrit.instructure.com/18771
Reviewed-by: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
2013-03-19 15:50:26 -06:00
Zach Pendleton cc91a3dae0 remove < 767px bootstrap media queries.
fixes CNVS-4708

test plan:
  * shrink browser window to a size smaller than 767px;
  * navigate throughout canvas and verify that no small
    browser-specific styles are being applied.

Change-Id: I4a6bbf8817f31e2771fd5a4488d2cae5247310ca
Reviewed-on: https://gerrit.instructure.com/18687
QA-Review: Marc LeGendre <marc@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Eric Berry <ericb@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-03-19 14:45:39 -06:00
Ryan Florence 9b5b7404b3 regretfully added .clear class back
don't use this, its a stopgap until we can fix
all the things that use it

Change-Id: I738cfaf761972431e359fc083c22ef8b3ca55c52
Reviewed-on: https://gerrit.instructure.com/18750
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
2013-03-19 14:33:05 -06:00
Erik Lyngved 05295a642c fix turnitin advanced settings modal styles
* When editing an assignment as a teacher, enable Online submissions
  and Enable Turnitin Submissions to show the link for the Advanced
  Turnitin Settings modal
* That modal form styles are now fixed, and the text fields visible
  when Small Matches is checked have been made shorter

fixes CNVS-2810

Change-Id: I467375e859eca9b130a76d7fc06d4851e15e69cb
Reviewed-on: https://gerrit.instructure.com/18666
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2013-03-19 12:55:26 -06:00
Jeremy Stanley 3a2c6f5e69 bootstrap: fix hover/delete for registered services
fixes CNVS-4735

test plan:
 - add a registered service to your profile
   (e.g., Skype, Delicious, Diigo, etc.)
 - make sure it highlights properly when you mouse-over
 - make sure the delete button doesn't disappear when you
   move the mouse toward it

Change-Id: I08770fa279cdadf645d4d9d4b982f96a1635192f
Reviewed-on: https://gerrit.instructure.com/18710
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2013-03-19 12:45:36 -06:00
Bracken Mosbacker d20390594f hide module draft state
publishing/unpublishing modules isn't quite ready to go

Test Plan
 * Create a module, it should be published.
 * You shouldn't be able to unpublish it
 * It should also be published when creating, by default. (it should be
 * gray)

closes CNVS-4346

Change-Id: Idaa616bb8c4f2816c85bd9d60c2f76811bf65ad3
Reviewed-on: https://gerrit.instructure.com/18305
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-03-19 12:38:42 -06:00
Chris Hart ee91fc8599 retina-friendly logos and breadcrumbs
Test plan:

View the Canvas logos in both the app header and login screen on a Retina device

View the breadcrumbs on a Retina device

Make sure everything is nice and sharp

fixes CNVS-4623

Change-Id: Ia4ff86ba2981416097d4b0f325682a7639346d8f
Reviewed-on: https://gerrit.instructure.com/18571
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
QA-Review: Stanley Stuart <stanley@instructure.com>
2013-03-19 12:25:52 -06:00
Stanley Stuart 5a3315842f make sections not cut off in gradebook2
test plan:
  - As a teacher, open Gradebook2 for a course that has multiple
    students in multiple sections.
  - In the leftmost column, where the student names are, verify the
    section names are there. The section names should not be cut off.

fixes CNVS-4581

Change-Id: I6d546ba51ebd1d0a7829c936eff64f10892aa3ae
Reviewed-on: https://gerrit.instructure.com/18626
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2013-03-19 12:14:13 -06:00
Ryan Florence c0c0da05ef added Collection::setParams
test plan:
- see specs

Change-Id: Ie1a7955b6578bbe0e497ad82b531df762ac89a63
Reviewed-on: https://gerrit.instructure.com/18731
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Ericksen <marke@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
2013-03-19 11:49:58 -06:00
Erik Lyngved 7dacbab558 adding quiz information to assignments with quizzes
Notes:
* Assignments with an attached quiz will now return a quiz_id
  parameter

Test Plan:
* Create a graded quiz and publish it
* Get the quiz's assignment id - one way I've found how to do that
  in the front end is to go to the Assignments page, hover over the
  quiz name in the list, and look at the status bar for the ID:
  http://cl.ly/image/0t2c3I0K0E1A
* Go to /api/v1/courses/:course_id/assignments/:assignment_id.json
* quiz_id should be present

fixes CNVS-4613

Change-Id: I5bb5f28212fd87bd51f6b943d6dd7bb3d00c8849
Reviewed-on: https://gerrit.instructure.com/18708
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2013-03-19 11:15:57 -06:00
Cody Cutrer a5ccb6bc2a fake arel!
closes CNVS-4705

 * use the fake_arel gem to get a good portion of the way there
 * override fake_arel's AR override even more to get proper behavior
   of select and group merging
 * add even more Rails 3 query methods to Scope (except, reorder,
   pluck, uniq)
 * fix some spots in our code that break with the new semantics

test plan:
 * test all the things!

Change-Id: I4290d00db407f3250570df4e89c8c78283fe5f5f
Reviewed-on: https://gerrit.instructure.com/18427
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-03-19 11:10:22 -06:00
Jeremy Stanley 4c355ae9d7 Bootstrap: fix display issues on alerts page
also, make user settings gear buttons larger, for
consistency with other pages

test plan:
 - course settings/alerts
   - "Add Trigger", "Add Recipient" buttons should be vertically
     centered
   - should be a space between the radio buttons and the
     associated text
   - error balloons should disappear when you cancel out
     of editing
  - course settings/users
   - the gear icons should be sized correctly

fixes CNVS-4664

Change-Id: I213ed6f5eec3bd63e5b7399b6b86b8c30d98ec16
Reviewed-on: https://gerrit.instructure.com/18718
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-03-19 10:39:24 -06:00
Jacob Fugal ce674b4e41 make Array#cache_key work with frozen arrays
test-plan (script/console):
 - make an Array (ary = [])
 - freeze it (ary.freeze)
 - try and get a cache_key from it (ary.cache_key)
 - should not raise an error

Change-Id: I2646440d7d48d2cea16140cd15c8bef56cd3e063
Reviewed-on: https://gerrit.instructure.com/18717
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
2013-03-19 10:33:03 -06:00
Brian Palmer f10b0c8b11 force health check to honor the TMPDIR env var if set
Dir.tmpdir (and thus Tempfile) has some internal checks to make sure
that the directory specified in ENV['TMPDIR'] exists and is writable,
otherwise it falls back to the system default (usually /tmp). But some
other parts of the stack such as Passenger/Rack still try to use TMPDIR
even if it's not writable, which can happen if it's a bad drive, so we
want to force the health check to always try the directory anyway.

test plan: /health_check should return "ok" still if TMPDIR is set and
writable. It should fail if TMPDIR is not writable, even if /tmp is
writable.

Change-Id: I6d4efed9327dc6fb6395940cd90bd5e93d7c4069
Reviewed-on: https://gerrit.instructure.com/18691
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-03-19 10:11:57 -06:00
Zach Pendleton 78dd85afc6 resolve `cid of undefined` error in collaborator picker.
fixes CNVS-4506

test plan:
  * create a class with between 50-100 students;
  * create a new collaboration in the class, and include a
    member from the last page of users as a collaborator;
  * reload the page, edit the collaboration, and attempt to
    scroll to the second page of available users. verify
    that no javascript error is thrown.

Change-Id: I64562c14630a462f2182c27b92e90fb24b7f9cf2
Reviewed-on: https://gerrit.instructure.com/18674
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-03-19 10:10:00 -06:00
Joel Hough 20af1d0714 spec: fixed 1.8.7 specific duplicate path error
Change-Id: I0beb914579bf03edc3fdd331246bd44d273191f3
Reviewed-on: https://gerrit.instructure.com/18703
Reviewed-by: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2013-03-18 18:17:57 -06:00
Cody Cutrer 25e8d5fdba spec: avoid before(:all) where possible
they're prone to leaving junk around, don't allow parallel specs
on the same database, and are typically slower anyway if you do
the "right" thing and truncate_all_tables in an after all

Change-Id: I2455e5c0de98c75e3748ce7fc2caf6d04a150a44
Reviewed-on: https://gerrit.instructure.com/18684
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2013-03-18 17:04:46 -06:00
Duane Johnson a459493304 decrease periodic quiz submissions
We currently submit quiz submission values every 30 seconds as a
precautionary measure to prevent accidental data loss. However, when
hundreds or thousands of students take a quiz at the same time it is
unnecessary and problematic to send so much redundant data.

This patch checks the submitted data (on the client side) to see if
the data is identical to the most recent submission. If identical,
it just doesn't submit it.

fixes CNVS-2153

Change-Id: If10d48acefc29e2ebadb3ea4d1031f5ecb209a5d
Reviewed-on: https://gerrit.instructure.com/18662
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Product-Review: Duane Johnson <duane@instructure.com>
2013-03-18 17:02:58 -06:00