Skip to content
Commits on Apr 26, 2016
  1. @ccutrer

    treesame commit of origin/stable/2016-04-23

    ccutrer committed Apr 26, 2016
    Treesame-Commit-Id: d4eba9e
  2. @evizitei

    make a top level reference to QuizTakingPolice

    evizitei committed Apr 25, 2016
    fixes CNVS-28931
    
    TEST PLAN:
     1) build a timed quiz
     2) take quiz in Chrome 50
     3) timer should work
    
    Change-Id: I93d8f591197bd7d1efed5ef13fba0df44abca3f1
Commits on Apr 25, 2016
  1. @ccutrer

    update tr translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: I42c336c00ea09fb3c84d2fcae231e39916b22c7d
  2. @ccutrer

    update sv translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: I352887e875f5a75f07def18feb87e2968cc4b42c
  3. @ccutrer

    update pt translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: Icad22dbf4a75b43e07831af05c99225dafdb9b11
  4. @ccutrer

    update nb translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: I9c6c685a93aebf5f8afd138f74712aee8e277aed
  5. @ccutrer

    update mi translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: I3d619ed88058e575242ba60d1d58eb1b5a44d592
  6. @ccutrer

    update ja translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: I0bc0bda99ec2aa027bc952e1bfc082565049650a
  7. @ccutrer

    update hy translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: I874e2bd8a7adc81cba93701da07de9a8b7f28a2b
  8. @ccutrer

    update fa translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: I301bc9831f19ff4fac2939a648f17a54d98d1557
  9. @ccutrer

    update es translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: Ib78a162042384241052b995c7d58fc8b7334b139
  10. @ccutrer

    update en-AU translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: If06fb09ddb8b7f2b74cecf6187bb90bdd028ecc0
  11. @ccutrer

    update ar translation

    Transifreq committed with ccutrer Apr 25, 2016
    Change-Id: I9baa472d6354c9f156bedea0b07d7d485e5344e8
Commits on Apr 23, 2016
  1. @lukfugl

    treesame commit of origin/stable/2016-04-23

    lukfugl committed Apr 23, 2016
    Treesame-Commit-Id: 48701f2
  2. @roor0

    Revert "lock the description if the discussion is locked"

    roor0 committed Apr 23, 2016
    This reverts commit aa0c0c9.
    
    Change-Id: Ic8f2c7a50bdb01586451e42e5116a92540603c6b
    Reviewed-on: https://gerrit.instructure.com/77785
    Reviewed-by: Joel Hough <joel@instructure.com>
    Product-Review: Joel Hough <joel@instructure.com>
    QA-Review: Joel Hough <joel@instructure.com>
    Tested-by: Joel Hough <joel@instructure.com>
Commits on Apr 22, 2016
  1. @roor0

    treesame commit of origin/stable/2016-04-02

    roor0 committed Apr 22, 2016
    Treesame-Commit-Id: 35ec33e
  2. @ryankshaw @roor0

    fix bug caused by node-sass not allowing @import inside @if

    ryankshaw committed with roor0 Apr 21, 2016
    fixes: CNVS-28888
    
    by pinning node-sass to 3.4.2 in brandable_css
    we avoid the bug introduced in 3.5.1 where
    it won't allow us to @import inside an @if
    
    test plan:
    * run compile_assets
    * css should look the same as before
    
    Change-Id: I437afd60e4dde60e65d03de4deca5a67ef7e3897
    Reviewed-on: https://gerrit.instructure.com/77639
    Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
    Tested-by: Jenkins
    Product-Review: Ryan Shaw <ryan@instructure.com>
    QA-Review: Ryan Shaw <ryan@instructure.com>
  3. @simonista

    treesame commit of origin/stable/2016-04-23

    simonista committed Apr 22, 2016
    Treesame-Commit-Id: 96181d2
Commits on Apr 21, 2016
  1. @ryankshaw @simonista

    fix bug caused by node-sass not allowing @import inside @if

    ryankshaw committed with simonista Apr 21, 2016
    fixes: CNVS-28888
    
    by pinning node-sass to 3.4.2 in brandable_css
    we avoid the bug introduced in 3.5.1 where
    it won't allow us to @import inside an @if
    
    test plan:
    * run compile_assets
    * css should look the same as before
    
    Change-Id: I437afd60e4dde60e65d03de4deca5a67ef7e3897
    Reviewed-on: https://gerrit.instructure.com/77639
    Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
    Tested-by: Jenkins
    Product-Review: Ryan Shaw <ryan@instructure.com>
    QA-Review: Ryan Shaw <ryan@instructure.com>
  2. @roor0 @maneframe

    handle conflicting submissions on user split

    roor0 committed with maneframe Apr 20, 2016
    fixes CNVS-28859
    
    test plan
     - have a submission for user a and user b in same
       course and assignment
     - merge users
     - split users
     - split should succeed
    
    Change-Id: Ic9ceb6645c47015f453945bbd32e22914e4d0d62
    Reviewed-on: https://gerrit.instructure.com/77546
    Tested-by: Jenkins
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
  3. @lukfugl @maneframe

    apply body height to #tinyrce same as #tinymce

    lukfugl committed with maneframe Apr 19, 2016
    refs CNVS-26705
    
    we make the body of the tinymce iframe taller so that (maybe among other
    things) the drag/drop target in an empty or nearly empty editor is
    larger. but the rule targeted #tinymce, and in the RCS (for reasons) the
    body's id is #tinyrce. so make it work for both
    
    test-plan:
     - enable remote editor
     - go to a page with an editor (e.g. create assignment)
     - make sure the editor contents are empty or nearly so
     - try and drag content into the editor with the mouse released over an empty
       portion of the editor (well below the end of any existing content)
     - should still drop the content into the editor, landing at the end of
       the existing content
    
    Change-Id: I42d9760ee482449e6974f8adace2b7e10aa7d5dd
    Reviewed-on: https://gerrit.instructure.com/77411
    Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Jacob Fugal <jacob@instructure.com>
  4. @maneframe

    turn psych migration on for everywhere

    maneframe committed Apr 20, 2016
    closes #CNVS-28848
    
    Change-Id: Ib571832616d0c08431eab95fe6e9a53bb4c016ec
    Reviewed-on: https://gerrit.instructure.com/77519
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
Commits on Apr 18, 2016
  1. @maneframe

    fix bug in IE10|Win8 and alignment in FF on all courses page

    Pam Hiett committed with maneframe Apr 14, 2016
    Fixes: CNVS-28706
    Fixes: CNVS-28681
    
    test plan:
    - as a user with new UI using IE10|Win8|Chrome
    - navigate to "courses" in left-hand nav > select "all courses"
    - the course colors should now be showing as a solid color vs an
      outlined box
    
    - as a user with new UI using FF
    - repeat above steps (course color should align properly)
    
    Change-Id: If3baa7604a0af57776c41b85a88d9eaf0128bd14
    Reviewed-on: https://gerrit.instructure.com/77057
    Tested-by: Jenkins
    Reviewed-by: Colleen Palmer <colleen@instructure.com>
    Product-Review: Colleen Palmer <colleen@instructure.com>
    QA-Review: Myller de Araujo <myller@instructure.com>
  2. @maneframe

    Cache account notifications by sub account ids

    Tyson Brown committed with maneframe Apr 12, 2016
    refs PFS-3588
    
    Test Plan
    * Since the notifications query now varies based on a user's sub account
      enrollments/admins, we need a unique cache for each sub account set
    * Create a user with an enrollment in a sub account
    * See that their dashboard shows announcements from that sub account
    * Create a second user without any enrollment in the sub account
    * Check their dashboard and ensure they are not seeing that sub accounts
      announcements on their dashboard
    
    Change-Id: Ia7f277c756dcf3d8fb6df321dd7b00f3b8a53c89
    Reviewed-on: https://gerrit.instructure.com/76877
    Tested-by: Jenkins
    Reviewed-by: Simon Williams <simon@instructure.com>
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Allison Weiss <allison@instructure.com>
Commits on Apr 15, 2016
  1. @evizitei @simonista

    don't grab a connection before substituting bind vars

    evizitei committed with simonista Apr 15, 2016
    fixes CNVS-28690
    
    TEST PLAN:
     1) birth shard should not get trampled with useless connections in
    prod
    
    Change-Id: Ib44dcd083c92170a16dcfaad3b3c61443f97818a
    Reviewed-on: https://gerrit.instructure.com/77160
    Reviewed-by: Simon Williams <simon@instructure.com>
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    Tested-by: Jenkins
    Product-Review: Ethan Vizitei <evizitei@instructure.com>
  2. @cmatheson @simonista

    create canvadocs_submissions records for group submissions

    cmatheson committed with simonista Apr 8, 2016
    fixes CNVS-27465
    refs CNVS-27404
    
    Test plan:
      * enable crocodoc (or canvadocs with annotations)
      * create and submit a group assignment
      * annotate the document as the teacher
      * every student in the group should be able to view those annotations
    
    Change-Id: Iafb3a2546735c928e4c534ceb2895e13a37cb7aa
    Reviewed-on: https://gerrit.instructure.com/76723
    Tested-by: Jenkins
    Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
    QA-Review: Amber Taniuchi <amber@instructure.com>
    Reviewed-by: Keith T. Garner <kgarner@instructure.com>
    Product-Review: Keith T. Garner <kgarner@instructure.com>
  3. @cmatheson @simonista

    ignore irrelevant enrollments in gradebook2

    cmatheson committed with simonista Apr 13, 2016
    fixes CNVS-28685
    
    Test plan:
      * set up a course where a student is an observer of another student
        (but also a student in the course himself)
      * the gradebook should load
    
    Change-Id: I421ae51964eaecc2208740ffff99cfef2271eb0c
    Reviewed-on: https://gerrit.instructure.com/76951
    Tested-by: Jenkins
    Reviewed-by: Keith T. Garner <kgarner@instructure.com>
    Reviewed-by: Derek Bender <djbender@instructure.com>
    QA-Review: Amber Taniuchi <amber@instructure.com>
    Product-Review: Keith T. Garner <kgarner@instructure.com>
  4. @simonista

    fix course favorite "icon-star-light" for windows users

    Pam Hiett committed with simonista Apr 14, 2016
    Fixes: CNVS-28725
    
    test plan:
    - as a user with the new UI using a windows machine (any browser)
    - navigate to "Courses" in the left-hand nav
    - select "All Courses" from the sub-nav
    - there should be an obvious difference between items that have
      been favorited vs those that have not (ensure the deliniation
      remains when turning on "high contrast")
    
    Change-Id: I6bc9b2eca4a7524e0e5e0f82727875e7dc9442ae
    Reviewed-on: https://gerrit.instructure.com/77090
    Tested-by: Jenkins
    Reviewed-by: Colleen Palmer <colleen@instructure.com>
    Product-Review: Colleen Palmer <colleen@instructure.com>
    QA-Review: Pierce Arner <pierce@instructure.com>
  5. @evizitei

    don't grab a connection before substituting bind vars

    evizitei committed Apr 15, 2016
    fixes CNVS-28690
    
    TEST PLAN:
     1) birth shard should not get trampled with useless connections in
    prod
    
    Change-Id: Ib44dcd083c92170a16dcfaad3b3c61443f97818a
    Reviewed-on: https://gerrit.instructure.com/77160
    Reviewed-by: Simon Williams <simon@instructure.com>
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    Tested-by: Jenkins
    Product-Review: Ethan Vizitei <evizitei@instructure.com>
Commits on Apr 14, 2016
  1. @evizitei @simonista

    pull developer_key from slave

    evizitei committed with simonista Apr 13, 2016
    fixes CNVS-28690
    
    No tests because behavior unchaged, using slave
    as a performance optimization.
    
    Change-Id: I5bbd881cdbef9350c336f1d5acd098b31de5783a
    Reviewed-on: https://gerrit.instructure.com/76969
    Tested-by: Jenkins
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    Product-Review: Ethan Vizitei <evizitei@instructure.com>
  2. @claydiffrient @simonista

    Scope RCE toggle while taking quizzes to current RCE

    claydiffrient committed with simonista Apr 12, 2016
    This makes it so not all RCE instances get toggled when
    clicking on the HTML mode link.
    
    closes CNVS-28676
    
    Test Plan:
      - Set up a quiz with multiple essay type questions
      - Preview the quiz
      - Toggling the HTML/RCE mode on them should only affect the
        RCE it is next to, not all of them.
    
    Change-Id: Ia93d7f4842315112528114f3742cfb2a99903ea2
    Reviewed-on: https://gerrit.instructure.com/76899
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: Clay Diffrient <cdiffrient@instructure.com>
  3. @maneframe @simonista

    switch safeyaml scalar transformation for psych

    maneframe committed with simonista Apr 12, 2016
    fixes a problem with serializing strings like "1._"
    and hopefully other problems lurking inside safeyaml
    
    closes #CNVS-28660
    
    Change-Id: I45353dcfa84dbe5eba902a731219590f1ba1daf8
    Reviewed-on: https://gerrit.instructure.com/76896
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
  4. @claydiffrient @simonista

    Add HTML mode toggle to quiz essay answers

    claydiffrient committed with simonista Apr 6, 2016
    closes CNVS-28225
    
    Test Plan:
     - Create a quiz with an essay question
     - Take that quiz
     - There should be a toggle link to switch between
       RCE mode and HTML mode.
     - Toggling between the two should work
    Change-Id: I06bfad7a01deeb13293bbae4c748337ca1797d17
    Reviewed-on: https://gerrit.instructure.com/76485
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: Jason Sparks <jsparks@instructure.com>
Commits on Apr 13, 2016
  1. @evizitei

    pull developer_key from slave

    evizitei committed Apr 13, 2016
    fixes CNVS-28690
    
    No tests because behavior unchaged, using slave
    as a performance optimization.
    
    Change-Id: I5bbd881cdbef9350c336f1d5acd098b31de5783a
    Reviewed-on: https://gerrit.instructure.com/76969
    Tested-by: Jenkins
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    Product-Review: Ethan Vizitei <evizitei@instructure.com>
  2. @maneframe @simonista

    switch safeyaml scalar transformation for psych

    maneframe committed with simonista Apr 12, 2016
    fixes a problem with serializing strings like "1._"
    and hopefully other problems lurking inside safeyaml
    
    closes #CNVS-28660
    
    Change-Id: I45353dcfa84dbe5eba902a731219590f1ba1daf8
    Reviewed-on: https://gerrit.instructure.com/76896
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
Something went wrong with that request. Please try again.