Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Snyk] Security upgrade grunt-contrib-jasmine from 0.8.0 to 1.0.0 #22

Open
wants to merge 5,585 commits into
base: stable
Choose a base branch
from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jul 27, 2015

  1. Updated en-GB translation

    Change-Id: Id7fbee08e3ea563d2f2d804d198169745c8feb2f
    Transifreq authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    12a6ac9 View commit details
    Browse the repository at this point in the history
  2. Updated es translation

    Change-Id: I3b1a1630d4d7630465e1c202db18c3357ca61650
    Transifreq authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    3644d16 View commit details
    Browse the repository at this point in the history
  3. Updated pl translation

    Change-Id: I294eb860fa2bfa313035bf52b9b8e85c9daafb06
    Transifreq authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    83bde93 View commit details
    Browse the repository at this point in the history
  4. Updated ru translation

    Change-Id: I60eeadb7e75de08a96b56ff174ba85ea474054c5
    Transifreq authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    d927f3a View commit details
    Browse the repository at this point in the history
  5. Post grades lti tools disabled when section selected

    Post grades lti tools will not allow section level assignment
    posting, so we should disable their "post grades" buttons when a section
    is selected. Pschool post grades jobs, on the other hand, do allow for
    section level posting, so we should keep the pschool post grades button
    available when properly configured sections are selected.
    
    Test Plan:
      * configure at least 1 sis_app post grades tool
        * get local sisapp running
        * /accounts/1/settings/configurations
        * add app, by url http://<local sisapp>/post_grades/config.xml
      * enable "post grades to sis" (pschool) feature option in settings
      * configure at least 1 course
        * configure at least 1 section with sis id
        * configure at least 1 section without sis id
      * add and publish at least 1 assignment for both the course and
        section
      * navigate to gradebook, and notice that "post grades" dropdown
        appears
      * pick section with sis ID
        * lti tool post grades should become unavailable, but pschool button
          should still be available
      * pick section without sis ID
        * neither post grades button should be available
    
    closes CNVS-21938
    
    Change-Id: Id1236bef304479e7043229687658faed483ad505
    Reviewed-on: https://gerrit.instructure.com/58982
    Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
    Tested-by: Jenkins
    QA-Review: Ben Bolton <bbolton@instructure.com>
    Product-Review: Jonathan Featherstone <jfeatherstone@instructure.com>
    feathj authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    674d6e3 View commit details
    Browse the repository at this point in the history
  6. Updated en-AU translation

    Change-Id: I69deacaa45d3a4b3582715bbe78eda08c4e614a8
    Transifreq authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    1393c23 View commit details
    Browse the repository at this point in the history
  7. Updated en-GB translation

    Change-Id: I888c2ffc2075cddd2cb9a069d039996feea5d1d4
    Transifreq authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    b6a93eb View commit details
    Browse the repository at this point in the history
  8. Updated pt translation

    Change-Id: I6cfdb35983e56f533fd8d0fe245da5a962dacdaf
    Transifreq authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    54572f5 View commit details
    Browse the repository at this point in the history
  9. Updated sv translation

    Change-Id: I3604cde8aa13cb1af8fcc91c483e7d3c665598fc
    Transifreq authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    2acb23f View commit details
    Browse the repository at this point in the history
  10. Allow teacher to join students to groups in unpublished courses

    Fixes CNVS-22084
    
    Test plan:
     - Create a course
     - Add some students to the course
     - Ensure that the course is unpublished
     - Create some groups in the course
     - Ensure that you can add and remove students to and from the
       groups in the course
     - Ensure you can otherwise manage groups as you would expect to
       be able to even though the course is unpublished
    
    Change-Id: I0c5ecd551c018f7bde08ffed566ecf3a15b8429a
    Reviewed-on: https://gerrit.instructure.com/59043
    Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
    Tested-by: Jenkins
    Reviewed-by: Joel Hough <joel@instructure.com>
    Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
    QA-Review: Heath Hales <hhales@instructure.com>
    Product-Review: Peyton Craighill <pcraighill@instructure.com>
    javawizard authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    48c2fc3 View commit details
    Browse the repository at this point in the history
  11. bump moodle2cc version

    test plan:
    * should fix quiz question point importing
    
    * should also fix assignments for moodle 2.1 packages
    
    (import the packages references in the ticket)
    
    closes #CNVS-21870 #CNVS-21863
    
    Change-Id: I6606721882f6e792b65bef0237c000441a9ba6d1
    Reviewed-on: https://gerrit.instructure.com/59224
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    1daa4df View commit details
    Browse the repository at this point in the history
  12. upgrade brandable_css so it uses less memory

    the way this was written, it used to fire off
    a promise for every brand all at the same time.
    
    I’ve changed it so the memory usage will be more
    like `k * <# variants>` instead of
    `<# of themes> * <# variants> * k`
    so it will stay constant (on my machine ~500mb) and
    not grow huge as we get more people that have made
    themes.  (where k is the memory it takes to
    compile one sass file, and # themes is a constant,
    in our case 6.
    
    Change-Id: I1fa4b4410a1141b461019f0c614ba343ea73000c
    Reviewed-on: https://gerrit.instructure.com/59182
    Tested-by: Jenkins
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    QA-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and maneframe committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    cea4848 View commit details
    Browse the repository at this point in the history
  13. incoming mail processing idempotency

    refs CNVS-21215
    
    test plan
    - setup incoming mail processing
    - cause an email duplicate to be sent (Mail gem and a console are
     great for this. the message id has to be the same)
    - ensure that the response is not double posted in canvas
    
    Change-Id: I2e6872fa430b38b5dd9498ce8329bf2bbeeea7ce
    Reviewed-on: https://gerrit.instructure.com/57566
    Tested-by: Jenkins
    Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
    Product-Review: Matthew Wheeler <mwheeler@instructure.com>
    QA-Review: Heath Hales <hhales@instructure.com>
    JoelHough authored and evizitei committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    f9f263d View commit details
    Browse the repository at this point in the history
  14. More Performance monitoring for IMP

    Fixes CNVS-21220
    
    Test Plan:
    
    Test with CNVS-21215 & 21218
    
    Change-Id: I194e66e25cd3e85718381735055aa6bbec9c4936
    Reviewed-on: https://gerrit.instructure.com/58636
    Reviewed-by: Joel Hough <joel@instructure.com>
    Product-Review: Matthew Wheeler <mwheeler@instructure.com>
    QA-Review: Heath Hales <hhales@instructure.com>
    Tested-by: Jenkins
    mcwqy9 authored and evizitei committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    fe4ce7b View commit details
    Browse the repository at this point in the history
  15. handle running 'brandable_css' from within a symlinked dir

    fixes: CNVS-22155
    
    see: ryankshaw/brandable_css@e1b5a8e?diff=unified#diff-2b4ca49d4bb0a774c4d4c1672d7aa781R23
    
    test plan:
    
    say the path to your canvas-lms repos is in
    /Users/ryan/code/canvas-lms
    
    make a symlink that points to that in:
    /Users/ryan/current
    
    run `brandable_css`
    it should work
    
    Change-Id: I1f732a53e56ea376efe6cd7d54b3ae52178ac025
    Reviewed-on: https://gerrit.instructure.com/59342
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and evizitei committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    fa16b0c View commit details
    Browse the repository at this point in the history
  16. tell browsers they can cache can assets for a year

    test plan:
    * first, clear out all the cdn assets on your test
    s3 bucket by running this in rails console:
    Canvas::CDN::S3Uploader.new.bucket.objects.with_prefix('dist').delete_all
    * compile_assets
    * run bundle exec rake canvas:cdn:upload_to_s3
    * access canvas in your browser
    * on js/css/image assets (like common-xxxxx.js)
      you should see a "max age 1 year" header
    
    Change-Id: I7847e614a0e3066686bda32f8854263f78cc168f
    Reviewed-on: https://gerrit.instructure.com/59184
    Tested-by: Jenkins
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and evizitei committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    8bc2ac0 View commit details
    Browse the repository at this point in the history
  17. rename "CDN" ruby module to "Cdn"

    ...because apparently "it's preloading. for
    autoloading, CDN will look for cdn or c_d_n.
    
    then in prod mode, it's somewhat different. like
    autoloading is disabled? and it just pre-requires
    everything in the autoload dirs"
    
    test plan:
    
    run `RAILS_ENV=production bundle exec rake canvas:cdn:upload_to_s3`
    
    it should work
    
    Change-Id: I5deed1cc2b9daa678465b174af320cf1724fea8c
    Reviewed-on: https://gerrit.instructure.com/59341
    Reviewed-by: James Williams  <jamesw@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and evizitei committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    b4b1658 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2015

  1. add checkbox for excusing assignments in srgb

    fixes CNVS-21883
    
    Change-Id: Ic65ae6db130d12c3a4ef96d6559981bb893fb6ff
    Reviewed-on: https://gerrit.instructure.com/59149
    Reviewed-by: Spencer Olson <solson@instructure.com>
    Tested-by: Jenkins
    QA-Review: Nathan Rogowski <nathan@instructure.com>
    Product-Review: Dylan Ross <dross@instructure.com>
    dyro authored and simonista committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    7c92bb3 View commit details
    Browse the repository at this point in the history
  2. Ensure students get an array when no submissions

    Fix boolean checks so api submission index returns an empty array to a student
    that has no submissions
    
    Fixes MBL-4441
    
    Test plan
     - create a quiz
     - create a student
     - as the student make an api request for the student's submissions
     - should get empty array not 401
    
    Change-Id: Ie73c1cb00c40fc5d884664bf676d1c305218ff8f
    Reviewed-on: https://gerrit.instructure.com/59201
    Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
    Tested-by: Jenkins
    QA-Review: Michael Hargiss <mhargiss@instructure.com>
    Product-Review: Brian Finney <bfinney@instructure.com>
    yenif authored and simonista committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    2fff9d2 View commit details
    Browse the repository at this point in the history
  3. Allow teacher to join students to groups in unpublished courses

    Fixes CNVS-22084
    
    Test plan:
     - Create a course
     - Add some students to the course
     - Ensure that the course is unpublished
     - Create some groups in the course
     - Ensure that you can add and remove students to and from the
       groups in the course
     - Ensure you can otherwise manage groups as you would expect to
       be able to even though the course is unpublished
    
    Change-Id: I0c5ecd551c018f7bde08ffed566ecf3a15b8429a
    Reviewed-on: https://gerrit.instructure.com/59043
    Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
    Tested-by: Jenkins
    Reviewed-by: Joel Hough <joel@instructure.com>
    Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
    QA-Review: Heath Hales <hhales@instructure.com>
    Product-Review: Peyton Craighill <pcraighill@instructure.com>
    javawizard authored and simonista committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    b2ab545 View commit details
    Browse the repository at this point in the history
  4. Lessens data given when a student answers a question via the API

    Reduces the scope of information returned unnecessarily.
    
    Closes CNVS-22197
    
    Test Plan:
      - Confirm there is no answer weights or exact numerical answers data
        leaked via POST events to the /api/v1/quiz_submissions/:id/questions
        answering event.
    
    Change-Id: Icfd85b6b669b3a61a1acc503b52c78ba346bfb19
    Reviewed-on: https://gerrit.instructure.com/59359
    Reviewed-by: John Corrigan <jcorrigan@instructure.com>
    Tested-by: Jenkins
    QA-Review: Derek Hansen <dhansen@instructure.com>
    Product-Review: Ryan Taylor <rtaylor@instructure.com>
    ryanmt authored and simonista committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    4f1b7f3 View commit details
    Browse the repository at this point in the history
  5. Lessens data given when a student answers a question via the API

    Reduces the scope of information returned unnecessarily.
    
    Closes CNVS-22197
    
    Test Plan:
      - Confirm there is no answer weights or exact numerical answers data
        leaked via POST events to the /api/v1/quiz_submissions/:id/questions
        answering event.
    
    Change-Id: Icfd85b6b669b3a61a1acc503b52c78ba346bfb19
    Reviewed-on: https://gerrit.instructure.com/59359
    Reviewed-by: John Corrigan <jcorrigan@instructure.com>
    Tested-by: Jenkins
    QA-Review: Derek Hansen <dhansen@instructure.com>
    Product-Review: Ryan Taylor <rtaylor@instructure.com>
    ryanmt authored and maneframe committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    568be3b View commit details
    Browse the repository at this point in the history
  6. Updated nb translation

    Change-Id: I132d8eb1d3e23be2adbc123395b73cab7d1789bc
    Transifreq authored and maneframe committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    d1d0263 View commit details
    Browse the repository at this point in the history
  7. fix moodle quiz question points possible importing

    closes #CNVS-21870 frd
    
    Change-Id: I94a4b1794ada6af444647e6a8dbb06874d2e25f7
    Reviewed-on: https://gerrit.instructure.com/59354
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    Product-Review: Dan Minkevitch <dan@instructure.com>
    Tested-by: Jenkins
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    maneframe committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    e388210 View commit details
    Browse the repository at this point in the history
  8. theme editor - fix undo image error

    fixes CNVS-22073
    
    test plan:
      - go to theme editor
      - add an image and then undo
        having added that image
      - if that is the only thing youve
        changed so far, you do not get
        a preview button
      - once you change something else
        you can hit preview and it saves
        properly
    
      - apply theme with a non-default image
      - go to the editor and change back
        to default
      - you get an option to preview with
        the default
      - preview is successful
    
      - color & image changes act normally
    
    Change-Id: Ia5de701177137625e65434ac316c22aec0e1dd39
    Reviewed-on: https://gerrit.instructure.com/59056
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Reviewed-by: Jennifer Stern <jstern@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    Tested-by: Jenkins
    Michael Nomitch authored and maneframe committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    0d406cc View commit details
    Browse the repository at this point in the history
  9. Theme Editor: Fix threading issues in preview progress updates

    fixes: CNVS-22185
    
    Because the the update_progress callback from the
    upload_to_s3 callback was happening inside a
    Parallel.each thread, we'd get random errors where
    it ran out of active record postgres connections.
    eg:
    ActiveRecord::ConnectionTimeoutError
    could not obtain a database connection within 5
    seconds (waited 5.000153379 seconds). The max pool
    size is currently 5; consider increasing it.
    
    the fix is to call the callback on the main thread so
    any db queries are happening from the normal rails thread.
    
    also, this adds a progress bar so if you run this from
    the command line, you'll get a nice progress bar like
    https://files.slack.com/files-pri/T028ZAGUD-F0896CFR9/screen_shot_2015-07-28_at_10.19.36_am.png
    so that when deployers run the:
    `rake brand_configs:generate_and_upload_all`
    task, which takes a long time, they have an idea
    of how long it is going to take
    
    test plan:
    
    note:this is something that only broke on beta and
    not on local machines so to test that this fixes it,
    you kinda need to just run it there:
    
    * open theme editor
    * make a change
    * hit preview
    * it should not say there was an error
    
    Change-Id: Ife052ab9573aa677d49d8e5e6c637b0faa2b116e
    Reviewed-on: https://gerrit.instructure.com/59407
    Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Tested-by: Jenkins
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and maneframe committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    1c16737 View commit details
    Browse the repository at this point in the history
  10. Revert "Remove Save & Publish button from Scheduler Edit Page"

    This reverts commit 597abe9.
    
    Fixes CNVS-22183
    
    Test Plan:
     * Navigate to Scheduler
     * Click on "Create an Appointment Group"
     * Verify there is both a Save & Publish button and a Save button
     * Verify the Save & Publish button is blue, and the save button looks
       less eye-catching
     * Add the Appointment group to a course calendar and click the Save
       button
     * Verify the appointment is saved and
       displays on the list of appointment groups
     * Log in as a student in the course
     * Verify a student cannot see and interact with the appointment group
     * Log back in as a teacher, edit the Appointment group, and click Save
       and Publish
     * Log back in as a student in the course
     * Verify the student can now see and interact with the appointment
       group
    
    Change-Id: I26663df508c8b4024b50f1cbe0c561ca3fb8ac31
    Reviewed-on: https://gerrit.instructure.com/59404
    Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
    QA-Review: Heath Hales <hhales@instructure.com>
    Product-Review: Steven Shepherd <sshepherd@instructure.com>
    Tested-by: Jenkins
    Steven Shepherd authored and ccutrer committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    7a4e921 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2015

  1. Add Upload CSS/JS tab to Theme Editor

    refs CNVS-21431, CNVS-21425
    
    Test scenarios: https://gist.github.com/junyper/7481e6a2b65a1b799bad
    
    Change-Id: I28b24bce592952acfd33cb1303496b8178f0d4b4
    Reviewed-on: https://gerrit.instructure.com/58780
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Tested-by: Jenkins
    Reviewed-by: Colleen Palmer <colleen@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    Reviewed-by: Ryan Shaw <ryan@instructure.com>
    
    Conflicts:
    	app/jsx/theme_editor/ThemeEditor.jsx
    junyper authored and ccutrer committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    482604e View commit details
    Browse the repository at this point in the history
  2. fix moodle quiz question points possible importing

    closes #CNVS-21870 frd
    
    Change-Id: I94a4b1794ada6af444647e6a8dbb06874d2e25f7
    Reviewed-on: https://gerrit.instructure.com/59354
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    Product-Review: Dan Minkevitch <dan@instructure.com>
    Tested-by: Jenkins
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    maneframe committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    0a4813c View commit details
    Browse the repository at this point in the history
  3. Sanitize quiz answer comments html

    Fixes CNVS-22170
    
    Test plan:
     - Create a quiz
     - Set a answer comment to `">'><img src=x onerror=alert(3)>`
     - Take the test and view the resulting answer comment every where you
     can find it
     - Try lots of other forms of html to try and execute javascript
    
    Change-Id: I209b266a648810763e03b602790001034815b44f
    Reviewed-on: https://gerrit.instructure.com/59457
    Reviewed-by: Cameron Sutter <csutter@instructure.com>
    Tested-by: Jenkins
    QA-Review: Adam Stone <astone@instructure.com>
    Product-Review: Cameron Sutter <csutter@instructure.com>
    yenif authored and maneframe committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    2f8e97d View commit details
    Browse the repository at this point in the history
  4. moderate_grades permission

    test plan:
     - if the moderated grading feature flag is allowed
       or enabled at the root account level:
      - permission should be enabled by default for
        account admins and teachers
      - permission should be disabled by default but
        possible to enable for TAs and custom account roles
      - permission should not be enableable for students,
        designers, and observers
     - if the moderated grading feature flag is disabled
       at the root account level:
      - moderate grades permission should not appear in
        the list of permissions
    
    closes CNVS-21956
    closes CNVS-21957
    
    Change-Id: I5a8ec28938921c85ca87b199800ee139a3c1f886
    Reviewed-on: https://gerrit.instructure.com/59410
    Tested-by: Jenkins
    Reviewed-by: Derek Bender <dbender@instructure.com>
    QA-Review: Clare Strong <clare@instructure.com>
    Product-Review: Jeremy Stanley <jeremy@instructure.com>
    jstanley0 authored and ccutrer committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    19012cc View commit details
    Browse the repository at this point in the history
  5. Sanitize quiz answer comments html

    Fixes CNVS-22170
    
    Test plan:
     - Create a quiz
     - Set a answer comment to `">'><img src=x onerror=alert(3)>`
     - Take the test and view the resulting answer comment every where you
     can find it
     - Try lots of other forms of html to try and execute javascript
    
    Change-Id: I209b266a648810763e03b602790001034815b44f
    Reviewed-on: https://gerrit.instructure.com/59457
    Reviewed-by: Cameron Sutter <csutter@instructure.com>
    Tested-by: Jenkins
    QA-Review: Adam Stone <astone@instructure.com>
    Product-Review: Cameron Sutter <csutter@instructure.com>
    yenif authored and ccutrer committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    619d8b2 View commit details
    Browse the repository at this point in the history
  6. make sure 'ruby-progressbar' gem is installed

    fixes: CNVS-22215
    
    if you try to run rake brand_configs:generate_and_upload_all
    on the production boxes it will fail with:
    
    ```LoadError: cannot load such file -- ruby-progressbar```
    
    It's because in order to show you a progressbar of
    the upload_to_s3 task, Parallel tries to require
    'ruby-progressbar' (which is there on dev/test boxes
    since it is a dep of ‘rubocop', but not there in prod).
    
    this will make sure it is there in the production
    bundler group too.
    
    test plan:
    run: RAILS_ENV=production rake brand_configs:generate_and_upload_all
    
    it should work
    
    Change-Id: I98adad9ee2aa596e88d8293a13592f056b8bbb65
    Reviewed-on: https://gerrit.instructure.com/59475
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    Product-Review: Ryan Shaw <ryan@instructure.com>
    QA-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and ccutrer committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    eb20da0 View commit details
    Browse the repository at this point in the history
  7. have s3Uploader upload svgs with correct content-type

    fixes: CNVS-22212
    
    test plan:
    * delete stuff on your s3 bucket
    * compile assets and upload to s3
    * go to the files section, the icons for folders
      and documents and stuff (the svgs) should show
      up correctly
    
    Change-Id: Ic3bf717ffa1b8e2d42b7b0e0d569dacbab90d41d
    Reviewed-on: https://gerrit.instructure.com/59470
    Tested-by: Jenkins
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and ccutrer committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    5758f4d View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2015

  1. Escape text box val before inserting into tinyMCE

    HTML in the answer text field is saved raw. If the question is then
    edited by some one else and they edit the answer using tinyMCE, they can
    accidentally inject unknown html/js into their DOM. Fixed by escaping
    the string in the answer_text input thus the content always shows up as
    plain text in tinyMCE.
    
    Fixes CNVS-22213
    
    Test plan:
     - Create quiz
     - Set answer text to `<script>alert("XSS")</script>` using the
     answer_text text input field
     - Click the `pencil` edit icon
     - You should see the `<script>` html in the tinyMCE rich text editor
     - Click `Done`
     - You should not see a js alert.
    
    Change-Id: I05c6d57159a02c098ef3d6320eb7768d4a0658a3
    Reviewed-on: https://gerrit.instructure.com/59569
    Tested-by: Jenkins
    Reviewed-by: Matt Berns <mberns@instructure.com>
    QA-Review: Adam Stone <astone@instructure.com>
    Product-Review: Cameron Sutter <csutter@instructure.com>
    yenif authored and ccutrer committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    289e8fe View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. Long filename overflows the Move File window

    Fixes: CNVS-22070
    
    Test Plan:
    	- Go to files page
    	- Add a file with long title
    	- When the title is exceptionally long,
    	  it will not overflow out of the
    	  modal header. (The situation here
    	  http://screencast.com/t/BICD4QFtRfH
    	  should no longer occur)
    
    Change-Id: I1ba1f65281aaa4cc7be39cc89c8c372a6e64c23d
    Reviewed-on: https://gerrit.instructure.com/59209
    Tested-by: Jenkins
    Reviewed-by: Chris Hart <chart@instructure.com>
    Product-Review: Chris Hart <chart@instructure.com>
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    serikjensen authored and codekitchen committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    dc27779 View commit details
    Browse the repository at this point in the history
  2. Escape text box val before inserting into tinyMCE

    HTML in the answer text field is saved raw. If the question is then
    edited by some one else and they edit the answer using tinyMCE, they can
    accidentally inject unknown html/js into their DOM. Fixed by escaping
    the string in the answer_text input thus the content always shows up as
    plain text in tinyMCE.
    
    Fixes CNVS-22213
    
    Test plan:
     - Create quiz
     - Set answer text to `<script>alert("XSS")</script>` using the
     answer_text text input field
     - Click the `pencil` edit icon
     - You should see the `<script>` html in the tinyMCE rich text editor
     - Click `Done`
     - You should not see a js alert.
    
    Change-Id: I05c6d57159a02c098ef3d6320eb7768d4a0658a3
    Reviewed-on: https://gerrit.instructure.com/59569
    Tested-by: Jenkins
    Reviewed-by: Matt Berns <mberns@instructure.com>
    QA-Review: Adam Stone <astone@instructure.com>
    Product-Review: Cameron Sutter <csutter@instructure.com>
    yenif authored and codekitchen committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    2d4e328 View commit details
    Browse the repository at this point in the history
  3. themeditor: fix preview in ie10 & 11

    fixes: CNVS-22218
    
    IE10 has some buggy behavior when posting forms
    using FormData. see more here
    https://blog.yorkxin.org/posts/2014/02/06/ajax-with-formdata-is-broken-on-ie10-ie11/
    
    test plan:
    
    * open theme editor in ie10 or ie11
    * change something
    * press "preview changes"
    * it should work
    
    Change-Id: If148e911395601212199f12eae6ae884d8b94509
    Reviewed-on: https://gerrit.instructure.com/59588
    Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and codekitchen committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    902f402 View commit details
    Browse the repository at this point in the history
  4. Prevent colors defaulting to 'transparent' and fix validation in FF

    fixes CNVS-22230
    
    test plan:
    * Try to preview a theme with one color. The colors that were not set should be the defaults (not transparent).
    * Enter an invalid color, verify that the error message appears and the value is not set to 'transparent'
    The above scenarios should now work fine on all supported browsers
    
    Change-Id: I87be354d10c8c109dc0f5bbfb0d69bcd5ad8fa80
    Reviewed-on: https://gerrit.instructure.com/59638
    Reviewed-by: Ryan Shaw <ryan@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    junyper authored and codekitchen committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    40cced1 View commit details
    Browse the repository at this point in the history
  5. Add ability to get grading standards via api

    refs PFS-2327
    
    test plan
    * make api calls to the following and verify results:
    * /api/v1/courses/:course_id/grading_standards
    * /api/v1/accounts/:account_id/grading_standards
    
    Change-Id: Iff552e1f30e7b812d77d7138f6ab2f2a142837cc
    Reviewed-on: https://gerrit.instructure.com/59120
    Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jason Carter <jcarter@instructure.com>
    Product-Review: Tyson Brown <tbrown@instructure.com>
    Tyson Brown authored and codekitchen committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    de31671 View commit details
    Browse the repository at this point in the history
  6. Revert "Make it so students see "My Grades" and teachers see "Gradebo…

    …ok" in course menu"
    
    fixes CNVS-22235
    
    This reverts commit e413f82.
    
    Change-Id: I49ada900ceef526f82ef37b6ff5febfe7298eda5
    Reviewed-on: https://gerrit.instructure.com/59572
    Tested-by: Jenkins
    Reviewed-by: Ryan Shaw <ryan@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    QA-Review: Erin Hallmark <erin@instructure.com>
    junyper authored and codekitchen committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    5baf6ab View commit details
    Browse the repository at this point in the history
  7. High-contrast mode on primary button

    fixes: CNVS-22248
    
    High contrast mode is overriding everything, but our primary button,
    because this is getting a default hex instead of a variable now. This
    will fix it to get the appropriate color when high-contrast mode is on.
    
    Test plan:
    - (with default canvas theme) Turn on High-contrast mode.
      - go to /stylguide#buttons
      - Your primary button is now passing contrast (4:5) and should be a darker
    blue: example: http://cl.ly/image/211k332A3r2H
    
    - (with edited theme)
      - If you are in high-contrast, they should remain the same blue color
      - If you are in regualr ui, they should change to whatever you choose in Theme
    editor for primary button
    
    Change-Id: Ic6a41cc8e7fbb8093c0dcbd91b5ddce8832d9f1f
    Reviewed-on: https://gerrit.instructure.com/59627
    Reviewed-by: Jennifer Stern <jstern@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Colleen Palmer authored and codekitchen committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    94077a3 View commit details
    Browse the repository at this point in the history
  8. Fixes issue with updating tab via api

    fixes CNVS-22124
    
    Test Plan:
    * Add multiple tools to a course with "course_navigation[default]"
      set to "disabled" (using create external_tool api)
    * Update one of the tools with "hidden=false" with tabs
    * Go to the course's settings page -> navigation tab
    * Only the tab you marked as "hidden=false" should be unhidden
      for the external tools you created
    
    Change-Id: I106996778284a3b69d5f82f4c772497524681285
    Reviewed-on: https://gerrit.instructure.com/59496
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Tested-by: Jenkins
    QA-Review: Clare Strong <clare@instructure.com>
    Product-Review: Dan Minkevitch <dan@instructure.com>
    Dan Minkevitch authored and codekitchen committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    a492f5d View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2015

  1. theme editor errors work with screenreader

    fixes CNVS-22149
    fixes CNVS-22150
    
    test plan:
      - go to theme editor with a screenreader
      - input an invalid color
      - when the red error box pops up the
        screenreader reads that the color
        is invalid
      - red error boxes are tabbable
        (though you'll skip past them at
         first, you can tab back)
    
    Change-Id: I84a33a35039fdc064ba2dc51005d777851c493ee
    Reviewed-on: https://gerrit.instructure.com/59484
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: Nathan Rogowski <nathan@instructure.com>
    Tested-by: Jenkins
    Product-Review: Aaron Cannon <acannon@instructure.com>
    Michael Nomitch authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    ccc478c View commit details
    Browse the repository at this point in the history
  2. theme editor: only allow png apple-touch-icons

    fixes: CNVS-22177
    
    test plan:
    * go to the theme editor and try to upload a
     "Mobile Homescreen Icon"
    * the helper text should tell you can only use pngs
    * and the file picker should only be able to pick
      png files
    
    Change-Id: I9ef7402bd08fdb70512604eefce5e0da1ae8abbb
    Reviewed-on: https://gerrit.instructure.com/59406
    Tested-by: Jenkins
    Reviewed-by: Jennifer Stern <jstern@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Ryan Shaw authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    a26813f View commit details
    Browse the repository at this point in the history
  3. speed up 'gulp rev' by only revving files we need to

    closes: CNVS-22128
    fixes: CNVS-22266
    
    before, we just revved everything in public
    even though it was never included into the page.
    that took forever, especially for things like
    the entire bower directory.
    
    this only revs the things we actually include on
    the page
    
    test plan:
    
    * rm -rf public/dist
    * compile_assets
    * notice that gulp rev takes ~800ms instead of forever
    * browse canvas in both prod (so it uses optimized js)
    and non-optimized
    * look at the browser console and make sure you don't
    see any 404s
    
    * specifically look at:
    analytics: https://jeremyp.beta.instructure.com/accounts/90336
    icons in tinymce toolbar
    quizzes (specifically the quiz statistics client app stuff ahmad did)
    
    Change-Id: Ia67e79de4f4be23de069d43427af1a3377d72fd2
    Reviewed-on: https://gerrit.instructure.com/59183
    Tested-by: Jenkins
    Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    00621f2 View commit details
    Browse the repository at this point in the history
  4. VO - Icon should be ignored

    Fixes: CNVS-22148
    
    Test Plan:
    	- In Safari, with VoiceOver enabled,
    	  navigate to the settings for the
    	  account.
    
    	- Click on the Open Theme Editor
    	  button on the right.
    
    	- The icon in the top left should
    	  now be ignored completely by
    	  VoiceOver and focus should now
    	  start on the theme editor's
    	  heading.
    
    Change-Id: Ic58819a60f569c882ce8adb4dadc84c235c76231
    Reviewed-on: https://gerrit.instructure.com/59441
    Tested-by: Jenkins
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: Nathan Rogowski <nathan@instructure.com>
    Product-Review: Aaron Cannon <acannon@instructure.com>
    serikjensen authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    e16cd78 View commit details
    Browse the repository at this point in the history
  5. remove k12 css variant since we don't use it for now

    closes: CNVS-22285
    
    since we took out all usage of the $is-k12 sass variable
    when we removed the legacy k12 stuff we did, there
    is no actual difference between the new_styles
    and k12 variants. so we don't need to generate
    2 different files for now (since their output will
    be exactly the same).
    
    this will cut the css generation time in half
    when deploying and when generating a preview in
    theme editor since instead of outputting 2 css files
    (1 for new_styles_normal_contrast and 1 for
    k12_normal_contrast) for every css bundle for every
    theme, we just make one (new_styles_normal_contrast)
    
    In the future, ui/ux might want to reintroduce
    a sass variable like $is-k12 to do different things
    if they are a k12 school. But when/if we do that,
    we can just save it as part of the variables saved
    in the school's brand_config from the theme editor.
    
    that will be possible because when you turn on the
    k12 feature flag, it defaults to using the
    predefined 'K12 Theme' brand_config so *all* k12
    schools will have a brand_config
    
    test plan:
    make sure canvas looks the same as it did before if
    you have the k12 feature flag turned on
    
    Change-Id: I197c30b9c5ed5150a3683f836008cbdbce78b09d
    Reviewed-on: https://gerrit.instructure.com/59743
    Tested-by: Jenkins
    Reviewed-by: Colleen Palmer <colleen@instructure.com>
    Product-Review: Colleen Palmer <colleen@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Ryan Shaw authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    ab6df67 View commit details
    Browse the repository at this point in the history
  6. Theme editor error tooltip cutoff

    closes: CNVS-22232
    
    Test Plan:
    
    - Go to Theme Editor
    - In hex code box do something like "#0" and cause the red error box to appear
    - Add something longer in there ("#92837498798324") to make it a longer
    error string
    - These should now be working xbrowser without cutting off the box
    
    Old: see ticket
    New: http://cl.ly/image/3o2c2c273b18
    
    Change-Id: I941dafc250cb41af632924303f76bde245e6860f
    Reviewed-on: https://gerrit.instructure.com/59742
    Tested-by: Jenkins
    Reviewed-by: Chris Hart <chart@instructure.com>
    Product-Review: Chris Hart <chart@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Colleen Palmer authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    560df8a View commit details
    Browse the repository at this point in the history
  7. Add support for lookup by sis ids in the sis assignment API

    Test plan
    The following routes should resolve:
      	/api/sis/accounts/sis_account_id:123/assignments
      	/api/sis/courses/sis_course_id:456/assignments
    
    fixes SIS-1310
    
    Change-Id: I0a8057989d9387ba447d3f3a01dc8c232933e828
    Reviewed-on: https://gerrit.instructure.com/59455
    Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
    Tested-by: Jenkins
    Reviewed-by: Nick Houle <nhoule@instructure.com>
    QA-Review: Kausty Saxena <kausty@instructure.com>
    Product-Review: Brad Humphrey <brad@instructure.com>
    wbhumphrey authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    5b162a9 View commit details
    Browse the repository at this point in the history
  8. Theme editor preview area

    Fixes: CNVS-21906
    
    Test plan:
    - Make sure the Use New Styles feature flag is
      set to ON
    - Open Theme Editor from your admin account
    - Make sure Canvas iframe on right side now
      opens on this page ...
      http://cl.ly/image/2c3k1R3V3U0T
      ... instead of on the Dashboard
    - Theme editor should work the same
      as before this change
    
    Change-Id: Ifa38134ba186bc49c12062ae914a004b3664d189
    Reviewed-on: https://gerrit.instructure.com/59007
    Reviewed-by: Jennifer Stern <jstern@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    Tested-by: Jenkins
    QA-Review: Myller de Araujo <myller@instructure.com>
    Chris Hart authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    2e8ef84 View commit details
    Browse the repository at this point in the history
  9. "Switch to Individual View" should not be next to breadcrumbs

    Fixes: CNVS-22090
    
    This change involves the location of the
    "Switch to Individual View" link on the
    gradebook page in both the NUI and legacy
    Canvas.
    
    Test Plan:
    	- Navigate to the gradebook page.
    
    	- Previously "Switch to Individual View" was
    	  part of the breadcrumb as can be seen here:
    	  NUI:    http://screencast.com/t/OYLhED9MRo
    	  Legacy: http://screencast.com/t/zhrnyd5HF
    
    	- We have made the following changes
    
    		* Instead of a link, it is now a button.
    
    		* It is now located in the gradebook header
    		  on the the right side
    		  http://www.screencast.com/t/tby7EmuP7ldK
    
    	- Clicking on the button should take you to
    	  the corresponding 'Gradebook: Individual
    	  View' page.
    
    	- In both legacy Canvas and the NUI the
    	  behavior should be the same.
    
    	- NOTE: Because the 'Individual View' link was
    	  previously in the breadcrumb, the corresponding
    	  gradebook2_srgb_spec was failing because it was
    	  still looking for the 'ellipsible' class (a
    	  class associated with breadcrumb elements)
    	  Because the link has now been removed from the
    	  breadcrumb, the 'ellipsible' class was also
    	  removed in order to update the spec.
    
    Change-Id: Id53ca2b81904447aa57b8ce527598d08f458056b
    Reviewed-on: https://gerrit.instructure.com/59292
    Tested-by: Jenkins
    Reviewed-by: Spencer Olson <solson@instructure.com>
    Reviewed-by: Chris Hart <chart@instructure.com>
    Product-Review: Chris Hart <chart@instructure.com>
    QA-Review: Myller de Araujo <myller@instructure.com>
    serikjensen authored and maneframe committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    439c280 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2015

  1. make sure plugin javascript bundles make it to CDN

    fixes: CNVS-22308
    
    test plan:
    on your local machine,
    compile assets
    go to accounts/x (where x is an account with analytics turned on)
    make sure you don't see a 404/403 that looks like:
    https://du11hjcvx0uqb.cloudfront.net/optimized/plugins/analytics/compiled/bundles/inject_department_analytics.js?1438606697
    
    on beta:
    go to:
    https://jeremyp.beta.instructure.com/accounts/90336
    make sure that does not have 403 js errors
    
    Change-Id: Ia5ce0a969605e85fd8bbe9241d19d5408b591314
    Reviewed-on: https://gerrit.instructure.com/59862
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Tested-by: Jenkins
    Ryan Shaw authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    447de0e View commit details
    Browse the repository at this point in the history
  2. Fixes for theme editor IE 10 issues

    fixes CNVS-22231, CNVS-22229, CNVS-22232
    
    Change-Id: Id88f6d80c3eec7c108bf2ad478163cd2afb17314
    Reviewed-on: https://gerrit.instructure.com/59827
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Reviewed-by: Colleen Palmer <colleen@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    Reviewed-by: Ryan Shaw <ryan@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    junyper authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    87c5036 View commit details
    Browse the repository at this point in the history
  3. add for to labels and aria-invalid to theme editor

    fixes CNVS-22283
    
    test plan:
      - go to theme editor
      - if you click on a color's
        label, it focuses on the input
      - if you input an invalid color and
        then inspect element on its input,
        you see aria-invalid is true
        - it is false when it is not invalid
    
    Change-Id: Ic4ff57967f96784942d83d210eb0046d67114b81
    Reviewed-on: https://gerrit.instructure.com/59775
    Reviewed-by: Ryan Shaw <ryan@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Aaron Cannon <acannon@instructure.com>
    Michael Nomitch authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    b293ba4 View commit details
    Browse the repository at this point in the history
  4. prevent moodle quiz and bank question identifier collisions

    fixes a problem where sometimes quiz points were not correctly
    specified because of migration_id collisions
    
    closes #CNVS-22287
    
    Change-Id: I311398570aa6186c9be9c3502329a46a0c30c555
    Reviewed-on: https://gerrit.instructure.com/59780
    Tested-by: Jenkins
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    QA-Review: Clare Strong <clare@instructure.com>
    Product-Review: Dan Minkevitch <dan@instructure.com>
    maneframe authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    2c2c4a8 View commit details
    Browse the repository at this point in the history
  5. Updated ar translation

    Change-Id: Iaf7d7afe6979dcbefede6792c951d2c0f7ad4c68
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    ef1bab9 View commit details
    Browse the repository at this point in the history
  6. Updated da translation

    Change-Id: Iacd353d41a284b4bb57aa02fb884f711c8cab8e9
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    d0cb386 View commit details
    Browse the repository at this point in the history
  7. Updated es translation

    Change-Id: I318d94453dad72a1fb287b5be78f1f2a56af8ae0
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    1b3d34e View commit details
    Browse the repository at this point in the history
  8. Updated nl translation

    Change-Id: I72e9b8e87cb13e84cc46a72821b3e482db67d27c
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    5c8f6fa View commit details
    Browse the repository at this point in the history
  9. Updated pl translation

    Change-Id: Ibce183960741e97359e52b527f94e612d10d8135
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    1f5d8a3 View commit details
    Browse the repository at this point in the history
  10. Updated pt-BR translation

    Change-Id: I80e7fa46e42a65ed57d996dab92d714baf4ef37c
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    28389aa View commit details
    Browse the repository at this point in the history
  11. Updated ru translation

    Change-Id: I987462e8573d5f29caa9496d187ac3011240fae5
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    70e44f3 View commit details
    Browse the repository at this point in the history
  12. Updated sv translation

    Change-Id: I9c36fdbf0489c6014029d95b2adf5cd4187afd81
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    ec446d6 View commit details
    Browse the repository at this point in the history
  13. Updated zh translation

    Change-Id: I8cc6afecacd4a4943535ad19b785aef6566c16d5
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    fb0fc63 View commit details
    Browse the repository at this point in the history
  14. Updated zh_Hant translation

    Change-Id: I85eced1a288902ef402487e98410ae975ff1a192
    Transifreq authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    ae491bd View commit details
    Browse the repository at this point in the history
  15. prevent moodle quiz and bank question identifier collisions

    fixes a problem where sometimes quiz points were not correctly
    specified because of migration_id collisions
    
    closes #CNVS-22287
    
    Change-Id: I311398570aa6186c9be9c3502329a46a0c30c555
    Reviewed-on: https://gerrit.instructure.com/59780
    Tested-by: Jenkins
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    QA-Review: Clare Strong <clare@instructure.com>
    Product-Review: Dan Minkevitch <dan@instructure.com>
    maneframe committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    4cf9ccb View commit details
    Browse the repository at this point in the history
  16. wrap shard cache clear in after_transaction_commit

    fixes CNVS-22252
    
    to ameliorate race conditions between saving and re-filling of cache
    
    Change-Id: I7cee9a447a444e1bd84fc0fa2c16d40b35db3e69
    Reviewed-on: https://gerrit.instructure.com/59637
    Tested-by: Jenkins
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Nick Nelson <nick@instructure.com>
    ccutrer authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    141e7f0 View commit details
    Browse the repository at this point in the history
  17. Fixes issue with unlock_date for modules course copy

    fixes CNVS-22236
    
    Test Plan:
    * Prerequisites: course with assignments, and several modules that have unlock dates.
    * Modules with unlock dates in the original course.
    * Perform a course copy, setting start and end dates in the future, and select 'Adjust Dates' (the destination dates should be prefilled with the future dates).
    * Once the copy is complete, compare the module unlock dates with those of the source course
    * The unlock dates should have been properly shifted
    
    Change-Id: I4e880f44f9cf924d6a3dd2a7e34371d845906b1d
    Reviewed-on: https://gerrit.instructure.com/59741
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Tested-by: Jenkins
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: Dan Minkevitch <dan@instructure.com>
    Dan Minkevitch authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    7ee751c View commit details
    Browse the repository at this point in the history
  18. Fix migration issue with sharding

    Change-Id: I1a756034d2296d222d14650339f32760e459183b
    Reviewed-on: https://gerrit.instructure.com/59918
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Tested-by: Jenkins
    Product-Review: Dan Minkevitch <dan@instructure.com>
    Dan Minkevitch authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    a345e53 View commit details
    Browse the repository at this point in the history
  19. NVDA - Global nav options have extraneous 'link' announced

    Fixes: CNVS-21513
    
    Test Plan:
    - In Firefox with NVDA enabled, turn on the new UI
    
    - Move through the global nav with NVDA
    
    - Previously, Account and Inbox options had an extra
      link announced (http://screencast.com/t/mAp9jc5tMtjO)
    
    - Now, the Account and Inbox options should be
      consistent with the ones before them (no extra
      'link' is announced)
    
    Change-Id: Ie7267a4a93680c5ea8f066b505148c1b0e42fa31
    Reviewed-on: https://gerrit.instructure.com/59669
    Tested-by: Jenkins
    Reviewed-by: Jennifer Stern <jstern@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Product-Review: Aaron Cannon <acannon@instructure.com>
    serikjensen authored and roor0 committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    6c5175d View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2015

  1. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 6c5175d
    roor0 committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    f166be6 View commit details
    Browse the repository at this point in the history
  2. treesame commit of origin/stable/2015-07-18

    Treesame-Commit-Id: 4cf9ccb
    roor0 committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    34cf2c7 View commit details
    Browse the repository at this point in the history
  3. Updated ar translation

    Change-Id: I8277df32105e7364154d864c73e102e975f2cc27
    Transifreq authored and roor0 committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    5c3479f View commit details
    Browse the repository at this point in the history
  4. export ASSET_HOST to window.ENV so handlebars css loads

    in order to serve the css for handlebars files
    from a CDN this needs to be set.
    
    Test Plan:
    
    load a page that has handlebars css on it
    see that it works
    
    Change-Id: Ie9fec018e2d9fc95e1bb5c1a61b504797fb535a0
    Reviewed-on: https://gerrit.instructure.com/60344
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: Derek Hansen <dhansen@instructure.com>
    Tested-by: Jenkins
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and roor0 committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    4cfec0f View commit details
    Browse the repository at this point in the history
  5. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 4cfec0f
    roor0 committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    fedff64 View commit details
    Browse the repository at this point in the history
  6. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 4cfec0f
    roor0 committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    50d4e04 View commit details
    Browse the repository at this point in the history
  7. only check for user_is_instructor? on courses

    fixes CNVS-22405
    
    test plan
     - go to groups/users
     - it should work
    
    Change-Id: I833b8bb514abf1e0cb4f1ca518e02f09ae0cd3c8
    Reviewed-on: https://gerrit.instructure.com/60345
    Reviewed-by: Rob Orton <rob@instructure.com>
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: Derek Hansen <dhansen@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    roor0 committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    739d9fa View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2015

  1. updated en.yml

    maneframe committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    3d33863 View commit details
    Browse the repository at this point in the history
  2. show original error in switchman create_new_shard failure

    Change-Id: Ie819d823ad8040e3433e284b691d43078a1cc504
    Reviewed-on: https://gerrit.instructure.com/60388
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    maneframe authored and roor0 committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    b12305e View commit details
    Browse the repository at this point in the history
  3. rollback swithcman to 1.2.37

    Change-Id: Ia15ecf69739284167877e9aec456246d27a53be6
    Reviewed-on: https://gerrit.instructure.com/60429
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    roor0 committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    81dba3b View commit details
    Browse the repository at this point in the history
  4. bump moodle2cc version

    This new version uses nokogiri instead of libxml-ruby.
    
    refs CNVS-22298
    
    test plan: basic regression test on moodle imports.
    
    Change-Id: Iedfc6c2cd8c33fae5d76cd6e77eec293635c1051
    Reviewed-on: https://gerrit.instructure.com/59917
    Reviewed-by: James Williams  <jamesw@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Brian Palmer <brianp@instructure.com>
    codekitchen committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    ee67db2 View commit details
    Browse the repository at this point in the history
  5. show original error in switchman create_new_shard failure

    Change-Id: Ie819d823ad8040e3433e284b691d43078a1cc504
    Reviewed-on: https://gerrit.instructure.com/60388
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    maneframe authored and codekitchen committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    00a5a86 View commit details
    Browse the repository at this point in the history
  6. switch to fork of nokogiri

    This is required for ratom until this PR is merged sparklemotion/nokogiri#1327
    
    refs CNVS-22298
    
    Change-Id: If99e10659b5b17e8cc8e0df49fbf5ba1214b8612
    Reviewed-on: https://gerrit.instructure.com/59948
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Brian Palmer <brianp@instructure.com>
    codekitchen committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    e2449fe View commit details
    Browse the repository at this point in the history
  7. switch to ratom-nokogiri gem

    refs CNVS-22298
    
    Change-Id: I4752fa491dcdd8f8f0eea9fb3b9ed63f2d0bb1e9
    Reviewed-on: https://gerrit.instructure.com/59981
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Brian Palmer <brianp@instructure.com>
    codekitchen committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    006af62 View commit details
    Browse the repository at this point in the history
  8. Revert "rails4: fix activerecord all_models"

    This reverts commit 1b98577.
    
    Change-Id: I1dc7414c1bc062ac7198626197b3540f5e2ad71a
    Reviewed-on: https://gerrit.instructure.com/60447
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    roor0 committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    477e40b View commit details
    Browse the repository at this point in the history
  9. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 477e40b
    roor0 committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    71bf9b6 View commit details
    Browse the repository at this point in the history
  10. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: 006af62
    roor0 committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    36f7bdc View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2015

  1. Make course checklist status accurate

    Fixes CNVS-22241
    
    Test Plan:
    1) Create new course
    2) Navigate to Course Setup Checklist on the Home view
    3) Follow each item in the checklist and ensure each item
       is checked off correctly as you complete them
    
    Change-Id: Ia65ab7817dcd330107701e6e6641941343d72d24
    Reviewed-on: https://gerrit.instructure.com/59999
    Tested-by: Jenkins
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: Brock Cooper <bcooper@instructure.com>
    Brock Cooper authored and maneframe committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    66c6594 View commit details
    Browse the repository at this point in the history
  2. Global includes checkbox isn't linked to its label

    fixes CNVS-22246
    
    Test plan:
    
    When the new UI feature is enabled:
    * The features section on the account settings page should look like:
    http://cl.ly/image/1W2y3x0P2y2c (note global JS/CSS includes checkbox)
    * The label shoudl be read for the checkbox with supported screen readers
    
    When the new UI feature is disabled:
    * The feature section on the account settings page should look like:
    http://cl.ly/image/2z3e393Q0e31 (note Global JS/CSS includes checkbox)
    (no change from production)
    
    Change-Id: I957d502e24a8ae49f883b072e286dd44af5060c7
    Reviewed-on: https://gerrit.instructure.com/60063
    Tested-by: Jenkins
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Reviewed-by: Chris Hart <chart@instructure.com>
    Product-Review: Chris Hart <chart@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    junyper authored and maneframe committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    62c8abf View commit details
    Browse the repository at this point in the history
  3. Consider section end date in quiz eligibility.

    Refs CNVS-18768
    Fixes CNVS-21514
    Fixes CNVS-22172
    
    test plan:
    - Set course dates to the past and check the "Users can only
      participate during section dates"
    - Set section dates to the present and check the "Users can only
      participate during section dates"
    - Assign a quiz to that section
    - Take Quiz button should not appear
    
    - Confirm that no quiz taking timing regressions have introduced
      themselves.
    
      Hierarchy of dates:
      - term dates > course dates
      - course > term if course dates are restricted ("Users can only
        participate...")
      - section > term > course if only section dates are restricted
      - section > course > term if both section and course dates are
        restricted
      - Quiz time limits are always applied unless end_at times (section ||
        term || course) are shorter.
      - Moderation events are properly applied always..
    
    - Create quiz, do not publish it
    - View quiz list
    - Attempt to view quiz as a teacher
    - Attempt to preview quiz as a teacher
    
    Change-Id: I33280c0b188ba9308858837dbea8a7e11f71e0b4
    Reviewed-on: https://gerrit.instructure.com/57604
    Tested-by: Jenkins
    Reviewed-by: Matt Berns <mberns@instructure.com>
    QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
    Product-Review: Jason Sparks <jsparks@instructure.com>
    Coraline Ehmke authored and maneframe committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    a87ffb3 View commit details
    Browse the repository at this point in the history
  4. don't reload files when unnecessary in AR#all_models

    Change-Id: Ib902f5f62c900364f0f1e4a64dc5686468bcf030
    Reviewed-on: https://gerrit.instructure.com/60478
    Tested-by: Jenkins
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
    maneframe committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    338739e View commit details
    Browse the repository at this point in the history
  5. Fix placement of term date in course navigation

    (legacy UI only)
    
    Fixes: CNVS-22426
    
    Test Plan:
    - Make sure the Use New Styles feature flag is OFF
    - Go to a course with a term date set
    - Make sure the context menu now looks like this ...
      http://cl.ly/image/2o3f1h1k1O1y
      ... instead of this:
      http://screencast.com/t/ojQ2dudYV
    
    Change-Id: Ica532f790c93e3506264328fa471ae7f10e229f0
    Reviewed-on: https://gerrit.instructure.com/60480
    Reviewed-by: Jennifer Stern <jstern@instructure.com>
    Product-Review: Jennifer Stern <jstern@instructure.com>
    Tested-by: Jenkins
    QA-Review: Erin Hallmark <erin@instructure.com>
    Chris Hart authored and maneframe committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    3738098 View commit details
    Browse the repository at this point in the history
  6. record errors on the shard they are for

    Change-Id: I99f28a012d153ae87ed7fb00860254a5122519b5
    Reviewed-on: https://gerrit.instructure.com/60502
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer authored and maneframe committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    939ecfc View commit details
    Browse the repository at this point in the history
  7. record errors on the shard they are for

    Change-Id: I99f28a012d153ae87ed7fb00860254a5122519b5
    Reviewed-on: https://gerrit.instructure.com/60502
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    b8d9a8d View commit details
    Browse the repository at this point in the history
  8. don't load the developer key just to log its ID

    test plan:
     * use an access token to do an API request
     * the X-Canvas-Meta header should have a dk key, with a global id
    
    Change-Id: I85139bffb16750a4bfffb241eaaf54de4d9601ae
    Reviewed-on: https://gerrit.instructure.com/60597
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    12eb15c View commit details
    Browse the repository at this point in the history
  9. avoid querying default shard for notifications

    Change-Id: Id2a87d408c28ad0af6151c66784585bc5147496e
    Reviewed-on: https://gerrit.instructure.com/60617
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    c111016 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2015

  1. don't load the developer key just to log its ID

    test plan:
     * use an access token to do an API request
     * the X-Canvas-Meta header should have a dk key, with a global id
    
    Change-Id: I85139bffb16750a4bfffb241eaaf54de4d9601ae
    Reviewed-on: https://gerrit.instructure.com/60597
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    7484644 View commit details
    Browse the repository at this point in the history
  2. avoid querying default shard for notifications

    Change-Id: Id2a87d408c28ad0af6151c66784585bc5147496e
    Reviewed-on: https://gerrit.instructure.com/60617
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    91ea0f3 View commit details
    Browse the repository at this point in the history
  3. bump ruby-saml-mod

    fixes CNVS-22460
    
    Change-Id: Ic5098109094cd448548af078b033a5942cd5c236
    Reviewed-on: https://gerrit.instructure.com/60652
    Tested-by: Jenkins
    Reviewed-by: Brian Palmer <brianp@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    26a8c63 View commit details
    Browse the repository at this point in the history
  4. don't notify observers when students aren't notified

    test plan:
    * add a student user as an observee
    * add the student to an unpublished course or to a course
     via SIS imports
    * the student should not receive a notification
    * neither should the observer
    
    closes #CNVS-22363
    
    Change-Id: I91df5a74b31b13b24ddefb31b68ae17c5f19a551
    Reviewed-on: https://gerrit.instructure.com/60485
    Tested-by: Jenkins
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and codekitchen committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    d7f9516 View commit details
    Browse the repository at this point in the history
  5. send exception type as a tag

    A tag makes it filterable, vs extra data which is just displayed on the samples
    screen.
    
    Change-Id: I9d01491c59a5ede9ffa12269d5a035a0e2d80793
    Reviewed-on: https://gerrit.instructure.com/60488
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Brian Palmer <brianp@instructure.com>
    codekitchen committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    d316071 View commit details
    Browse the repository at this point in the history
  6. Use ENV.current_user_id instead of $('#identity .user_id')

    fixes: CNVS-22491
    
    we used to have a bunch of things in js where look
    for hidden elements in #identity to get user_ids
    and context_ids. that is a bad idea and has been
    deprecated in favor of using window.ENV.
    I just did a check and these were the last 2
    that I could find.
    
    test plan:
    * in the new UI...
    * as a student, go to the modules page
    * you should see a green checkmark next to the
      modules you've completed
    
    Change-Id: Ic10b903220b93e35b314e274a69872482c52cc64
    Reviewed-on: https://gerrit.instructure.com/59863
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Tested-by: Jenkins
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and codekitchen committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    ba80d77 View commit details
    Browse the repository at this point in the history
  7. Increments cache key for modules page

    Instructors were getting a cached copy of the modules page, but
    a new copy of context_modules.js.  The new version of context_modules
    requires an id to be present as an element on the page.  The cached
    copies of this page does not include an id attribute.
    
    The problem resolves itself anytime the cache is busted by modifying
    other aspects of the module.  This forces the cache to bust for
    everyone so they get a new copy of the page.
    
    fixes CNVS-22413
    
    Test Plan:
      - Load up an old course (you need to have an old cached copy of the page)
      - You should be able to add an item to a module without problems.
    
    Change-Id: I217e63b1587577db65120d51dfd777c705acddbc
    Reviewed-on: https://gerrit.instructure.com/60779
    Reviewed-by: James Williams  <jamesw@instructure.com>
    Tested-by: Jenkins
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: Clay Diffrient <cdiffrient@instructure.com>
    claydiffrient authored and codekitchen committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    5c68ad6 View commit details
    Browse the repository at this point in the history
  8. show course_settings_sub_navigation lti tools with read_as_admin

    test plan:
    * add an lti tool configured for course_settings_sub_navigation
    * add a teacher to a course with a term that restricts teacher
     edit access past a date in the past
    * should still be able to see the lti tool
    
    closes #CNVS-22488
    
    Change-Id: I332da191ec08e859001e68f7813d52e00028487b
    Reviewed-on: https://gerrit.instructure.com/60787
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Clare Strong <clare@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and codekitchen committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    256b14d View commit details
    Browse the repository at this point in the history
  9. bump nokogiri

    Change-Id: Ibefaf48d0de044e52ee6e92655fb103c4b5d5511
    Reviewed-on: https://gerrit.instructure.com/60830
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    Product-Review: August Thornton <august@instructure.com>
    Tested-by: Brian Palmer <brianp@instructure.com>
    codekitchen committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    c62f5b2 View commit details
    Browse the repository at this point in the history
  10. don't notify observers when students aren't notified

    test plan:
    * add a student user as an observee
    * add the student to an unpublished course or to a course
     via SIS imports
    * the student should not receive a notification
    * neither should the observer
    
    closes #CNVS-22363
    
    Change-Id: I91df5a74b31b13b24ddefb31b68ae17c5f19a551
    Reviewed-on: https://gerrit.instructure.com/60485
    Tested-by: Jenkins
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and simonista committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    a3fbab7 View commit details
    Browse the repository at this point in the history
  11. Use ENV.current_user_id instead of $('#identity .user_id')

    fixes: CNVS-22491
    
    we used to have a bunch of things in js where look
    for hidden elements in #identity to get user_ids
    and context_ids. that is a bad idea and has been
    deprecated in favor of using window.ENV.
    I just did a check and these were the last 2
    that I could find.
    
    test plan:
    * in the new UI...
    * as a student, go to the modules page
    * you should see a green checkmark next to the
      modules you've completed
    
    
    Change-Id: Ic10b903220b93e35b314e274a69872482c52cc64
    Reviewed-on: https://gerrit.instructure.com/59863
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Tested-by: Jenkins
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and simonista committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    af09762 View commit details
    Browse the repository at this point in the history
  12. Increments cache key for modules page

    Instructors were getting a cached copy of the modules page, but
    a new copy of context_modules.js.  The new version of context_modules
    requires an id to be present as an element on the page.  The cached
    copies of this page does not include an id attribute.
    
    The problem resolves itself anytime the cache is busted by modifying
    other aspects of the module.  This forces the cache to bust for
    everyone so they get a new copy of the page.
    
    fixes CNVS-22413
    
    Test Plan:
      - Load up an old course (you need to have an old cached copy of the page)
      - You should be able to add an item to a module without problems.
    
    Change-Id: I217e63b1587577db65120d51dfd777c705acddbc
    Reviewed-on: https://gerrit.instructure.com/60779
    Reviewed-by: James Williams  <jamesw@instructure.com>
    Tested-by: Jenkins
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: Clay Diffrient <cdiffrient@instructure.com>
    claydiffrient authored and simonista committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    9b767cd View commit details
    Browse the repository at this point in the history
  13. show course_settings_sub_navigation lti tools with read_as_admin

    test plan:
    * add an lti tool configured for course_settings_sub_navigation
    * add a teacher to a course with a term that restricts teacher
     edit access past a date in the past
    * should still be able to see the lti tool
    
    closes #CNVS-22488
    
    Change-Id: I332da191ec08e859001e68f7813d52e00028487b
    Reviewed-on: https://gerrit.instructure.com/60787
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Clare Strong <clare@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and simonista committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    870913e View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2015

  1. bump ruby-saml-mod

    refs CNVS-22298
    
    Change-Id: Ie6516589793037f58d0ab61c6c89fce9c87d1cd2
    Reviewed-on: https://gerrit.instructure.com/59829
    Tested-by: Jenkins
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    f9f4a57 View commit details
    Browse the repository at this point in the history
  2. bump moodle2cc version

    This new version uses nokogiri instead of libxml-ruby.
    
    refs CNVS-22298
    
    test plan: basic regression test on moodle imports.
    
    Change-Id: Iedfc6c2cd8c33fae5d76cd6e77eec293635c1051
    Reviewed-on: https://gerrit.instructure.com/59917
    Reviewed-by: James Williams  <jamesw@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Brian Palmer <brianp@instructure.com>
    codekitchen authored and ccutrer committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    1e4a989 View commit details
    Browse the repository at this point in the history
  3. switch to fork of nokogiri

    This is required for ratom until this PR is merged sparklemotion/nokogiri#1327
    
    refs CNVS-22298
    
    Change-Id: If99e10659b5b17e8cc8e0df49fbf5ba1214b8612
    Reviewed-on: https://gerrit.instructure.com/59948
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Brian Palmer <brianp@instructure.com>
    codekitchen authored and ccutrer committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    77fc7b2 View commit details
    Browse the repository at this point in the history
  4. switch to ratom-nokogiri gem

    refs CNVS-22298
    
    Change-Id: I4752fa491dcdd8f8f0eea9fb3b9ed63f2d0bb1e9
    Reviewed-on: https://gerrit.instructure.com/59981
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Brian Palmer <brianp@instructure.com>
    codekitchen authored and ccutrer committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    d4841e5 View commit details
    Browse the repository at this point in the history
  5. bump ruby-saml-mod

    fixes CNVS-22460
    
    Change-Id: Ic5098109094cd448548af078b033a5942cd5c236
    Reviewed-on: https://gerrit.instructure.com/60652
    Tested-by: Jenkins
    Reviewed-by: Brian Palmer <brianp@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    1e8211e View commit details
    Browse the repository at this point in the history
  6. bump nokogiri

    Change-Id: Ibefaf48d0de044e52ee6e92655fb103c4b5d5511
    Reviewed-on: https://gerrit.instructure.com/60830
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    Product-Review: August Thornton <august@instructure.com>
    Tested-by: Brian Palmer <brianp@instructure.com>
    codekitchen authored and ccutrer committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    ced0890 View commit details
    Browse the repository at this point in the history
  7. fix preload notification on stream item assets

    it can't preload until _after_ it knows what the notification_id is
    
    Change-Id: Ice9aef3e1788549a8f0c2d488afe2a0429a6db96
    Reviewed-on: https://gerrit.instructure.com/60792
    Reviewed-by: Rob Orton <rob@instructure.com>
    Tested-by: Jenkins
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    f8e5339 View commit details
    Browse the repository at this point in the history
  8. fix logins list for explicit saml provider

    fixes CNVS-22516
    
    test plan:
     * explicitly link a login to a SAML provider
     * view the users page for the user
     * it should not error
    
    Change-Id: I6a2b746f19963b2d9aa20808244a96353102b827
    Reviewed-on: https://gerrit.instructure.com/60900
    Reviewed-by: Rob Orton <rob@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    6862c75 View commit details
    Browse the repository at this point in the history
  9. rewrite activity stream summary for performance

    adds a notification_category column in order to move all
    the calculation of stream item counts to the db instead
    of loading all the instances and items
    
    test plan:
    * regression test activity stream summary api endpoint
    
    closes #CNVS-22424
    
    Change-Id: Ia0abf9d89e02d53800bcd5d62fdf1a36131bd6f8
    Reviewed-on: https://gerrit.instructure.com/60578
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    ebd7169 View commit details
    Browse the repository at this point in the history
  10. don't fetch site_admin role overrides for non-site_admin roles

    Change-Id: I12fb68f676caef8bd8838b4dc771ca919e218da7
    Reviewed-on: https://gerrit.instructure.com/60607
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    74224a5 View commit details
    Browse the repository at this point in the history
  11. fix preload notification on stream item assets

    it can't preload until _after_ it knows what the notification_id is
    
    Change-Id: Ice9aef3e1788549a8f0c2d488afe2a0429a6db96
    Reviewed-on: https://gerrit.instructure.com/60792
    Reviewed-by: Rob Orton <rob@instructure.com>
    Tested-by: Jenkins
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    ccutrer authored and maneframe committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    0384408 View commit details
    Browse the repository at this point in the history
  12. fix logins list for explicit saml provider

    fixes CNVS-22516
    
    test plan:
     * explicitly link a login to a SAML provider
     * view the users page for the user
     * it should not error
    
    Change-Id: I6a2b746f19963b2d9aa20808244a96353102b827
    Reviewed-on: https://gerrit.instructure.com/60900
    Reviewed-by: Rob Orton <rob@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer authored and maneframe committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    7ed2f6b View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2015

  1. parse date strings using moment

    fixes CNVS-21576
    
    test plan:
      run the following:
        tz = require('timezone');
        tz.changeLocale('fr_FR');
        tz.parse('mercredi 1 juillet 2015 15:00')
      the correct date is returned
    
    Change-Id: I0683fa670b443098b2b53ca211fbe38727869a97
    Reviewed-on: https://gerrit.instructure.com/60091
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Jacob Fugal <jacob@instructure.com>
    Michael Nomitch authored and roor0 committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    4a47b4e View commit details
    Browse the repository at this point in the history
  2. Add GET endpoint for Quiz Question Groups

    refs PFS-2390
    
    Test Plan:
    * make GET /api/v1/courses/:course_id/quizzes/:quiz_id/groups/:id
    * verify results
    
    Change-Id: I9540423228a68cd921ed3a6f60976d55bdd5df04
    Reviewed-on: https://gerrit.instructure.com/59632
    Tested-by: Jenkins
    Reviewed-by: John Corrigan <jcorrigan@instructure.com>
    QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
    Product-Review: Tyson Brown <tbrown@instructure.com>
    Tyson Brown authored and roor0 committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    3c315ef View commit details
    Browse the repository at this point in the history
  3. Add sis_account_id to sub-account creation api

    fixes PFS-2347
    
    Test Plan:
    * POST /api/v1/accounts/:account_id/sub_accounts,
      setting account[sis_account_id] to something
    * verify result
    
    Change-Id: I60c89dc3d93d491ded3a63f9359cab5a9c8240a4
    Reviewed-on: https://gerrit.instructure.com/60057
    QA-Review: August Thornton <august@instructure.com>
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    Product-Review: Tyson Brown <tbrown@instructure.com>
    Tyson Brown authored and roor0 committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    1e2051a View commit details
    Browse the repository at this point in the history
  4. localize values in datetime picker fields

    fixes CNVS-21581, CNVS-21582
    
    test-plan:
     - regression around all datepicker elements
     - for each, when it loads with prepopulated data, that data should be
       localized
     - the prepopulated localized data should be valid to the datepicker
    
    Change-Id: I633034967c70066e337dc22d9b9ad0cd84793834
    Reviewed-on: https://gerrit.instructure.com/60229
    Tested-by: Jenkins
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
    Product-Review: Mike Nomitch <mnomitch@instructure.com>
    lukfugl authored and roor0 committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    14d7bfd View commit details
    Browse the repository at this point in the history
  5. don't put "show and hide courses menu" on user files

    test plan:
     - enable new styles in the root account
     - on a course files page, when the window is shrunk to where
       the course nav doesn't fit, a hamburger menu should appear
       to toggle it
     - on a user files page, the hamburger menu should not be there
       (because there is no course nav to toggle; currently it is
        toggling an empty space)
    
    fixes CNVS-21105
    
    Change-Id: I229e308ead615f6790002aee3d17de436655f727
    Reviewed-on: https://gerrit.instructure.com/60803
    Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
    Tested-by: Jenkins
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: Jeremy Stanley <jeremy@instructure.com>
    jstanley0 authored and roor0 committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    0f02c9f View commit details
    Browse the repository at this point in the history
  6. add armenian language

    fixes CNVS-21898
    
    test plan
     - canvas should load with armenian
     - date pickers should work
    
    Change-Id: I45ad840fdbe711cb82337bd91ba4009496b19ff1
    Reviewed-on: https://gerrit.instructure.com/60960
    Tested-by: Jenkins
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    roor0 committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    b03de93 View commit details
    Browse the repository at this point in the history
  7. fix activity_stream_summary for announcements

    apparently they are the exception to the asset_type
     is class name rule
    
    test plan:
    * create an announcement
    * it should count as a separate type of stream item in the
     activity stream summary
    
    refs #CNVS-22424
    
    Change-Id: I4eefaab180e1dc8f441c9b23d0a2a237dac627c9
    Reviewed-on: https://gerrit.instructure.com/61001
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and ccutrer committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    d37f015 View commit details
    Browse the repository at this point in the history
  8. force Account.find_cached to always cache relative to the birth shard

    also get rid of the :nil nonsense in caching - it's not needed in Rails 3
    
    Change-Id: Ie2879f91e59898981ad2566a63a6b99350313165
    Reviewed-on: https://gerrit.instructure.com/61017
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    6deb695 View commit details
    Browse the repository at this point in the history
  9. preload global announcement account info prior to caching

    this avoids repetive queries for site admin
    
    Change-Id: I6c7ac3c49f47385167007b92b8e589257250c41f
    Reviewed-on: https://gerrit.instructure.com/61016
    Tested-by: Jenkins
    Reviewed-by: James Williams  <jamesw@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    7dfd625 View commit details
    Browse the repository at this point in the history
  10. force Account.find_cached to always cache relative to the birth shard

    also get rid of the :nil nonsense in caching - it's not needed in Rails 3
    
    Change-Id: Ie2879f91e59898981ad2566a63a6b99350313165
    Reviewed-on: https://gerrit.instructure.com/61017
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer authored and mcwqy9 committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    64eff44 View commit details
    Browse the repository at this point in the history
  11. preload global announcement account info prior to caching

    this avoids repetive queries for site admin
    
    Change-Id: I6c7ac3c49f47385167007b92b8e589257250c41f
    Reviewed-on: https://gerrit.instructure.com/61016
    Tested-by: Jenkins
    Reviewed-by: James Williams  <jamesw@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer authored and mcwqy9 committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    319a954 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2015

  1. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 319a954
    roor0 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    dc55a22 View commit details
    Browse the repository at this point in the history
  2. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: 7dfd625
    roor0 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    362f7d5 View commit details
    Browse the repository at this point in the history
  3. don't fetch site_admin role overrides for non-site_admin roles

    Change-Id: I12fb68f676caef8bd8838b4dc771ca919e218da7
    Reviewed-on: https://gerrit.instructure.com/60607
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: Charles Kimball <ckimball@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and mcwqy9 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    4a18a0e View commit details
    Browse the repository at this point in the history
  4. preload enrollment dates when selecting participating users in a course

    refs CNVS-22546
    
    Change-Id: Ia3fc3ecd7e4d8fe77c1203388554a25eed759fea
    Reviewed-on: https://gerrit.instructure.com/61070
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    ccutrer authored and mcwqy9 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    2280a2b View commit details
    Browse the repository at this point in the history
  5. preload enrollment dates when selecting participating users in a course

    refs CNVS-22546
    
    Change-Id: Ia3fc3ecd7e4d8fe77c1203388554a25eed759fea
    Reviewed-on: https://gerrit.instructure.com/61070
    Tested-by: Jenkins
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    ccutrer authored and roor0 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    c77bbb1 View commit details
    Browse the repository at this point in the history
  6. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 2280a2b
    roor0 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    2bc9fc7 View commit details
    Browse the repository at this point in the history
  7. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 2280a2b
    roor0 committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    a80e190 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2015

  1. rewrite activity stream summary for performance

    adds a notification_category column in order to move all
    the calculation of stream item counts to the db instead
    of loading all the instances and items
    
    test plan:
    * regression test activity stream summary api endpoint
    
    closes #CNVS-22424
    
    Change-Id: Ia0abf9d89e02d53800bcd5d62fdf1a36131bd6f8
    Reviewed-on: https://gerrit.instructure.com/60578
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and ccutrer committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    584eb9f View commit details
    Browse the repository at this point in the history
  2. fix activity_stream_summary for announcements

    apparently they are the exception to the asset_type
     is class name rule
    
    test plan:
    * create an announcement
    * it should count as a separate type of stream item in the
     activity stream summary
    
    refs #CNVS-22424
    
    Change-Id: I4eefaab180e1dc8f441c9b23d0a2a237dac627c9
    Reviewed-on: https://gerrit.instructure.com/61001
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and ccutrer committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    0e3c75f View commit details
    Browse the repository at this point in the history
  3. don't generate collaboration doc in transaction

    fixes CNVS-22506
    
    test plan
    - regression test google doc collaborations
    
    Change-Id: I696562d74e317b465b1679513fa7f5ff913a1c99
    Reviewed-on: https://gerrit.instructure.com/60923
    Tested-by: Jenkins
    Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
    QA-Review: Adrian Russell <arussell@instructure.com>
    Product-Review: Joel Hough <joel@instructure.com>
    JoelHough authored and ccutrer committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    730c9ef View commit details
    Browse the repository at this point in the history
  4. fix Account.find_cached

    Change-Id: I7c9ff510213fc74c71d7118d181af893eddae1bb
    Reviewed-on: https://gerrit.instructure.com/61253
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    Tested-by: Jenkins
    ccutrer committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    edb36a9 View commit details
    Browse the repository at this point in the history
  5. Revert "fix activity_stream_summary for announcements"

    This reverts commit 0e3c75f.
    ccutrer committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    ce1317f View commit details
    Browse the repository at this point in the history
  6. Revert "rewrite activity stream summary for performance"

    This reverts commit 584eb9f.
    ccutrer committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    2003a02 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2015

  1. speedgrader external urls can now open inline or in a new tab

    When using SpeedGrader on an external URL page, the teacher is
    presented with the URL as a link that opens in the frame and a second
    instance of the link with the text "(View in a new tab.)"  Because of
    this, teachers have the option to choose to view inline or in a
    seperate tab.
    
    fixes CNVS-22370
    
    test plan:
    - In a published course with students...
    - Add a URL submission assignment and publish it.
    - As a student submit http://placekitten.com as the assignment
      submission.
    - As a teacher view the submission in speedgrader, and click the
      submission links in the left frame.
    - Confirm that the URL link opens in the iFrame and the "View in a new
      tab" link opens in a new tab or window.
    
    Change-Id: I4991db9cd12101f0cfdd719aed3e77acf0ce7a61
    Reviewed-on: https://gerrit.instructure.com/60517
    Reviewed-by: Strand McCutchen <smccutchen@instructure.com>
    Tested-by: Jenkins
    QA-Review: Adrian Foong <afoong@instructure.com>
    Product-Review: Josh Simpson <jsimpson@instructure.com>
    
    Conflicts:
    	spec/selenium/speed_grader_teacher_spec.rb
    ktgeek authored and ccutrer committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    3c03e5c View commit details
    Browse the repository at this point in the history
  2. don't generate collaboration doc in transaction

    fixes CNVS-22506
    
    test plan
    - regression test google doc collaborations
    
    Change-Id: I696562d74e317b465b1679513fa7f5ff913a1c99
    Reviewed-on: https://gerrit.instructure.com/60923
    Tested-by: Jenkins
    Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
    QA-Review: Adrian Russell <arussell@instructure.com>
    Product-Review: Joel Hough <joel@instructure.com>
    JoelHough authored and ccutrer committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    54bb741 View commit details
    Browse the repository at this point in the history
  3. fix Account.find_cached

    Change-Id: I7c9ff510213fc74c71d7118d181af893eddae1bb
    Reviewed-on: https://gerrit.instructure.com/61253
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    Tested-by: Jenkins
    ccutrer committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    6e667aa View commit details
    Browse the repository at this point in the history
  4. move thumbnail resizing out of transaction

    test plan:
    * image files and thumbnail creation should work as before
    
    closes #CNVS-22544
    
    Change-Id: I5631b392a4f4371d6fba2065608b8ce65175dcd5
    Reviewed-on: https://gerrit.instructure.com/61078
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and ccutrer committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    91c4c6f View commit details
    Browse the repository at this point in the history
  5. determine recipients and queue notifications _after_ transaction commit

    fixes CNVS-22546
    
    test plan:
      * regression test notifications
    
    Change-Id: I7896f03b18b19003cff6228aefa72029a8c08a29
    Reviewed-on: https://gerrit.instructure.com/61249
    Reviewed-by: Joel Hough <joel@instructure.com>
    Tested-by: Jenkins
    QA-Review: Adrian Russell <arussell@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    821538e View commit details
    Browse the repository at this point in the history
  6. remove duplicate section dropdown

    fixes CNVS-22349
    
    Test plan
    
    0. In a course with sections navigate to the gradebook.
    1. Confirm that there is a sections dropdown on the right.
    2. Confirm there is NOT a sections dropdown on the left.
    
    Change-Id: Ib0419fbf7cfd78be87277b487a9b1080ab22329f
    Reviewed-on: https://gerrit.instructure.com/60656
    Tested-by: Jenkins
    Reviewed-by: Keith T. Garner <kgarner@instructure.com>
    QA-Review: Jason Carter <jcarter@instructure.com>
    Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
    Strand McCutchen authored and ccutrer committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    6559eef View commit details
    Browse the repository at this point in the history
  7. filter assignments by overrides when necessary

    build query that search for overrides but delegates to assignment if none exist
    
    fixes CNVS-20435
    
    Change-Id: I0b88ccb78027e43a7d82c392a11b9980fff52174
    Reviewed-on: https://gerrit.instructure.com/57176
    Tested-by: Jenkins
    Reviewed-by: Strand McCutchen <smccutchen@instructure.com>
    QA-Review: Adrian Foong <afoong@instructure.com>
    Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
    djbender authored and ccutrer committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    a81a613 View commit details
    Browse the repository at this point in the history
  8. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 2003a02
    ccutrer committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    8ee3099 View commit details
    Browse the repository at this point in the history
  9. rails4: set config.log_level on boot

    otherwise it will ovewrite logger.level with the default
     (:info on production)
    
    refs #CNVS-21596
    
    Change-Id: I18352300b769d141de7a83959568e627f6a519b4
    Reviewed-on: https://gerrit.instructure.com/61257
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
    maneframe committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    e8c6536 View commit details
    Browse the repository at this point in the history
  10. fix activity_stream_summary for cross-shard users

    test plan:
    * create a user in a course on another shard
    * activity_stream/summary should still include
     stream items from the other shard
    
    closes #CNVS-22424
    
    Change-Id: I37405a292ea28e76d9e559dd67fe82f8061e400f
    Reviewed-on: https://gerrit.instructure.com/61300
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    1163578 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2015

  1. move thumbnail resizing out of transaction

    test plan:
    * image files and thumbnail creation should work as before
    
    closes #CNVS-22544
    
    Change-Id: I5631b392a4f4371d6fba2065608b8ce65175dcd5
    Reviewed-on: https://gerrit.instructure.com/61078
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Tested-by: Jenkins
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and ccutrer committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    4c301d6 View commit details
    Browse the repository at this point in the history
  2. fixes google drive authorization

    fixes CNVS-22557
    
    Test Plan:
    - create a user and register them with google docs
    - then try to register them with google drive
    - notice you can change what email you want to register with
      google drive
    
    Change-Id: Id5894cd7fddf152491a27c2cadb17f5a93109b1b
    Reviewed-on: https://gerrit.instructure.com/61293
    Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
    QA-Review: Steven Shepherd <sshepherd@instructure.com>
    Tested-by: Jenkins
    Product-Review: Peyton Craighill <pcraighill@instructure.com>
    sdb1228 authored and ccutrer committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    9587a9a View commit details
    Browse the repository at this point in the history
  3. determine recipients and queue notifications _after_ transaction commit

    fixes CNVS-22546
    
    test plan:
      * regression test notifications
    
    Change-Id: I7896f03b18b19003cff6228aefa72029a8c08a29
    Reviewed-on: https://gerrit.instructure.com/61249
    Reviewed-by: Joel Hough <joel@instructure.com>
    Tested-by: Jenkins
    QA-Review: Adrian Russell <arussell@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    ccutrer committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    e78b922 View commit details
    Browse the repository at this point in the history
  4. Updated en-AU translation

    Change-Id: I9bdc25c3ce535ffbeac678538c420e5b78705a99
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    117e18d View commit details
    Browse the repository at this point in the history
  5. Updated en-GB translation

    Change-Id: I28686128ae700f63d505a2cc17aca69772672471
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    ff43118 View commit details
    Browse the repository at this point in the history
  6. Updated en-AU translation

    Change-Id: Id39f313c05c5eb99daae8c67167b4e91aa26ab14
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    5754874 View commit details
    Browse the repository at this point in the history
  7. Updated es translation

    Change-Id: Ib657ace2670b9daea456b496f0eb0fdefd051f1c
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    b475e43 View commit details
    Browse the repository at this point in the history
  8. Updated nl translation

    Change-Id: I1dc2a0e742d6764a58273ad602d00b6829248b65
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    ccbac09 View commit details
    Browse the repository at this point in the history
  9. Updated sv translation

    Change-Id: I6d13368b82463173917d224b7540f370ecdf947b
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    02904ad View commit details
    Browse the repository at this point in the history
  10. Updated zh translation

    Change-Id: I80cfefab4487efe8e3c1b92262212624b2abd5c3
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    107ac0b View commit details
    Browse the repository at this point in the history
  11. Updated ar translation

    Change-Id: I4a02405b43436b602c6d7f6cfe5282c71cbaa620
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    3d1a236 View commit details
    Browse the repository at this point in the history
  12. Updated da translation

    Change-Id: I42312bdc5451480f1d128d012ae1baff3b5baab8
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    848c21b View commit details
    Browse the repository at this point in the history
  13. Updated de translation

    Change-Id: I2ce8c43beb4c014ff2073d876fefe5d1565c79bf
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    996eea9 View commit details
    Browse the repository at this point in the history
  14. Updated en-AU translation

    Change-Id: Ic91a55c71b7e076a01e08e08eb6cb3e3840aeab2
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    1c9b1ab View commit details
    Browse the repository at this point in the history
  15. Updated es translation

    Change-Id: I55a37a7a807e90471551efcdbb5eb667c0a4c8ad
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    0db0e17 View commit details
    Browse the repository at this point in the history
  16. Updated fr translation

    Change-Id: I665b99150c828ee1ba75d8faeaa29db97de8d063
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    206d366 View commit details
    Browse the repository at this point in the history
  17. Updated ru translation

    Change-Id: I479c85c303e2ab9366d0210822505a0951f1212d
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    35509a4 View commit details
    Browse the repository at this point in the history
  18. Updated tr translation

    Change-Id: I33c923d7b2356de4288dc8762fda747522322026
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    fbf6868 View commit details
    Browse the repository at this point in the history
  19. Updated ar translation

    Change-Id: I40a1a95795d4aa5a47cff8a18664bbb0f66f2f22
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    c43e3a3 View commit details
    Browse the repository at this point in the history
  20. Updated da translation

    Change-Id: I72b885a8774db5e5a0fd6cc181c9d0f71c444073
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    021b534 View commit details
    Browse the repository at this point in the history
  21. Updated en-GB translation

    Change-Id: I7224f8f5ba17b3309520189ebc38ed5102593a72
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    0f1de52 View commit details
    Browse the repository at this point in the history
  22. Updated ru translation

    Change-Id: I929b40cee62ac6d5bf382377114738a2feaafeea
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    68190f9 View commit details
    Browse the repository at this point in the history
  23. Updated zh_Hant translation

    Change-Id: If3e91ef41029d296ccc60fc68730c85af3adc5bb
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    48061b0 View commit details
    Browse the repository at this point in the history
  24. Updated ar translation

    Change-Id: I2afe366636693230c6c350af993e8705c35066de
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    e4cd3e7 View commit details
    Browse the repository at this point in the history
  25. Updated ja translation

    Change-Id: I37bf4b9c8d9b40dcae6d7ff381a6d7238ae7449b
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    451da01 View commit details
    Browse the repository at this point in the history
  26. Updated pt translation

    Change-Id: I7d8e171b72fd5c07d0b7037c10f0820a66c6c79b
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    0fd0a43 View commit details
    Browse the repository at this point in the history
  27. Updated nb translation

    Change-Id: I5d23f25215137ffc1f871191655c3b3db29f4253
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    ca4245f View commit details
    Browse the repository at this point in the history
  28. Updated es translation

    Change-Id: Ic5b3c23a6be43fd025c006411afdc1c29a176734
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    d10e4af View commit details
    Browse the repository at this point in the history
  29. Updated hy translation

    Change-Id: I185f0309a455eb09d9cec3cc10314f9abd47fc43
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    bb1484e View commit details
    Browse the repository at this point in the history
  30. Updated tr translation

    Change-Id: If079473c012f521adc4cd030c35efd69b8666cf9
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    de832e2 View commit details
    Browse the repository at this point in the history
  31. Updated ar translation

    Change-Id: I9fb0f739e3177b56e6f3e7f270cf6757dcca309a
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    68b623d View commit details
    Browse the repository at this point in the history
  32. Updated da translation

    Change-Id: Iec664159e40b32b982a715b97b5bab691277fe74
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    3e52151 View commit details
    Browse the repository at this point in the history
  33. Updated hy translation

    Change-Id: I94f10df7a9fd62569f370548d967f3f703b51f6e
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    03acf83 View commit details
    Browse the repository at this point in the history
  34. Updated ja translation

    Change-Id: I89ff6d24c668cb13aec994cc144082d82377edac
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    0758515 View commit details
    Browse the repository at this point in the history
  35. Updated nb translation

    Change-Id: Id9ad7fcb9de60c85d8e2d7e1c948f4fab7680fb3
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    9870add View commit details
    Browse the repository at this point in the history
  36. Updated sv translation

    Change-Id: I4670d1dc2e1f86f91cafae534d9db1f4a5536eb6
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    125b5e3 View commit details
    Browse the repository at this point in the history
  37. Updated zh translation

    Change-Id: Ia61446c337557811b442882219539cf7a39e8ba3
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    79ffde6 View commit details
    Browse the repository at this point in the history
  38. Updated zh_Hant translation

    Change-Id: Ibc1471edf319c62fe3f8b69819e38ca6436fcf4f
    Transifreq authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    fc47cd0 View commit details
    Browse the repository at this point in the history
  39. fixes google drive authorization

    fixes CNVS-22557
    
    Test Plan:
    - create a user and register them with google docs
    - then try to register them with google drive
    - notice you can change what email you want to register with
      google drive
    
    Change-Id: Id5894cd7fddf152491a27c2cadb17f5a93109b1b
    Reviewed-on: https://gerrit.instructure.com/61293
    Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
    QA-Review: Steven Shepherd <sshepherd@instructure.com>
    Tested-by: Jenkins
    Product-Review: Peyton Craighill <pcraighill@instructure.com>
    sdb1228 authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    ae54210 View commit details
    Browse the repository at this point in the history
  40. add account setting for requiring terms of use

    fixes CNVS-22604
    
    test plan:
     - create a new user and see they are required to accept terms.
     - in a rails console, change the `account_terms_required`
     setting for the account:
        account = Account.find(<the account id here>)
        account.settings[:account_terms_required] = false
        account.save!
     - create a new user and make sure they now don't have to accept terms.
    
    Change-Id: I8a616aa314bb6c7a82bd0ae93f965c3a1c85ff36
    Reviewed-on: https://gerrit.instructure.com/61333
    Tested-by: Jenkins
    Reviewed-by: James Williams  <jamesw@instructure.com>
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: Jon Willesen <jonw@instructure.com>
    Jon Willesen authored and lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    bf79820 View commit details
    Browse the repository at this point in the history
  41. don't recurse on unfudging of moment parsed date

    fixes CNVS-22626
    
    tz.parse uses tz.moment. we don't want tz.moment to just go back to
    tz.parse again.
    
    for most languages, this wasn't an issue as tz.parse would short circuit
    through tz.raw_parse given the ISO-ish format before calling again into
    tz.moment. but for e.g. ar-sa, the formatted string wouldn't be parsable
    by tz.raw_parse, so it would just go back into tz.moment, and loop over
    and over again.
    
    minimum fix is formatting in english locale (which is also necessary
    when calling to tz.raw_parse directly). but just to be sure, break the
    potential for cyclic recursion by only using tz.raw_parse directly when
    unfudging.
    
    test-plan:
      - in javascript console
        - tz = require('timezone')
        - tz.changeLocale('ar_SA')
        - tz.parse('5 Jul 2015 في 22:00')
      - should not explode the browser
    
    NOTE: the string may parse incorrectly if tested without a recently
    updated Arabic localization file. this is known, and has been addressed
    in Transifex, and is orthogonal to this fix. as long as the test plan
    above works, this fix is correct, even thought the other error may
    persist.
    
    Change-Id: Ie4aedef664a6d0ef2bb49122f3bad1499b4fb5bf
    Reviewed-on: https://gerrit.instructure.com/61458
    Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Jacob Fugal <jacob@instructure.com>
    lukfugl committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    620a9cd View commit details
    Browse the repository at this point in the history
  42. add account setting for requiring terms of use

    fixes CNVS-22604
    
    test plan:
     - create a new user and see they are required to accept terms.
     - in a rails console, change the `account_terms_required`
     setting for the account:
        account = Account.find(<the account id here>)
        account.settings[:account_terms_required] = false
        account.save!
     - create a new user and make sure they now don't have to accept terms.
    
    Change-Id: I8a616aa314bb6c7a82bd0ae93f965c3a1c85ff36
    Reviewed-on: https://gerrit.instructure.com/61333
    Tested-by: Jenkins
    Reviewed-by: James Williams  <jamesw@instructure.com>
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: Jon Willesen <jonw@instructure.com>
    Jon Willesen authored and ccutrer committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    3614a52 View commit details
    Browse the repository at this point in the history
  43. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: 3614a52
    ccutrer committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    fe48980 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2015

  1. Updated ar translation

    Change-Id: I18e51101a103ee6e5dde33c7722d07772afbbfc1
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    1f09f25 View commit details
    Browse the repository at this point in the history
  2. Updated de translation

    Change-Id: I7b88a91a5f0b0791f09ee94405beb0a0b8b640bd
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    3f30e95 View commit details
    Browse the repository at this point in the history
  3. Updated en-AU translation

    Change-Id: Ie2b17f0b7ec7356c85c8a342bae0771e5ad5be4e
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    f7e1e46 View commit details
    Browse the repository at this point in the history
  4. Updated en-GB translation

    Change-Id: I787b618f8b6227ed948e094094b952ac4ecfd14e
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    5bf1caa View commit details
    Browse the repository at this point in the history
  5. Updated es translation

    Change-Id: I51a573c68e3535f98121a01f851d396493d34f0f
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    2c047b7 View commit details
    Browse the repository at this point in the history
  6. Updated fr translation

    Change-Id: I4dd5b72300d01d85a5f8c3e9c851b8c3557d1fb7
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    0a8a23c View commit details
    Browse the repository at this point in the history
  7. Updated hy translation

    Change-Id: I8fc7513b5556463e2a9938b6c00dbcf4501e909b
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    1893d66 View commit details
    Browse the repository at this point in the history
  8. Updated ja translation

    Change-Id: I4418122767ff82b457857834833141434a73cd66
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    2c2d892 View commit details
    Browse the repository at this point in the history
  9. Updated nl translation

    Change-Id: I476e17b355b3294d124f3bfbf5687cde84d4c712
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    ed3378d View commit details
    Browse the repository at this point in the history
  10. Updated pl translation

    Change-Id: I89f0b819f5fa7853a13aabacce77b87daf814b5f
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    f5092c1 View commit details
    Browse the repository at this point in the history
  11. Updated pt translation

    Change-Id: I1c5c638b1a1ff5228bada86e24c5db174226fc62
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    c7308d6 View commit details
    Browse the repository at this point in the history
  12. Updated pt-BR translation

    Change-Id: I78ef87956ede1ef499445fc0a784cb5a6531ecf9
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    7a508c9 View commit details
    Browse the repository at this point in the history
  13. Updated ru translation

    Change-Id: Iae22d549a7d6b81279bdbd8e0cf78a3dcdfc5cfd
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    b9d4b13 View commit details
    Browse the repository at this point in the history
  14. Updated tr translation

    Change-Id: Ib5bb102a355e64a7d3d4ebb273e38221d56cde32
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    51f591a View commit details
    Browse the repository at this point in the history
  15. Updated zh translation

    Change-Id: Id5350d4d65750f9fb29834ff3525dfd6576b03f5
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    d02db31 View commit details
    Browse the repository at this point in the history
  16. Updated zh_Hant translation

    Change-Id: I7b3bc9339eb5286ed8b8d5b9165c39cd4c74984f
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    7dfa001 View commit details
    Browse the repository at this point in the history
  17. Updated pl translation

    Change-Id: I41d08fa7caf763eb51c0178af9bbc3ef9180fb60
    Transifreq authored and roor0 committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    65b7ac1 View commit details
    Browse the repository at this point in the history
  18. catch URI::Error instead of URI::InvalidURIError

    test plan:
    * using "mailto:example@example.com," in a link should
     not break course copies (or anything else) because it
     doesn't know how to rescue a URI::InvalidComponentError
    
    closes #CNVS-22120
    
    Change-Id: Iaac362a5bf33cd5fde05b01a578a1325f4126c6e
    Reviewed-on: https://gerrit.instructure.com/59213
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Clare Strong <clare@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    maneframe committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    9a788d6 View commit details
    Browse the repository at this point in the history
  19. don't leave unresolved link placeholders on migration failure

    closes #CNVS-22242
    
    Change-Id: Ie3fc503ae2439ffc63f90ba35dabc07ef4716d1f
    Reviewed-on: https://gerrit.instructure.com/59815
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
    maneframe committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    d0a254f View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2015

  1. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: 65b7ac1
    roor0 committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    5445f01 View commit details
    Browse the repository at this point in the history
  2. move new teacher form to marketing site

    fixes CNVS-22581
    
    test plan
     - setup open registration
     - in console set root_account setting
     - a = Account.root_accounts.active.find(id)
     - a.settings[:fft_registration_url] = "http://www.canvaslms.com/try-canvas?lead_source_description=canvas.instructure.com_fft_canvas_"
     - a.save!
     - click on "I'm a teacher" YOUR_CANVAS/register_from_website
     - it should redirect to canvaslms try canvas link
     - remove setting
     - it should bring up form to register locally
    
    Change-Id: I14f6daacffceda4dd25b4829558f9f9472618104
    Reviewed-on: https://gerrit.instructure.com/61446
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    Tested-by: Jenkins
    roor0 committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    edb5242 View commit details
    Browse the repository at this point in the history
  3. add skip_registration param to create user action

    fixes CNVS-22173
    
    test plan:
      - if local, run 'rake db:load_notifications'
      - create a new user via the API
        - with user[skip_registration] true
          & communication_channel[skip_confirmation] true
          & communication_channel info
          - masquerade as the user and go to
            /profile/settings
          - there IS NOT a message telling you that
            you must verify your email address
    
        - with user[skip_registration] true
          & pseudonym[send_confirmation] true
          & communication_channel info
          - the user gets an email telling them
          they have been registered
          - there IS NOT a message telling you that
            you must verify your email address
    
        - with user[skip_registration] false
          & communication_channel[skip_confirmation] true
          & communication_channel info
          - masquerade as the user and go to
            /profile/settings
          - there IS a message telling you that
            you must verify your email address
    
      - create a new user via the API, but associate
        this user with an already made pseudonym
        (use enable_sis_reactivation and sis_user_id
        to do so)
        and set pseudonym[send_confirmation] to true
        - they DO get an email saying that they have
          been registered
    
    Change-Id: I60d0fe013cef1648abd838fd53d9992facf0e106
    Reviewed-on: https://gerrit.instructure.com/59726
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Jacob Fugal <jacob@instructure.com>
    Michael Nomitch authored and roor0 committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    69a4320 View commit details
    Browse the repository at this point in the history
  4. Updated nb translation

    Change-Id: I4900e1f982b4e5b98f45898fd1e3e114dea0b858
    Transifreq authored and roor0 committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    8f1bc80 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. New UI: show the "courses" menu item all the time

    closes: CNVS-22368
    
    When a student only has enrollments in unpublished
    courses, they do not see a courses global nav link.
    The link is needed to get to "all courses" and see
    their enrollments.
    
    this changes things so the "courses" menu is always
    shown. that way those users will be able to get
    to that "all courses" link
    
    Product / UX/UI review question:
    This is just one possible way of fixing this problem.
    the other thing we could do is to leave it how it was
    but do a second, more expensive DB query to see if
    there are any of those unpublished or archived courses that
    I can see on the /courses page but not in the course
    menu. in standup, we agreed to do it like this but
    if any of you feel strongly that we should do it
    the other way, that's fine too.
    
    test plan:
    Add a new user
    Enroll them in an unpublished course
    Masquerade as the new user,
    click the courses global nav option
    you should see the "all courses" link in the tray popup
    
    Change-Id: I140dbc4f4d2852c386cc57cac3f2afec6ef62979
    Reviewed-on: https://gerrit.instructure.com/60233
    Tested-by: Jenkins
    Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
    QA-Review: Jeremy Putnam <jeremyp@instructure.com>
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Ryan Shaw <ryan@instructure.com>
    Ryan Shaw authored and roor0 committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    9f2c081 View commit details
    Browse the repository at this point in the history
  2. don't load every student in course for enrollment permissions

    closes #CNVS-22718
    
    Change-Id: Ibccf62c76230ca665a043eb423fe88c7b8be5b00
    Reviewed-on: https://gerrit.instructure.com/61745
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Reviewed-by: Brian Palmer <brianp@instructure.com>
    Tested-by: Jenkins
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
    maneframe authored and roor0 committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    496b9cc View commit details
    Browse the repository at this point in the history
  3. don't include account CSS on "Updated Terms" page

    fixes CNVS-22527
    
    test-plan:
     - when "Updated Terms of Use" page displays, should not include any
       custom account CSS
    
    Change-Id: I98bcc48e1bf4f281ee34db8ee50ed204defc437d
    Reviewed-on: https://gerrit.instructure.com/61659
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Colleen Palmer <colleen@instructure.com>
    Reviewed-by: Ryan Shaw <ryan@instructure.com>
    Tested-by: Jenkins
    QA-Review: August Thornton <august@instructure.com>
    lukfugl authored and roor0 committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    9462bf3 View commit details
    Browse the repository at this point in the history
  4. don't lock people out after failed_login_attempts

    we already have logic in Canvas::Security to
    protect us against brute force, and AuthLogic
    is just checking the updated_at to see if they can
    attempt to login again if failed_login attempts is
    over 50
    
    fixes CNVS-22681
    
    test plan
     - update a pseudonyms failed_login_count to > 50
     - p = Pseudonym.last
     - p.failed_login_count = 54
     - p.save!
     - attempt to login
     - it should work
    
    Change-Id: I72ebf54306c4fe6bd46d172d31b8f732555107a7
    Reviewed-on: https://gerrit.instructure.com/61595
    Tested-by: Jenkins
    Reviewed-by: Cody Cutrer <cody@instructure.com>
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    roor0 committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    44ef2d5 View commit details
    Browse the repository at this point in the history
  5. Handles section end_at extensions in Quizzes

    Closes CNVS-21521
    
    Test Plan:
      - Regression test that due_dates, closing "end_at" dates and all
        things quiz time limits/moderation are all good.
        - Good luck!
    
    Change-Id: Id5ad6c0028e06e67caea28fce514190730a02e44
    Reviewed-on: https://gerrit.instructure.com/59020
    Tested-by: Jenkins
    Reviewed-by: Cameron Sutter <csutter@instructure.com>
    Product-Review: Pedro Fajardo <pfajardo@instructure.com>
    QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
    ryanmt authored and roor0 committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    5261651 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2015

  1. Updated nb translation

    Change-Id: I010880cce15d3d241b5849ed40a6895aeebe3190
    Transifreq authored and mcwqy9 committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    3a552f3 View commit details
    Browse the repository at this point in the history
  2. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: 3a552f3
    mcwqy9 committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    5619fb0 View commit details
    Browse the repository at this point in the history
  3. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: d0a254f
    roor0 committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    e8f15f7 View commit details
    Browse the repository at this point in the history
  4. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: 3a552f3
    roor0 committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    40f90cf View commit details
    Browse the repository at this point in the history
  5. Bring back elementpath for tinyMCE, but hide in UI

    Kenneth tools relies on this path being on the page in order for their stuff
    to work. This brings back the html elementpath below tinymce, but hides it
    using css from the UI so it isn't visible.
    
    closes: CNVS-22759
    
    Test Plan:
    - Open up a view that had TinyMCE
    - You should not see any html elementpath below the editor
    
    Example with path: http://cl.ly/image/1O3u3J3j361w
    Example without path: http://cl.ly/image/050n0Q1B1P2g
    
    Change-Id: I93e7fa65c1d05a105c7e80e7b65ba4e4176fec4e
    Reviewed-on: https://gerrit.instructure.com/61956
    Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Stephen Jensen <sejensen@instructure.com>
    Reviewed-by: Ryan Shaw <ryan@instructure.com>
    Tested-by: Jenkins
    Colleen Palmer authored and mcwqy9 committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    496ec72 View commit details
    Browse the repository at this point in the history
  6. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: 496ec72
    mcwqy9 committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    9cdc062 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. treesame commit of origin/stable/2015-08-08

    Treesame-Commit-Id: d0a254f
    roor0 committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    b8b3559 View commit details
    Browse the repository at this point in the history
  2. Updated pt-BR translation

    Change-Id: I78b3422a91c6cce7f30b42b389bbb5e99af7f002
    Transifreq authored and roor0 committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    a46b327 View commit details
    Browse the repository at this point in the history
  3. rails 4: only load pg types we care about

    in massively sharded databases where there's a type for every table,
    this reduces the number of rows queried and unused... massively
    
    Change-Id: Ib9bcf70d060f5ba48ebedaa7108d9d364430c638
    Reviewed-on: https://gerrit.instructure.com/61975
    Tested-by: Jenkins
    Reviewed-by: Brian Palmer <brianp@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
    ccutrer authored and roor0 committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    a84443d View commit details
    Browse the repository at this point in the history
  4. Takes out CSS for hiding html in TinyMCE

    closes: CNVS-22806
    
    Test Plan:
    - Go to tinymce editor
    - Make sure html path shows below editor
    
    Change-Id: Ieafda7d14abe097c3c233cf397b4d844cc63fea0
    Reviewed-on: https://gerrit.instructure.com/62012
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: August Thornton <august@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    Colleen Palmer authored and roor0 committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    6db2bc8 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2015

  1. don't blow up if there are no assignments

    Change-Id: I8ee23b0ddac2e56b21aaa87e0e0033a7eda5ade7
    Reviewed-on: https://gerrit.instructure.com/62087
    Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    roor0 committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    ab4fd08 View commit details
    Browse the repository at this point in the history
  2. don't blow up if there are no assignments again

    Change-Id: I0d4b2fc27daa7138719699153ee29cc2ee23f4fe
    Reviewed-on: https://gerrit.instructure.com/62088
    Reviewed-by: Jacob Fugal <jacob@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    roor0 committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    75cfb9b View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2015

  1. Fixes quiz taking button state on no remaining attempts

    Rectifies a regression in the the recent refactoring of quiz
    eligibility.
    
    Closes CNVS-22755
    
    Test Plan:
      - Create a quiz with 2 allowed attempts
      - Take it twice and see no "Take the Quiz Again" button on completion.
    
    Change-Id: Ifc4f503746f64b0083365bd394e71e8c6e0d97e8
    Reviewed-on: https://gerrit.instructure.com/61951
    Tested-by: Jenkins
    Reviewed-by: Matt Berns <mberns@instructure.com>
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    QA-Review: Adam Stone <astone@instructure.com>
    Product-Review: Simon Williams <simon@instructure.com>
    ryanmt authored and roor0 committed Aug 30, 2015
    Configuration menu
    Copy the full SHA
    7dd4faa View commit details
    Browse the repository at this point in the history
  2. don't check for submissions when there is no assignment

    fixes CNVS-22834
    
    Change-Id: I64c4ec47343ad34852691cb94271e98f5d1d65f8
    Reviewed-on: https://gerrit.instructure.com/62091
    Reviewed-by: Simon Williams <simon@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    roor0 committed Aug 30, 2015
    Configuration menu
    Copy the full SHA
    4f85020 View commit details
    Browse the repository at this point in the history
  3. only render quiz restriction checks when trying to take the quiz

    fixes CNVS-22655
    fixes CNVS-22833
    
    the can_take_quiz? method renders an access_code restriction template or
    an ip restriction template if those things are required for the quiz.
    previously, those were presented when trying to take the quiz, but
    a recent change made it so that they were presented when simply trying
    to view the quiz.  this reverts to the previous behavior.
    
    test plan:
    - as a teacher, create an access code or ip restricted quiz, publish it
    - as a student, you should be able to view the quiz without being
      prompted for an access code (or from an invalid ip)
    - as a student, when trying to take the quiz, the restrictions should
      apply correctly
    - as a student who meets the restrictions, you should be able to take
      the quiz
    
    Change-Id: Iedc78c3728501da56710e00857527a7323633eeb
    Reviewed-on: https://gerrit.instructure.com/62089
    Reviewed-by: Rob Orton <rob@instructure.com>
    QA-Review: Adam Stone <astone@instructure.com>
    QA-Review: Pedro Fajardo <pfajardo@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    simonista authored and roor0 committed Aug 30, 2015
    Configuration menu
    Copy the full SHA
    caf5d63 View commit details
    Browse the repository at this point in the history
  4. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: caf5d63
    roor0 committed Aug 30, 2015
    Configuration menu
    Copy the full SHA
    d6c675a View commit details
    Browse the repository at this point in the history
  5. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: caf5d63
    roor0 committed Aug 30, 2015
    Configuration menu
    Copy the full SHA
    869e0da View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2015

  1. set respondus lockdown browser high security only when taking quiz

    test plan:
    * using the respondus lockdown browser, should be able to log out
    after submitting a quiz requiring the lockdown browser
    
    closes #CNVS-22838
    
    Change-Id: If7b28977fe9ed51444fca145b841cc15ca71eb49
    Reviewed-on: https://gerrit.instructure.com/62099
    Reviewed-by: Rob Orton <rob@instructure.com>
    Product-Review: Rob Orton <rob@instructure.com>
    QA-Review: Rob Orton <rob@instructure.com>
    Tested-by: Rob Orton <rob@instructure.com>
    maneframe authored and roor0 committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    02e1155 View commit details
    Browse the repository at this point in the history
  2. Updated tr translation

    Change-Id: Iaaecbd8562d265af8e9d6a54c9b3b9af4cebc6f7
    Transifreq authored and roor0 committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    0222b7e View commit details
    Browse the repository at this point in the history
  3. pass user to gradebook.csv background job

    fixes CNVS-22607
    
    Test plan:
      * set up a section limited TA
      * download gradebook csv
      * ensure you can only see students in your section
    
    Change-Id: I20c67d832f7cb234f7527d53747770c0092e9a0d
    Reviewed-on: https://gerrit.instructure.com/61886
    Reviewed-by: Dylan Ross <dross@instructure.com>
    QA-Review: Derek Hansen <dhansen@instructure.com>
    Tested-by: Jenkins
    Product-Review: Cameron Matheson <cameron@instructure.com>
    cmatheson authored and roor0 committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    f9fa071 View commit details
    Browse the repository at this point in the history
  4. Fixes issue where some students couldn't be removed from courses

    fixes CNVS-22845
    
    Test Plan:
    * Create a user with a sis id, create another user without a sis id
    * Add both users to a course with any role
    * Once added select the gear icon for both students
    * They should both have the option to "Remove From Course"
    
    Change-Id: Ia7c663ae02a1c91334e6d00614faa31c94f1ab40
    Reviewed-on: https://gerrit.instructure.com/62151
    Tested-by: Jenkins
    Reviewed-by: James Williams  <jamesw@instructure.com>
    QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
    Product-Review: Dan Minkevitch <dan@instructure.com>
    Dan Minkevitch authored and roor0 committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    c856b5f View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. treesame commit of origin/stable/2015-08-29

    Treesame-Commit-Id: c856b5f
    roor0 committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    0af2faf View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. fix: client_apps/canvas_quizzes/package.json to reduce vulnerabilities

    The following vulnerabilities are fixed with an upgrade:
    - https://snyk.io/vuln/SNYK-JS-MINIMIST-559764
    snyk-bot committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    57f796c View commit details
    Browse the repository at this point in the history