Commit Graph

25033 Commits

Author SHA1 Message Date
Ryan Shaw e68a26c507 s/require/define/ in a few more files
closes: CNVS-36299

This change makes it so they
Don’t load their deps in a separate chunk so there
is not 2 round trips to get each. RequireJS would bundle
them into one file but webpack treats an amd require([]...
as a split point, different from an amd define([]...

Test plan:
* Run webpack
* you should see less unnamed, numbered chunks


Change-Id: I512fe2759b18f729532ecee2c9c233fea4319dd3
Reviewed-on: https://gerrit.instructure.com/108448
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-04-18 00:19:07 +00:00
Ryan Shaw ed1e14e5ac give the courseWizardListItem chunk a name
closes: CNVS-36294

this makes it easier to debug and know what it is you're looking at

test plan:
* run webpack
* you should see it emit this chunk as a named chunk 
  instead of just of just a number


Change-Id: If2220f505fa734d21235981d5764c3a148c72ad1
Reviewed-on: https://gerrit.instructure.com/108450
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-04-18 00:18:34 +00:00
Ryan Shaw 61c75269b1 Give moduleSequenceFooter chunk a name
closes: CNVS-36292

this makes it easier to debug and know what it is you're looking at

test plan:
* run webpack
* you should see it emit this chunk as a named chunk 
  instead of just of just a number

Change-Id: Id8d7cd1fe88c7e78de7fa8d423bb82017f735c4a
Reviewed-on: https://gerrit.instructure.com/108453
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-04-18 00:17:31 +00:00
Ryan Shaw d9123d811e Take out message about compile_assets going way
rake canvas:compile_assets is still the recommended
Way of making sure all of your stuff gets updated.
We can put a message back when there is something
That really does replace it and runs everything

Change-Id: Ic3f75955b1f0a65097c8fb4e8089258636d4c3b4
Reviewed-on: https://gerrit.instructure.com/108582
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-04-18 00:16:00 +00:00
Ryan Shaw 2b2c67c043 make the fake require console message not so scary
Closes: CNVS-36313

most of the people that are still using this
are people that really do intend on using it.
So we want to change it to be more of a “if you 
use this, your own your own buddy” than an “error,
This is going away”

Test plan:
* load a page and type this in your console:
  require([‘jquery’, ‘underscore’], $ => console.log(‘jQuery is’, $))
* it should log “jQuery is <the query object> and
  output a less scary message than before

Change-Id: I00b4ad77d76b0c395682aeb1689da0ec8ff9c4f3
Reviewed-on: https://gerrit.instructure.com/108583
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-04-18 00:14:55 +00:00
Matt Taylor b9c68e1ffe show grading period weights on student grades page
When viewing a student's grade summary in a course with weighted
grading periods, and when all grading periods are selected for
viewing, show weights of the grading periods instead of assignment
groups weights.

fixes CNVS-36114

Test Plan:
  Create courses with each of the configurations A-F.  For each
  course, test the views listed below it.  The "grade summary"
  refers to grades for a student who has completed assignments
  in at least two grading periods.  Expectations for the tests
  are indicated with one or more of these codes:
     (G) assignment group rows in grade summary
     (P) grading period rows in grade summary
     (T) total in grade summary
     (g) assignment group rows in sidebar
     (p) grading period rows in sidebar
     (t) total in sidebar
     (n) 'assignments are not weighted' in sidebar
  Course Configurations:
  A. Unweighted assignment groups, No grading periods
     1. Syllabus page (n)
     2. Grade summary (n)
  B. Weighted assignment groups, No grading periods
     1. Syllabus page (gt)
     2. Grade summary (GTgt)
  C. Unweighted assignment groups, Unweighted grading periods
     Current date is within a specific grading period
     1. Syllabus page (n)
     2. Grade summary, default view (GTn)
        the default view is the specific grading period
     3. Grade summary, all grading periods view (GTn)
  D. Weighted assignment groups, Unweighted grading periods
     Current date is not within any grading period
     1. Syllabus page (gt)
     2. Grade summary, default view (GTgt)
        the default view is all grading periods
     3. Grade summary, specific grading period view (GTgt)
  E. Unweighted assignment groups, Weighted grading periods
     Current date is within a specific grading period
     1. Syllabus page (p)
     2. Grade summary, default view (GTn)
        the default view is the specific grading period
     3. Grade summary, all grading periods view (PTp)
  F. Weighted assignment groups, Weighted grading periods
     Current date is not within any grading period
     1. Syllabus page (p)
     2. Grade summary, default view (PTp)
        the default view is all grading periods
     3. Grade summary, specific grading period view (GTgt)

Change-Id: I2e46039dd50d38b29b1ba0305644c4ab75ade57c
Reviewed-on: https://gerrit.instructure.com/107977
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Christi Wruck
2017-04-17 23:08:29 +00:00
Brent Burgoyne 5d64de62fe replace hot-loaded rcs with canvas-rce module
closes CNVS-33443

test plan:
- regression test RCS editor and sidebar
  - up to level 2 feature flag
  - do not need to test with high-risk flag (yet)

Change-Id: I92f9282d655203f6b76e7667d4e00cbcc147db6e
Reviewed-on: https://gerrit.instructure.com/107130
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Brent Burgoyne <bburgoyne@instructure.com>
2017-04-17 22:36:46 +00:00
Ryan Shaw 8087b22ce1 give uploadMediaTrackForm chunk a name
closes: CNVS-36293

this makes it easier to debug and know what it is you're looking at

test plan:
* run webpack
* you should see it emit this chunk as a named chunk 
  instead of just of just a number

Change-Id: Iff507d67184f8894b82b863516e0ce7353fa6c57
Reviewed-on: https://gerrit.instructure.com/108452
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-04-17 22:17:48 +00:00
Neil Gupta 04785ee918 Recompute course score when deleting a weighted grading period
Fixes CNVS-36223

Test plan:
* Create a weighted grading period group with 2 grading periods with
  weights 50% each
* Create a course
* Enroll a student in the course
* Create an assignment that falls in the first grading period with 10
  points possible
* Grade the student for that assignment with 5 points
* Check student's grade from their /grades page, it should be 25%
  (50% of 50%)
* Delete the first grading period
* Check the student's grades page again, their score should be 0% now
  (since the assignment is no longer in a GP so it isn't counted)

Gradebook does not use back-end scores, so be sure to check scores
on the /grades page or via rails console.

Change-Id: If00a157be8b709e94303f7d91917f7eca11c16cb
Reviewed-on: https://gerrit.instructure.com/108136
Reviewed-by: Spencer Olson <solson@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-04-17 21:59:47 +00:00
Clay Diffrient 3cb01d570d Fix mispelled include parameter
closes FALCOR-204

Test Plan:
  - Load up a context card
  - It should have metrics table and last login data

Change-Id: I1539040b63b9b043949a209f00ea629db735d65f
Reviewed-on: https://gerrit.instructure.com/108831
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Tested-by: Jenkins
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2017-04-17 20:46:25 +00:00
Jennifer Stern 930745fe7e Bump instructure-icons and instructure-ui
closes: CNVS-35498, CNVS-36371

- New icon
- Better SVG support
- PopoverMenu bug fixes

Test Plan:
- Make sure icons show up
- Make sure icon-external-link works (you can do this by
just changing a class name on any icon in inspector)
- Regression test areas that use instructure-ui

Change-Id: Ib43d0698571f8e22a2977cde5e9bbdfc1e6acf40
Reviewed-on: https://gerrit.instructure.com/108745
Reviewed-by: Derek Bender <djbender@instructure.com>
Reviewed-by: Pam Hiett <phiett@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins
QA-Review: Dan Sasaki <dsasaki@instructure.com>
2017-04-17 20:39:38 +00:00
Jeremy Stanley 9fff19e579 truncate long course names in scheduler calendar picker
test plan:
 - have courses and sections with very long names
 - ensure, with New Scheduler off and on, that when creating a
   new appointment group, the calendar picker widget layout
   works reasonably
 - also the "Go" button next to the split-in-equal-slots
   thing should be positioned properly vertically

fixes CNVS-35960

Change-Id: I241f545bc2eea726674cda1c61a045484b64a0a0
Reviewed-on: https://gerrit.instructure.com/107204
Tested-by: Jenkins
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2017-04-17 19:38:35 +00:00
James Williams 77e2fb7f98 rewrite the super slow query in submissions_for_context_codes
rewrite so it doesn't do a seq scan on submission_comments

don't worry about submission_comment_participants and
just use user_id on submissions (since the 'submitter' should
be the same)

test plan:
* recent feedback should grab submissions with recent
submissions comments from graders as before

Change-Id: Ib25e7d728051b005befdb09ca6fcd956bbcd989d
Reviewed-on: https://gerrit.instructure.com/108388
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-04-17 18:51:35 +00:00
Steven Burnett b9ce95cc56 add duplicate objects feature flag
fixes FALCOR-177

Test Plan:
- Log and go to the account settings page
- Go to feature options
- Notice that there is a feature flag option
  called duplicate objects and it is hidden

Change-Id: Ieda4a9090ee28a463d194c42c1c5b96dc33b1489
Reviewed-on: https://gerrit.instructure.com/108772
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2017-04-17 18:46:59 +00:00
James Williams d5069861c5 make submission comments draft not-null
Change-Id: Id81c70da1ce6a1ad1a389baa61e0583427fb091c
Reviewed-on: https://gerrit.instructure.com/108556
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-04-17 18:39:41 +00:00
Ed Schiebel 6f48ef13e0 Fix remove student from appt. group button
this gets it working in JAWS, though you still cannot arrow your way to
the remove student button in NVDA. I believe this is a bug in the screen
reader and this is the best we can do

test plan:
  - recreate steps from the ticket
  > using JAWS, you can down-arrow into the X button and press it
  > using NVDA, you can down-arrow into the student's name and the SR
    will read it, but you have to TAB into the button to press it

fixes CNVS-35823

Change-Id: Ida4a9ee2326eb56615b8ccc877dbde5d93dc1fa0
Reviewed-on: https://gerrit.instructure.com/106337
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
Tested-by: Jenkins
2017-04-17 18:12:52 +00:00
Jayce Higgins 55435653dd Add UUID to delayed job live event payload
Refs: PLAT-2369

Test-plan:
  - setup multiple root accounts with /c/106174/
  - spinup local live-event testing services
  - test out live-event spawning processes as a result of a delayed job
  - assert that the kinesis stream contains events with attributes
    containing `root_account_uuid`

Change-Id: Ia00dd8d25497529dcf59b9d7b3d0b438d334a61e
Reviewed-on: https://gerrit.instructure.com/106175
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Jayce Higgins <jhiggins@instructure.com>
2017-04-17 17:10:10 +00:00
Jacob Fugal 986476711c fix documentation for selenium w/ docker
Change-Id: Icdb7a99d704d032825820ae49fe0c638f80427ae
Reviewed-on: https://gerrit.instructure.com/108804
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
2017-04-17 17:03:18 +00:00
Mysti Sadler 84c36dc51a Reshape end tutorial modal
closes FALCOR-172

Test plan
- Turn on the new user feature flag in account flags
- Turn on the new user feature flag in user flags for a teacher
- Go to the tutorial and hit the end tutorial button
- Ensure the modal is close to a square shape

Change-Id: Id3c14865848c25ece5e5509b2e8545c7209710b5
Reviewed-on: https://gerrit.instructure.com/107626
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Tested-by: Jenkins
Product-Review: Mary Jane Anderson <manderson@instructure.com>
2017-04-17 16:12:34 +00:00
Derek Bender ac9666a362 add unpublished assignments to gradezilla
fixes: CNVS-31606

test plan:
 - Given gradezilla enabled
 - Given at least one unpublished assignment

 - When on the gradebook for the first time
 - Then the unpublished assignment column cells are shown
   grayed out and grades in cells are hidden

 - When the View menu has been opened
 - Then the "Unpublished Assignments" menu item is selected

 - When deselecting the "Unpublished Assignments" menu item
 - Then the unpublished assignment is hidden without a page load

 - When reloading the gradebook
 - Then the unpublished assignment is still hidden
 - Then the menu item for "Unpublished Assignments" is still
   not selected

 - When selecting the "Unpublished Assignments" menu item and
   reloading the gradebook
 - Then the unpublished assignment is still present
 - Then the menu item for "Unpublished Assignments" is still
   selected

Change-Id: Ie3a12b5411a8022b8119a6d7afbada767b51cdfa
Reviewed-on: https://gerrit.instructure.com/107013
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Christi Wruck
2017-04-17 16:10:46 +00:00
James Williams fdb6761260 don't create linked observer enrollments in transaction
Change-Id: If651744c99869646215a328e1ddc2b92524d8f84
Reviewed-on: https://gerrit.instructure.com/108771
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-04-17 15:36:42 +00:00
Jon Willesen 968fb2dc97 add assignmentExportId to web zip exports
refs OFFW-146

test plan:
* quizzes and graded discussions in offline content exports should have
  an assignmentExportId field in the course data.

Change-Id: Ia9ae66aae7dbd9bc47d91ee014b2bc1674ce01de
Reviewed-on: https://gerrit.instructure.com/105913
Reviewed-by: Mysti Sadler <mysti@instructure.com>
Tested-by: Jenkins
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Jon Willesen <jonw+gerrit@instructure.com>
2017-04-17 15:22:01 +00:00
James Williams 5b781952eb fix reset_test_student with more moderated grading data
need to delete more data to prevent foreign key errors
when deleting the test student

closes #CNVS-36160

Change-Id: I954afa9db2a939192862cc1805ee9bd70a442867
Reviewed-on: https://gerrit.instructure.com/107771
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-04-17 15:16:58 +00:00
James Williams 56653b9072 update submission_comments_count after unmuting assignment
test plan:
* have a muted assignment with a submission
* as a teacher, make a submission comment
* unmute the assignment
* the submission comments should show on the
 student's conversations inbox page

closes #CNVS-18916

Change-Id: I05fcfdfb6c06ea71f4626d22e32bed32ee966dfa
Reviewed-on: https://gerrit.instructure.com/108166
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-04-17 15:15:53 +00:00
Ed Schiebel e6a1205711 Lock restricted items when editing an assignment
prevent the user from changing locked assignment fields

closes MC-115

test plan:
  - create a master course
  - from course/#/settings page, lock content, points, due_dates and availability_dates
  - add an assignment
  - migrate to a child course
  - as an admin, go to the assignment index page
    - click on the gear menu for the assignment and choose edit
    > expected result: you can edit everything
    - click on More Options
    > expected result: the edit page opens and you can edit everything
  - as a teacher, go to the child course assignments page
    - click on the gear menu for the assignment and choose edit
    > expected result: you cannot edit anything
    - click on the more options button
    > expected result: you cannot edit the title, description, points or
      dates, but changing other stuff and saving succeeds

Change-Id: Ic6c95e5af90f5398607bb2dbfb532e19e46c784e
Reviewed-on: https://gerrit.instructure.com/106991
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Tested-by: Jenkins
Product-Review: Kendall Chadwick <kchadwick@instructure.com>
2017-04-17 15:12:44 +00:00
Transifreq a851f9af03 update da translation
Change-Id: Ia0f797cca29e81e2e2b76089a556bd6cec1543f4
2017-04-15 05:10:22 -06:00
Shahbaz Javeed e8af60fdd8 total grade column can now be moved to the front or end
refs CNVS-34243

test plan:
* Create a course with 2 assignment groups with 1 assignment each
  and 2 students
* Go to Gradezilla

* Open the Total column's options.  You should see
  a menu item that says "Move to Front"
* Click on this and it should move the Total column
  to the front of the table next to Student Name.
* Verify that the Total column is now frozen and can only be
  moved within the frozen columns
* Verify that any other columns you might have moved around
  stay in their position even as the total grade column
  moves
* Open the Total column's options again and notice
  the menu item that says "Move to End"
* Clicking this should take the column to the end
  of the table
* Verify that the Total column is now freely movable as
  before
* Verify that any other columns you might have moved around
  stay in their position even as the total grade column
  moves
* Manually drag the Total column to the middle of
  the table and notice that now both "Move to Front"
  and "Move to End" are available in the options
  and they both work as described above

Change-Id: I1a1fbca6c593d8d576ca57bd7ac6968e114a7cc1
Reviewed-on: https://gerrit.instructure.com/108181
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: Keith T. Garner <kgarner@instructure.com>
Product-Review: Christi Wruck
2017-04-14 21:46:51 +00:00
MFairbourn ee15e1e4ce spec: skip / fix a few outstanding chrome build issues
Test Plan:
- Jenkins /chrome
- Code review

Change-Id: I5ebfc237aee2d63936c99af048ac4db6ddb1ca4a
Reviewed-on: https://gerrit.instructure.com/108698
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-14 21:08:08 +00:00
Deepeeca Soundarrajan 6ddb0fb7be spec: Fix the failing build in chrome
Test Plan:
  Passes chrome build

Change-Id: I9c86aa26c3c3c987079f004d7ede4d2851517c61
Reviewed-on: https://gerrit.instructure.com/108493
Tested-by: Jenkins
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-14 19:43:37 +00:00
Anju Reddy 623f0ed9e7 spec: Fixing two more gradezilla selenium specs for chrome
Change-Id: Ib1eaafa5613c4fa82a0f3f85043086459cf3a8ca
Reviewed-on: https://gerrit.instructure.com/108648
Tested-by: Jenkins
Reviewed-by: Derek Bender <djbender@instructure.com>
Product-Review: Neil Gupta <ngupta@instructure.com>
QA-Review: Neil Gupta <ngupta@instructure.com>
2017-04-14 18:14:08 +00:00
Anju Reddy ae3eb98391 spec: Fix gradezilla custom column spec chrome failure
Change-Id: I7027847ce6e13fdcf1257e152e6a256927a5cc69
Reviewed-on: https://gerrit.instructure.com/108594
Tested-by: Jenkins
Reviewed-by: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2017-04-14 15:51:37 +00:00
Ryan Shaw 5b49008d72 Load badge counts async and only if needed
closes:  CNVS-36300

test plan:
this chunk of js shouldn't be included in the common bundle and should
only be loaded if ENV.badge_counts is true and as a seperate chunk



Change-Id: Ia83418cb7604c50ad91c2bf54a4fac79ca381b5a
Reviewed-on: https://gerrit.instructure.com/108447
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-04-13 22:07:28 +00:00
Ryan Shaw 53e064b365 s/require/define/ in app/coffeescripts/bundles
closes: CNVS-36297

these are the bundles that I never converted
over to javascript. This change makes it so they
Don’t load their deps in a separate chunk so there
is not 2 round trips to get each.

Test plan:
* Run webpack
* you should see less unnamed, numbered chunks
* load one of these pages
* it should load all of the js in one request,
  and not use a separate request to load the deps
  of the bundle

Change-Id: Id71318d42fe47b2a665fc2b1dababefec77ce9ad
Reviewed-on: https://gerrit.instructure.com/108446
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-04-13 22:06:25 +00:00
MFairbourn 0680b737fc spec: fix fragile collaborations spec
Test Plan:
- Pass Jenkins
- Code review

Change-Id: If7f938666d0e59fc5d98f2544f2655b35aa080c7
Reviewed-on: https://gerrit.instructure.com/108569
Tested-by: Jenkins
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-13 21:28:25 +00:00
MFairbourn 9a55e17cd0 spec: skip fragile conferences_common specs in chrome
Test Plan:
- Pass Jenkins /chrome
- Code Review

Change-Id: Iba81caa79046714695440c94808cf874112ae0f5
Reviewed-on: https://gerrit.instructure.com/108552
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Tested-by: Jenkins
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-13 21:13:37 +00:00
Neil Gupta 6262f2ad3c Support fixer recognizes crocodocs stuck in "processing" state
Support can now process crocodocs that are stuck in a "processing"
state if they've been stuck for more than a day.

fixes CNVS-36239

Change-Id: I6f0ce45be4883ade44d9bc715f4b6a16007caea5
Reviewed-on: https://gerrit.instructure.com/108201
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Product-Review: Neil Gupta <ngupta@instructure.com>
QA-Review: Neil Gupta <ngupta@instructure.com>
2017-04-13 20:24:46 +00:00
Tyler Pickett 1af48f08a2 Bump inst-jobs version for parent process loggging
Refs: CNVS-36134
Change-Id: Ib7b53f3943300dfcf81a06562147e9e5cb69b8a4
Reviewed-on: https://gerrit.instructure.com/108494
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Tyler Pickett <tpickett@instructure.com>
2017-04-13 20:14:47 +00:00
MFairbourn b846c0f082 spec: fix collaborations_student_spec.rb:26 in chrome
Test Plan:
- Pass Jenkins /chrome
- code review

Change-Id: Ie8d53caea8bcf97fc5142462b6c54fe9a68469fe
Reviewed-on: https://gerrit.instructure.com/108537
Reviewed-by: Anju Reddy <areddy@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Tested-by: Jenkins
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-13 19:55:43 +00:00
Anju Reddy d35227f767 spec: Fixing gradezilla specs that are failing on chrome
Change-Id: I21ce5ab8474515adf2948b2273008f907493ba33
Reviewed-on: https://gerrit.instructure.com/108535
Tested-by: Jenkins
Reviewed-by: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-13 19:44:55 +00:00
James Williams 5f00708928 include home page announcement limit in course copy
test plan:
* set a course to show announcements on home (wiki) page
 with an announcement limit
* copy the course
* the announcement limit should be copied

closes #CNVS-36175

Change-Id: If6b1ec7e37752829b7116ab412e50cff6dcb6389
Reviewed-on: https://gerrit.instructure.com/107910
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: David Tan <dtan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2017-04-13 19:37:24 +00:00
Caleb Guanzon 15541e1d91 spec: fix failing chrome gradezilla spec
spec/selenium/grades/gradezilla/gradebook_spec.rb:226

the error was showing that the grid underneath will be clicked
instead of the download link. this might be due to the link being
off the viewable portion of the page. the attempted solution
is to make the page full screen so that the link is visible

Change-Id: Icb493bfb5ce2d6c5a8ee0a79d465a245a8144b03
Reviewed-on: https://gerrit.instructure.com/108527
Tested-by: Jenkins
Reviewed-by: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-13 19:13:24 +00:00
James Williams b50d54c16c add a check on polymorphic_where to make sure we pass things in
Change-Id: I9e2da6bedcc2ad1271d758aefba8da620eae071f
Reviewed-on: https://gerrit.instructure.com/108478
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-04-13 18:50:51 +00:00
James Williams d5a4e24459 don't explode when preloading version number for an empty set
Change-Id: I956beb028f039f4e899d910084a473629add5ea3
Reviewed-on: https://gerrit.instructure.com/108477
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-04-13 17:13:43 +00:00
Ryan Shaw 83acd2c10f Fix regression in media comment uploader
Fixes: CNVS-36276

Test plan:
* Enable Kaltura on account
* Navigate to a wiki page
* Click Edit
* Click 'Record/Upload Media'
* Ensure modal will load and user will be able 
  to record or upload a video

Change-Id: I899fe97a4afb5081e83e73ed22dc0eea0d4a2569
Reviewed-on: https://gerrit.instructure.com/108454
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2017-04-13 17:00:30 +00:00
Deepeeca Soundarrajan d5c0dcbcb1 spec: Fix fragile specs on chrome builds
Change-Id: I9fd2c2154882754a95be36f25cc78e13e290e414
Reviewed-on: https://gerrit.instructure.com/108361
Tested-by: Jenkins
Reviewed-by: Robert Lamb <rlamb@instructure.com>
Product-Review: Robert Lamb <rlamb@instructure.com>
QA-Review: Robert Lamb <rlamb@instructure.com>
2017-04-12 22:18:38 +00:00
MFairbourn 83af04bb47 spec: skip a jquery spec in chrome
Test Plan:
- Pass Jenkins
- Code Review

Change-Id: Ice3845b5889e62d3a340e8bff72a529903144bb3
Reviewed-on: https://gerrit.instructure.com/108408
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-12 22:00:05 +00:00
Brad Horrocks 6da6c1c4c5 add canvadocs.preferred_plugin_course_id dropped_columns
Refs: RD-2906
This should have been in e54ff2e0 :(

Change-Id: I17a57e73041a797a4f466e83d6419ac91e9ee3b9
Reviewed-on: https://gerrit.instructure.com/108401
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Tested-by: Jenkins
QA-Review: Simon Williams <simon@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
2017-04-12 21:05:37 +00:00
Brad Horrocks e54ff2e0e4 Send preferred_plugins when submissions are auto sent to canvadocs
Refs: RD-2906
Test plan:
enable canvadoc annotation support
enabled pdfjs feature
submit an assignment
wait for delayed job to send it to canvadocs
open speed grader
see pdfjs

Change-Id: I04028605fcc21c77c25f158d11f1cee33cb617d8
Reviewed-on: https://gerrit.instructure.com/107497
Reviewed-by: Neil Gupta <ngupta@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Tested-by: Jenkins
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2017-04-12 19:41:36 +00:00
MFairbourn 1185933faf spec: fix wiki wysiwyg specs to run in chrome
Test Plan:
- Pass Jenkins / chrome
- Code review

Change-Id: Iaad2a35396075ac1ecb39166aa59ecefebf2145e
Reviewed-on: https://gerrit.instructure.com/108359
Tested-by: Jenkins
Reviewed-by: Kyle Rosenbaum <krosenbaum@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2017-04-12 18:38:50 +00:00
Spencer Olson e55d439a09 add notes option to view menu
Adds the 'Notes' option to the 'View' menu in Gradezilla.
Removes that option from the Gradebook Settings cog.

closes CNVS-31605

Test Plan 1: Updating Teacher Notes
1. Open Gradezilla.
2. Verify the 'View' menu has a 'Notes' option.
3. Verify the Gradebook Settings cog does not have a 'Show Notes'/
   'Hides Notes' option.
4. Click the 'Notes' option. Verify in the brief moment that the
   notes are being fetched, the 'Notes' option is disabled.
5. Verify the notes column is visible and notes cells have the notes
   content in them.
6. Verify the 'Notes' option has a checkmark next to it.
7. Reload the page. Verify the 'Notes' option has a checkmark
   next to it and the notes column is visible.
7. Click the 'Notes' option. Verify in the brief moment that the
   request to hide the notes is in process, the 'Notes' option is
   disabled.
8. Verify the notes column is hidden.
9. Verify the 'Notes' option does not have a checkmark next to it.
10. Reload the page. Verify the 'Notes' option does not have a
    checkmark next to it and the notes column is hidden.

Test Plan 2: Creating Teacher Notes
* If a course does not have any teacher notes, clicking the 'Notes'
  option should create a teacher notes column in which teacher notes
  will be stored.
1. Enter a rails console and get the teacher note column for a course.

  teacher_note_column = Course.find(2).
    custom_gradebook_columns.find_by(teacher_notes: true)

2. Destroy the teacher note column.

  teacher_note_column.destroy

3. Open Gradezilla and open the Developer Tools in your browser.
4. Click the 'Notes' option. Verify in the brief moment that the
   notes are being fetched, the 'Notes' option is disabled.
5. Verify the notes column is visible.
6. Check the Network Tab in your Developer Tools and find the request
   that was sent when you clicked the 'Notes' option. The request
   should be to api/v1/courses/:course_id/custom_gradebook_columns.
7. Verify the request succeeded (response 200) and the form data
   includes the key/val "_method: POST"

Change-Id: Ib199b636ba67070878cde2939795247c6e45f5ae
Reviewed-on: https://gerrit.instructure.com/106700
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Christi Wruck
2017-04-12 18:15:00 +00:00