Commits on Jul 22, 2016
  1. @ktgeek @ktgeek

    honor gradebook inactive/concluded settings in speedgrader

    Speedgrader now honors the settings from core gradebook related to
    showing active and inactive enrollments.  For group assignments, the
    representative student will be favored in priority order of active,
    inactive, concluded.
    
    This also fixes an issue where inactive students in a group wouldn't
    receive the group grade when the group was graded in both the
    gradebook and speedgrader.
    
    fixes CNVS-28432
    
    test plan:
     Individual assignments:
       - Create a course with at a individual assignment, and three
         students, one active, one inactive, and one concluded.
       - In gradebook turn off show inactive and show concluded.
       - Load speedgrader and note that only the active student shows.
       - In gradebook turn on show inactive.
       - Load speedgrader and note that both the active and inactive
         students show and the inactive student shows the inactive notice
       - In gradebook turn off show inactive and turn on show concluded.
       - Load speedgrader and note that both the active and concluded
         students show and the concluded student shows the concluded
         notice.
       - In gradebook turn on show inactive and turn on show concluded.
       - Load speedgrader and note that all the students show with
         appropriate notices.
    
     Group assignments:
       - Create a course with three students and put them in one group.
         After being grouped, set one inactive and one concluded. (If
         possible make the "third" student the active one.)
       - Create a group assignment
       - Load speedgrader for the assignment
       - Note that neither the inactive nor concluded banner
         appears. Using the debugger, note that the student id of the
         group matches that active student id.
       - In gradebook, deactivate the active student.  In the settings,
         confirm that both "show inactive" and "show concluded" is off.
       - Load speedgrader, note that it says there is no work to do.
       - In gradebook settings, confirm that both "show inactive" and
         "show concluded" is enabled.
       - Load speedgrader, note the "Inactive Student" banner. Using the
         debugger, note that the student id for the group is one of the
         inactive students.
       - Conclude all the students.
       - Load speedgrader, note the "Concluded Student" banner. Using the
         debugger, note that the student id for the group is one of the
         concluded students.
    
    Change-Id: I60c8cbae6244e7acc85b61b99c6d03135152234a
    Reviewed-on: https://gerrit.instructure.com/83272
    Reviewed-by: Derek Bender <djbender@instructure.com>
    Tested-by: Jenkins
    QA-Review: KC Naegle <knaegle@instructure.com>
    Product-Review: Christi Wruck
    ktgeek committed with ktgeek Jun 17, 2016
  2. @maneframe

    fix plugin loading from outside rails root directory

    Change-Id: I215b3cc73cc58ca889fe7591f1658da754a28d23
    Reviewed-on: https://gerrit.instructure.com/85688
    Tested-by: Jenkins
    Reviewed-by: Simon Williams <simon@instructure.com>
    Product-Review: Simon Williams <simon@instructure.com>
    QA-Review: Simon Williams <simon@instructure.com>
    maneframe committed Jul 19, 2016
  3. Fix icon alignment for student Dashboard To Do List

    Fixes: CNVS-29575
    
    test plan:
    - as a student with items in the to do list... the icon should
      now have some breathing room between it and the text
    - as a moderated grader - the above should be true as well
    - ensure the admin to do still renders as it did
    
      old view: http://screencast.com/t/YXzzGVaOr3WC
      new view: http://screencast.com/t/M1JQhYzD
    
    Change-Id: I59153f8b7471bd0795089c82279accdf00dc12e3
    Reviewed-on: https://gerrit.instructure.com/84672
    Reviewed-by: Chris Hart <chart@instructure.com>
    Tested-by: Jenkins
    QA-Review: Nathan Rogowski <nathan@instructure.com>
    Product-Review: Pam Hiett <phiett@instructure.com>
    Pam Hiett committed Jul 8, 2016
  4. update zh-Hans translation

    Change-Id: Icc19bc2686b49eb5f87b4bf21030069e066db667
    Transifreq committed Jul 22, 2016
  5. update nl translation

    Change-Id: I0f94b86a1991bfc3b1460e6d0289d91daa02cb9a
    Transifreq committed Jul 22, 2016
  6. update da translation

    Change-Id: I5a9d268e69eaa60751bededded32e4fea2dd9002
    Transifreq committed Jul 22, 2016
  7. stop RCE high-risk flags from removing the HTML Edit option

    fixes CNVS-30321
    
    test plan:
      - enable "remote version of RCE"
      - make sure HTML Edit option exists on the
        following pages above the RCEs:
        - announcements
        - discussions
        - quizzes
    
    Change-Id: Ic7a49eec13e8c11af7dfef15a4b4a902f3218ab4
    Reviewed-on: https://gerrit.instructure.com/85854
    Tested-by: Jenkins
    Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
    Reviewed-by: John Corrigan <jcorrigan@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Simon Williams <simon@instructure.com>
    Jason Steck committed Jul 20, 2016
Commits on Jul 21, 2016
  1. @ktgeek @ktgeek

    display correct text on button after comment submission in speedgrader

    In the recent Speedgrader redesign the wording on the submit comment
    button was changed to submit. It was changed in the erb, but missed in
    the javascript. This updates the javascript to match.
    
    fixes CNVS-30526
    
    test plan:
     - Load speedgrader for an assignment for a student
     - Submit a comment for that student
     - Notice the button text change from Submit to "Submitting..." and
       back to Submit.
    
    Change-Id: I5634c180f54f8cd55ef9e9741634d2fbc256c2e5
    Reviewed-on: https://gerrit.instructure.com/85804
    Reviewed-by: Spencer Olson <solson@instructure.com>
    Tested-by: Jenkins
    QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
    Product-Review: Keith T. Garner <kgarner@instructure.com>
    ktgeek committed with ktgeek Jul 20, 2016
  2. Spec: fix speedgrader comment specs in chrome

    Change-Id: Iedc2d517d9d2e4c9c10c2875025b5f480773aa6a
    Reviewed-on: https://gerrit.instructure.com/85811
    Tested-by: Jenkins
    Reviewed-by: KC Naegle <knaegle@instructure.com>
    Product-Review: Gentry Beckmann <gbeckmann@instructure.com>
    QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
    gbeckmann committed with Gentry Beckmann Jul 20, 2016
  3. update tr translation

    Change-Id: I7bb16aaaae7cf76364956f539dcdd56cfc3da7cc
    Transifreq committed Jul 21, 2016
  4. update nn translation

    Change-Id: Ib5a6dcf0d991279d3637d4b758f9b98eb0a02824
    Transifreq committed Jul 21, 2016
  5. update ko translation

    Change-Id: Id274ec7783894d1637c3a8c7c0bcb7f2b456fa69
    Transifreq committed Jul 21, 2016
  6. update hy translation

    Change-Id: Ic2dac77632e60e3186e7444c3bee23a48870bf57
    Transifreq committed Jul 21, 2016
  7. update he translation

    Change-Id: I875d9af1f197ca1fa8495cb89b4a079003878588
    Transifreq committed Jul 21, 2016
  8. update fa translation

    Change-Id: Ideb0b68f4e59c66b03b830982274b0a5c1937f9b
    Transifreq committed Jul 21, 2016
  9. update zh-Hant translation

    Change-Id: Iad502aee77078151f742d86ab0b0d051692d848b
    Transifreq committed Jul 21, 2016
  10. update zh-Hans translation

    Change-Id: If00321250f93e0dbab92412f6debcbfb8a030b85
    Transifreq committed Jul 21, 2016
  11. update sv translation

    Change-Id: I0d30d9e09f3ca828991f886c70edc4b32f97eb4b
    Transifreq committed Jul 21, 2016
  12. update ru translation

    Change-Id: Ie91f1be18de5b23fc801a276eb0abe725e422df5
    Transifreq committed Jul 21, 2016
  13. update pt-BR translation

    Change-Id: Ib8614fa6abe7f5d326298342b517e1e622dd9b3e
    Transifreq committed Jul 21, 2016
  14. update pt translation

    Change-Id: Iaec770bd176685e17b84c4f60fb29a0c9081877f
    Transifreq committed Jul 21, 2016
  15. update pl translation

    Change-Id: I17e2b965b3d5474f9acaffb5071c345067f814fc
    Transifreq committed Jul 21, 2016
  16. update nl translation

    Change-Id: I01b978137bba616864ea67579b85bd8d62c2e6ea
    Transifreq committed Jul 21, 2016
  17. update nb translation

    Change-Id: Iad4ce5aebb6c2d1444ff7d6c2e6be4810e659f69
    Transifreq committed Jul 21, 2016
  18. update mi translation

    Change-Id: I0e3760b02369fadc1a912f80b96f67f0be057fda
    Transifreq committed Jul 21, 2016
  19. update ja translation

    Change-Id: I7138b00f748604b3b7d38f13e94fee9ca9b1dc79
    Transifreq committed Jul 21, 2016
  20. update fr translation

    Change-Id: Id923845cc9ec9aa8900959f72f53d70196fb9f9a
    Transifreq committed Jul 21, 2016
  21. update es translation

    Change-Id: I19db53a0b8a49d9b94521ab71c74be1d79d97f61
    Transifreq committed Jul 21, 2016
  22. update en-GB translation

    Change-Id: I2e4138e260b01200ccfa1a46a42374b0be9ea853
    Transifreq committed Jul 21, 2016
  23. update en-AU translation

    Change-Id: Idcb9eca0f5266996feec2a95653ba58b8eb30b8e
    Transifreq committed Jul 21, 2016
  24. update de translation

    Change-Id: Ib9a66544c2e2562acde21507dd049c990bd22db8
    Transifreq committed Jul 21, 2016
  25. update da translation

    Change-Id: Iefd9d1604f33a7fdd955ffe9e6ded049d2466ed0
    Transifreq committed Jul 21, 2016
  26. update ar translation

    Change-Id: Ia6250427058dd9ec23b951cadd080ada08e79405
    Transifreq committed Jul 21, 2016
  27. make global navigation narrower/minus text on tablet and below

    Fixes: CNVS-30374
    
    test plan:
    - as a user navigate to the dashboard
    - the left-hand nav should look unchanged... now reduce
      the browser window and once you hit approx 760px wide
      and smaller the left-hand nav will narrow and the
      text will disappear
    
    - test this on a few of the other pages to ensure
      all works as intended
    
      example of new view: http://screencast.com/t/suChJWKv
    
    Change-Id: Ib199addb5c6447a7c1c45056e19a330cd282b93c
    Reviewed-on: https://gerrit.instructure.com/84917
    Tested-by: Jenkins
    Reviewed-by: Chris Hart <chart@instructure.com>
    QA-Review: Myller de Araujo <myller@instructure.com>
    Product-Review: Pam Hiett <phiett@instructure.com>
    Pam Hiett committed Jul 11, 2016
Commits on Jul 20, 2016
  1. @jwillesen

    add redux-logger library

    test plan:
     - try out the library and see that it works
    
    Change-Id: Icbfe589f234195d386782104c5faea8dafe095c0
    Reviewed-on: https://gerrit.instructure.com/85785
    Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
    Product-Review: Jon Willesen <jonw+gerrit@instructure.com>
    QA-Review: Jon Willesen <jonw+gerrit@instructure.com>
    Tested-by: Jenkins
    jwillesen committed with Jon Willesen Jul 20, 2016