Commit Graph

11484 Commits

Author SHA1 Message Date
Cody Cutrer 9b1e8c7350 more fk indexes
also fix an old migration that should have ran on all shards

Change-Id: Ib4305c4f1b84ba0cfd525d0f552cfc21d365dc24
Reviewed-on: https://gerrit.instructure.com/37492
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-14 21:06:23 +00:00
Jon Jensen 4872ee008e spec: once-ler spec/models/[r-w]*
in rails3, reduce runtime >50% (8:23 -> 4:04 locally)

Change-Id: Ie5a81e2088a4fe579f3ce1d04345743ccd46458a
Reviewed-on: https://gerrit.instructure.com/37311
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-07-14 19:39:17 +00:00
Braden Anderson c6014471f4 discussions: prevent creation of new group graded discussions
test plan:
  * create a graded discussion
  * using the Assignments API, try to set group_category_id
      on the discussion's linked assignment
  * verify that you get an error message
  * using the Discussion Topics API, set a group_category_id
      on the discussion
  * verify that the discussion becomes a group discussion

Change-Id: Ida1bae1f370a5d5f13a5002b9cdeb40c24dba0b2
Reviewed-on: https://gerrit.instructure.com/35084
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Braden Anderson <braden@instructure.com>
2014-07-14 19:30:13 +00:00
Cody Cutrer dce1d4bb4f move bundler version check before ruby version check
really old bundler versions don't support the ruby directive,
so give an obtuse error

Change-Id: I7ef5cd3c48b628751f2c540ef42df3d557417f95
Reviewed-on: https://gerrit.instructure.com/37556
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-14 18:37:13 +00:00
Jon Jensen a34f35c285 spec: once-ler spec/helper
in rails3, reduce runtime by >50% (0:43 -> 0:20 locally)

Change-Id: I4fb9bcb346e688606107eb7af0f17e2ab28110ea
Reviewed-on: https://gerrit.instructure.com/37606
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-07-14 18:34:57 +00:00
Ryan Shaw a221235aa4 Remove remaining unused collections stuff
cameron removed most of the controller/model stuff in:
3c434e8aff

but this removes the remaining view/coffeescript/stuff

Test plan:
  canvas should still work
  (sorry, this looks big but none of it was ever actually loaded)

Change-Id: Ie4e31fcdf5bc2820c9eafaef6e8b25332aaea4bc
Reviewed-on: https://gerrit.instructure.com/37508
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2014-07-14 18:24:18 +00:00
Duane Johnson 32965c3bd7 fix pseudonyms API doc optional fields
- pseudonyms "List" API has a redundant user[id]
- pseudonyms "Create" API needs 'password' and 'sis_user_id' marked Optional
- pseudonyms "Edit" API needs 'unique_id', 'password', 'sis_user_id' marked Optional

Fixes SIS-354

Change-Id: Id03f1a813d43a9a2f75b7f1ea4d44e87931f84ec
Reviewed-on: https://gerrit.instructure.com/37595
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Eric Adams <eadams@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
2014-07-14 17:21:47 +00:00
Jon Jensen b5ac86752d spec: once-ler, now with sharding support
revisit some already once-ler'd specs, reduce runtime of modified files
by ~20% (5:20 -> 4:10 locally)

Change-Id: I60ee5cb1cd1491d8c3c9acc2a7d990303529cb96
Reviewed-on: https://gerrit.instructure.com/37607
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-07-14 16:09:27 +00:00
Brad Humphrey 503ecb71c1 add custom role variable substitution
Test Plan:
 - custom variable $Canvas.membership.roles should return all roles
   including custom roles

Change-Id: Ib761d0f034de5431a51fa284401686e3269861e9
Reviewed-on: https://gerrit.instructure.com/37432
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
2014-07-14 16:04:17 +00:00
Cody Cutrer 9761d56d53 improve AR::all_models for non-eager-loading
include namespaced models, and move two models to where
they actually belong

Change-Id: I8f5940d927e4d1fb2b05fceeca121c04d4de47d5
Reviewed-on: https://gerrit.instructure.com/37447
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-14 15:56:49 +00:00
Matt Wheeler d1f0effee9 Add ARIA attrs to outcome alignment modal link
Fixes CNVS-14009

Test Plan:
- create a course with a learner
- Turn on the Student Learning Mastery Gradebook
- Add an outcome group and an outcome
- Navigate to the grades for a student, then the learning mastery tab
- Expand outcome group and verify the alignments link has 2 ARIA attrs
  - aria-owns="outcome_detail"
  - aria-hasspopup="true"
- Click the alignments link and verify the modal has an id of
  "outcome_detail"

Change-Id: I6e78b177530b3150e82ed3d126b3cd80762b4473
Reviewed-on: https://gerrit.instructure.com/37512
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-07-14 15:20:28 +00:00
Nathan Mills 363d977bd9 add alt tag to app center images
fixes: PLAT-549

test-plan:
*the thumbnail images for apps in the canvas app center should have an alt tag

Change-Id: I87f1f73a88230fe6a0b1db7555cea3f613ac3618
Reviewed-on: https://gerrit.instructure.com/37092
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Reviewed-by: Eric Berry <ericb@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-07-14 14:45:09 +00:00
James Williams e0703924bf don't convert relative answer tolerances to floats
test plan:
* create a formula question
* use relative margin of error (e.g. '1%')
* copy the course
* should not have turned the '1%' into a '1'

fixes #CNVS-10580

Change-Id: Ie31b7dafc083b1be704ea21534ce8a2cb0eff3b2
Reviewed-on: https://gerrit.instructure.com/37521
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-07-14 14:28:24 +00:00
Brian Palmer 8fa0755465 add SQL tag back to query log lines
test plan:

Run Canvas with this patch applied, verify that the log lines start with
"SQL User Load (ms)" rather than just "User Load (ms)", etc

Change-Id: Ibded65886a61d4ec2c57a37280f0447af005159e
Reviewed-on: https://gerrit.instructure.com/37570
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-07-14 13:37:42 +00:00
James Williams cd96f8408e don't show recent feedback for other students to former admins
test plan:
* create a course
* add two teachers (I'll refer to them as
 "New Teacher" and "Old Teacher")
* also enroll a student

* create an assignment requiring submissions
* as the student, make a submission
* now, as the "New Teacher", comment on the submission
* remove the "Old Teacher" from the course as a teacher,
and instead add them again as a student
* confirm that the "Old Teacher"'s recent feedback does not
show the feedback for the other student

fixes #CNVS-13215

Change-Id: Ie03c9036b65c0de93c869818ebc60b059e9a4260
Reviewed-on: https://gerrit.instructure.com/37465
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-07-14 12:38:14 +00:00
Simon Williams 7b6fc467b6 bump a translation key on course homepage
we changed the name of the interpolation argument without updating the key, so
translations that weren't updated in time are broken.

fixes CNVS-14193

test plan:
- go to the course homepage in a language that does not have an updated
  translation for this key
- it should not error

Change-Id: Ideeceacdc6fcf3178c4e6bc94844b9cf3d2004b3
Reviewed-on: https://gerrit.instructure.com/37604
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-07-12 18:59:51 +00:00
Transifreq 8f73fab412 Updated nb translation 2014-07-12 05:05:51 -06:00
Cameron Matheson 13dbb09bd4 fix canvadoc locked-files issue
fixes CNVS-14192

Test plan:
  * Make a course with a canvadocable file
  * Add the file to a wiki page
  * Lock the file
  * Students viewing the wiki page should not be able to preview the file

Change-Id: Ic706085492b07db24dfd48469bcb3e76e1e7e609
Reviewed-on: https://gerrit.instructure.com/37602
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2014-07-12 01:26:27 +00:00
Michael Nomitch ddc6face6f srgb - fix total grade rendering logic and i18n issue
fixes CNVS-14153

test plan:
  - go to srgb with weighted assignment groups
    - final grade points ratio should never
      show up (e.g. "90/100 points")
  - go to srgb with unweighted assignment groups
    - final grade points ration should
      show up (e.g. "90/100 points")
      if the student has a grade
    - changing a grade should update the ratio
    - changing students shouldn't break the ratio
    - students without graded assingmnets
      don't break the ratio

Change-Id: I052f8ba54360e501422cdc354f9760306e457dbe
Reviewed-on: https://gerrit.instructure.com/37524
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-07-11 22:54:13 +00:00
Cody Cutrer adf5629772 remove broken conditional in discussion entry replies
fixes CNVS-14139

test plan:
 * run rails 3
 * create a discussion associated with an assignment
 * in the database, change the created_at for the discussion_topic
   to over two weeks ago
 * post multiple replies to a discussion
 * it should not fail or log an error_report

Change-Id: I1e8960b7277f373c818fdcb95a37dba9933f7188
Reviewed-on: https://gerrit.instructure.com/37485
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-07-11 22:06:26 +00:00
Joel Hough 208c50bfb2 use linked assignment for discussion regrouping check
fixes CNVS-14003

test plan
- create a graded group discussion
- make the topic like a pre group assignment/graded group
 discussion separation commit by doing the following in a console
 - set the linked assignment's group_category_id to the topic's
  group_category_id
 - set the discussion's group_category_id to nil
- edit the discussion from the web ui
- ensure that the discussion can be edited

Change-Id: I7fc385e0ce2236f5986cf601b46a057708c81079
Reviewed-on: https://gerrit.instructure.com/37469
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: David Josse <david@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-07-11 20:58:38 +00:00
Ryan Shaw 6a85ce3d34 remove 2 unused files that were causing compass issues
because these 2 files don't have a '_' in front of
their filenames, compass was trying to compile them
as their own stylesheets.  We don't use bootstrap
that way, it gets included into another main stylesheet
by boostrap_parts.  so their existence was just causing
us to do more work every time we css:generate as well
as creating errors.

test plan:
nothing should change

Change-Id: Ia93ba9dd9382dabe7a2a33312f574462b45d642e
Reviewed-on: https://gerrit.instructure.com/37374
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
2014-07-11 19:16:17 +00:00
Sterling Cobb 25b8943a65 fix style issues on wiki pages
fixes CNVS-14113

The css prefix compiler was getting messed up by existing prefixes in
the code base. This commit simply removes those vendor prefixes so our
css attributes work correctly.

Test Plan

Given you are using IE10+, Safari and Chrome to browse
As a user than can edit a wiki page
When you navigate to a wiki front page
Then the edit  button should be right aligned
And the admin cog button should be right aligned
And you should be able to see the title of the wiki page

Change-Id: Ic621a07020d6cbc12219eb6ee16a10902ac02d8e
Reviewed-on: https://gerrit.instructure.com/37514
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2014-07-11 19:14:56 +00:00
Brad Humphrey 43210117bd add a domain suffix to newly generated lti tool_consumer_instance_guid
Change-Id: I243f56083e0e66fe0a21e415e02d573b9fc8bd76
Reviewed-on: https://gerrit.instructure.com/35148
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-07-11 18:45:21 +00:00
Drew Bowman 470967f241 new groups: fix student invites and leaving student led groups
fixes CNVS-13585
fixes CNVS-13588

test plan:

 - make sure new groups is enabled
 - as a student
 - create a new group and invite (student|students)
 - they should be the only students added to the group
 - the student should be able to leave and join that group

Change-Id: I8a62a6cb33b4774207d064d27a3b4471ad4dfb62
Reviewed-on: https://gerrit.instructure.com/36394
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: David Josse <david@instructure.com>
Product-Review: Drew Bowman <dbowman@instructure.com>
2014-07-11 17:27:25 +00:00
Jeremy Stanley 9ddd2f53b3 fix public syllabus access
test plan:
 1. have a published course containing at least one published
    assignment
 2. check the "public syllabus" box in course settings
 3. the syllabus page should be visible as a non-logged-in user

fixes CNVS-14144

Change-Id: I5f5f357227076e657a9626cc3748ebcf0be7365e
Reviewed-on: https://gerrit.instructure.com/37528
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-07-11 17:13:10 +00:00
Cameron Sutter 0f5c76f422 reset cached access tokens in api specs
this allows once-ler to work in api specs by
resetting the user access tokens cache in the
global before :each block

Change-Id: I580007a17129e3e4b96f6310113e1578b5e63544
Reviewed-on: https://gerrit.instructure.com/37553
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-07-11 17:06:28 +00:00
James Williams 85136aca96 fix 'everyone' tab link
test plan:
* add a group to a course
* visit the 'People' page
* cliking on the 'Everyone' tab should not take you to
/courses/1/users

refs #CNVS-14011

Change-Id: Icc8d662d6165b6f746c623fa24e867f44c6a536c
Reviewed-on: https://gerrit.instructure.com/37488
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-07-11 17:04:35 +00:00
Jacob Fugal d9c6e2a0cd clarify Slug vs. UUID and fix event stream
refs CNVS-13987

what was called CanvasUuid was *not* generating UUIDs. it was generating
slugs. by default, its generate method only creates 4 character slugs.
these should obviously not be used as UUIDs. the misnomer already caused
a bug in EventStream where it used these slugs as UUIDs, causing
collisions. to fix:

 (1) rename canvas_uuid gem to canvas_slug, and rename it's primary
     class CanvasUuid to CanvasSlug
 (2) create new canvas_uuid gem, with class CanvasUUID, extracted from
     lib/uuid_singleton for actual UUID generation
 (3) fix event stream use CanvasUUID, rather than following the rename
     of CanvasUuid to CanvasSlug

test-plan:
 - have cassandra set up for audit logs
 - create an audit log entry (e.g. change a grade)
 - look at the generated audit log entry's id field; it should be a UUID
   value, not a 4 character slug

Change-Id: I19758fff4433cd6cb2e21219217dced19ee05c5a
Reviewed-on: https://gerrit.instructure.com/37506
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-07-11 16:58:42 +00:00
Cody Cutrer ba00b0154a avoid temp tables in sis batch batch mode
we don't want them in a transaction, and they don't work
through pgbouncer without a transaction

Change-Id: Ia1845085db6cda1d039a91588fff2cb4fd93012f
Reviewed-on: https://gerrit.instructure.com/37554
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-11 16:35:15 +00:00
Jeremy Stanley 0ce96f4808 fix current/past/future course list
test plan:
 on /courses (the "view all courses" link in the menu)
 1. ensure hard-concluded and soft-concluded courses show up
    in the "Past Enrollments" section
 2. ensure rejected enrollments show up in the "Past Enrollments"
    section
 3. ensure courses with no dates, or with a current date range
    (either from the term, or from the course settings with
    "restrict enrollment to these dates" checked) show up
    in "My Courses", regardless of course published status
    or acceptance of invitation
 4. ensure courses whose start date is in the future (whether
    via course settings or enrollment term) show up under
    "Future Enrollments", regardless of published status of the course
    (again, course settings only apply if the restrict-dates
    setting is checked)
   * Yes, students should see the names of unpublished courses
     they are enrolled in, but the links should not be clickable.
     This is the major complaint of the ticket; we want to
     forestall "Dude, where's my course?" support questions.
 5. ensure "Future Enrollments" is empty when the viewer is a student
    or observer and the account settings checks "Restrict students
    from viewing courses before start date"
 6. ensure all three lists are sorted by course name
    with invitations before active courses
    (previously only the current list was sorted; the others were
    in arbitrary database order)

fixes CNVS-13583

Change-Id: I49d36dd32dc04ea507d0a379a2e3491a837fd160
Reviewed-on: https://gerrit.instructure.com/37294
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-07-11 16:34:37 +00:00
Brad Humphrey 4df13caca0 substitute nil values when substitution is present
Test Plan:
 - It should substitute empty variables
   * $Canvas.account.sisSourceId
   * $Canvas.course.sisSourceId
   * $Canvas.user.sisSourceId

Change-Id: Iecbe0f6d2ccff2a0664bd4ec98102a1f3db173b1
Reviewed-on: https://gerrit.instructure.com/37163
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-07-11 16:13:27 +00:00
Nick Cloward f96ef2c3d1 make permission_cache_key_for shard aware
fixes: CNVS-13917

Moves the initializer from active record base to an alias method chain
on AdheresToPolicy::Instance methods.  The way its including the
instance methods did not allow it to override the
permission_cache_key_for method.

Test Case:

  - Flush cache
  - Open a Course
  - Look at the cache keys and all the ids should be global ids

Change-Id: Iac6a5ed95a800c27bd53fcb757cabd11976aef21
Reviewed-on: https://gerrit.instructure.com/37226
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-07-11 16:11:17 +00:00
James Williams 3c11a4cb1e pend specs_require_sharding in rails 3
closes #CNVS-13847

Change-Id: I10ec77968a4462eece3e199ad2bd0ae5d506899f
Reviewed-on: https://gerrit.instructure.com/37441
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-07-11 15:23:20 +00:00
Cody Cutrer 17c5895ac6 i18n public course checkbox on create course form
fixes GH-470

Change-Id: I684a0d65e7423ea6c4e11b12de9639ff071540a5
Reviewed-on: https://gerrit.instructure.com/37516
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-11 15:13:12 +00:00
Bracken Mosbacker 7e4bfacec6 add common cartridge 1.3 variant support
Test Plan:
 * Import the flat manifest fixture file
 * There should be:
   * 2 discussions with titles that say you should see them
   * 1 assignment
	 * a module with 5 module items

closes PLAT-560

Change-Id: I975546e59dcdd731b2e0149c52fb7dd33f5e70e8
Reviewed-on: https://gerrit.instructure.com/37545
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-07-11 14:26:19 +00:00
Landon Wilkins cf0b220497 canvas update script
test plan:
* run `script/canvas_update`
* verify that the log output goes in /log
* verify that canvas was updated
* run `script/canvas_update -q` for QUICK_MODE
* verify QUICK_MODE's output is:

Quick mode enabled (assumes you have guard running and don't want to
generate docs)
Bringing Canvas up to date ...
  Log file is /Users/lwilkins/sandbox/canvas-lms/log/canvas_update.log
Updating plugin vendor/plugins/canvasnet_registration ...
Updating plugin vendor/plugins/instructure_misc_plugin ...
Updating plugin vendor/plugins/multiple_root_accounts ...
Pulling Canvas code ...
Checking your gems (bundle check) ...
Gems are up to date, no need to bundle install ...
Migrating DB ...
Installing npm packages ...
Tips:
  - 'bundle exec guard': auto-compiles JS files while developing
  - 'script/delayed_job run': run delayed jobs in the foreground

NOTE 1) if you see
  Gems are up to date, no need to bundle install ...
  then `bundle install` will not be run

NOTE 2) after running this command, you'll be on master branch,
  if you want to continue testing this script, checkout the
  branch you pulled down again.

Change-Id: I99c3097d452128d6fffa31d25e3b7e57a438555e
Reviewed-on: https://gerrit.instructure.com/37423
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <braden@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2014-07-11 14:21:03 +00:00
Jeremy Stanley 01401eebd7 update terms-of-use and privacy-policy urls
test plan:
 - terms of use link should go to
   http://www.canvaslms.com/policies/terms-of-use
 - privacy policy link should go to
   http://www.canvaslms.com/policies/privacy-policy

refs CNVS-13942

Change-Id: I7b17e278d295ddc1b2a1508352b76aa7f2d30ace
Reviewed-on: https://gerrit.instructure.com/37450
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
2014-07-10 22:32:53 +00:00
Nick Cloward a6304f2152 disable audit log searches
refs: CNVS-14114
refs: CNVS-13987

Test Plan:

  Audit Log in Admin tools should have a message saying they have been
  disabled.

  Try to hit an api call to the audit log search and it should return a
  503 with a message that they are disabled.

Change-Id: If3c46f16010d8fd9ace30de885d5572c7299c0ee
Reviewed-on: https://gerrit.instructure.com/37503
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-07-10 22:09:11 +00:00
Joel Hough 097ed299ca avoid messagleable user queries for conversation message show
fixes CNVS-13331

test plan
- have a user with many enrollments (150 ish?)
- send some conversation messages to the user
- as the user, view the message in the inbox
- ensure that loading the message is not as slow as before

Change-Id: I5f1b7febf03a620a5362ee3ac97b3f31320e2d87
Reviewed-on: https://gerrit.instructure.com/36953
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-07-10 21:03:42 +00:00
Mark Severson 6e3dfb3851 fix empty revisions display when restoring a page
test plan:
 * rename a wiki page several times
 * navigate to the revision history for the page
 * restore to a version with a different page name
 - the page should refresh, showing the newly restored name

fixes CNVS-13845

Change-Id: I56df4de17f25393e3d2ce585c777ef3d5a483e51
Reviewed-on: https://gerrit.instructure.com/37470
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-07-10 20:03:12 +00:00
Cody Cutrer 94c9c14994 make Rails 3 the default
Rails2 support still available by env var or config/RAILS2

Change-Id: I127105dfd3d3bef19e51a2c7fc53b64748115625
Reviewed-on: https://gerrit.instructure.com/37471
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2014-07-10 19:29:15 +00:00
Cody Cutrer ed29d9a9cd use a temp table for find_in_batches when select does not include id
also add hash of query to temp table name. this fixes nested
queries, but also defeats query cache getting confused

fixes CNVS-13783

test plan:
 * *don't* have a slave configured in database.yml
 * run the last_user_access report
 * it should work

Change-Id: I6fba9826f6cfee5a2e651157fd898f42c0e1345e
Reviewed-on: https://gerrit.instructure.com/36911
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-10 18:18:38 +00:00
Matt Wheeler 572c78146a Adds h4 to student mastery individual outcome
Fixes: CNVS-14010

Test plan:
1) create a course with a learner
2) Add an outcome group  and an outcome
2) Navigate to the grades for a student, then the learning mastery tab
3) Expand the outcome group and see that the individual outcome title
   is in an h4.

Change-Id: I506ed259eb3064bad69c69e8b7505105a9167e16
Reviewed-on: https://gerrit.instructure.com/37461
Reviewed-by: Jayce Higgins <jhiggins@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: David Josse <david@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
2014-07-10 17:40:02 +00:00
James Williams d3b57c922d fix rails 3 change password error
test plan:
* as an account admin, edit the password for a user's login
* the current user session should not be affected

fixes #CNVS-14016

Change-Id: I537a1b1826a09451270f00d8a51d66ba02f6a956
Reviewed-on: https://gerrit.instructure.com/37381
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-07-10 17:00:00 +00:00
Nick Cloward afe2c53ad6 ignore extra attributes from cas response
fixes: CNVS-13703

Adds a configuration to the rubycas-client gem to parse extra attributes
as a raw version since it defaults to parsing as yaml.

Test Plan:

- In a CAS response add some additional data that cannot be parsed as
  yaml.
- Without this fix it should throw an error that the extra attributes
  cannot be parsed as yaml.

Error: Failed to validate CAS ticket: #<ArgumentError: Error parsing extra
       attribute with value...

Change-Id: I464c296fcf129bc882420f5f4f3913ac37585b02
Reviewed-on: https://gerrit.instructure.com/37191
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-07-10 16:32:04 +00:00
Ryan Florence 065093e97c added React.JS
we aren’t using jsx (yet, anyway) bring it into a
module like anything else:

    define ['react'], (React) ->

There’s also a helper module to make building
your UI simpler at `compiled/withReactDOM`. It
safely moves everything from `React.DOM` to window
during a function call for convenience.

Change-Id: Ibf64f0b207411c31b92f30dddc6ce188d9462e11
Reviewed-on: https://gerrit.instructure.com/37376
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
2014-07-10 15:25:35 +00:00
James Williams 574fb015e8 importer refactor: yield missing links instead of going through opts
test plan:
* nothing should have changed

Change-Id: I6e7e26dfff5c3239771f4321de91b7d0f28c9845
Reviewed-on: https://gerrit.instructure.com/36487
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-07-10 12:57:23 +00:00
Cody Cutrer 0fbf5612c1 re-introduce rails2 being able to read rails3 cache
fixes CNVS-14066

partially reverts 4dce1db924

test plan:
 * clear your cache
 * in rails 3, create a course with students, then create a discussion
 * confirm that the student sees the discussion in their stream on the
   dashboard, but don't view it
 * switch to rails 2
 * as the student, confirm it's still on your dashboard
 * view the discussion
 * it should not error

Change-Id: I776fbd71ba4959b3059bbad78370ffcc43edfc0c
Reviewed-on: https://gerrit.instructure.com/37411
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-07-09 16:56:49 +00:00
Joel Hough c2ef077763 doesn't load so much context stuff on conversations inbox
fixes CNVS-13894

test plan
- regression test user note/faculty journal option in
 conversations compose dialog
 - be sure to try using the compose dialog as a student, an admin,
   and a teacher
 - watch for js errors in the browser developer console
- ensure that page loads faster for users with >100 enrollments

Change-Id: Ie147a3cea3e560ef8bb50adceaa6e820ef110125
Reviewed-on: https://gerrit.instructure.com/37297
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <braden@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-07-09 16:47:01 +00:00