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.

Sign up for GitHub

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

Jump to bottom

Release Candidate rc/2016-02-23 #11606

Merged
merged 105 commits into from
Feb 24, 2016
Merged

Release Candidate rc/2016-02-23 #11606

merged 105 commits into from
Feb 24, 2016

Commits on Jan 28, 2016

  1. Remove default django template loaders. 

    Mako filesystem/app_directories loaders already wrap default django template loaders.

Mako loaders delegate the `load_template_source` method to the base loader that
they wrap, so there's no reason to explicitly include the two django loaders in the settings.
    @mtyaka
    mtyaka committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    434f196 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2016

  1. Switch to SharedModuleStoreTestCase in the 'courseware' app where pos… 

    …sible.
    Toby Lawrence committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    ad9498e View commit details
    Browse the repository at this point in the history

  2. Fix some broken tests.

    Toby Lawrence committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    6a6ef0f View commit details
    Browse the repository at this point in the history

  3. Switch to SharedModuleStoreTestCase in the 'student' app where possible.

    Toby Lawrence committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    e2ed8ff View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. Pass DOM element, not jQuery object to XBlock initialisation. 

    The function initializeXBlock() expects a DOM element, and is passed one in most
cases.  However, when adding a new XBlock component in Studio, the function is
passed a jQuery object, which ends up being forwarded to the actual
initialisation function of the XBlock.
    @smarnach
    smarnach committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    982c3e6 View commit details
    Browse the repository at this point in the history

  2. Update help text for Pages page in Studio to reflect Courseware-Cours… 

    …e etc change
    @srpearce
    srpearce committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    97228f3 View commit details
    Browse the repository at this point in the history

  3. TE-1194 update for test_teams. 

    This can also serve as an example of the kind of changes we want to make.
    Ben Patterson committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    edc9227 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2016

  1. Fix self-paced course displaying "published, not yet released" issue … 

    …in Studio ECOM-3615
    Mushtaq Ali committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    f9c3759 View commit details
    Browse the repository at this point in the history

  2. Quality fixes.

    Toby Lawrence committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    4611829 View commit details
    Browse the repository at this point in the history

  3. add analytics event to thread/comment vote

    @wajeeha-khalid
    wajeeha-khalid committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    fe9b1a0 View commit details
    Browse the repository at this point in the history

  4. refactored code into exclusive functions

    @wajeeha-khalid
    wajeeha-khalid committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    3312eb2 View commit details
    Browse the repository at this point in the history

  5. implemented test event data for thread/comment vote

    @wajeeha-khalid
    wajeeha-khalid committed Feb 11, 2016
    1 Configuration menu
    Copy the full SHA
    72aeb2c View commit details
    Browse the repository at this point in the history

  6. MA-1882 adding course api to regex

    Sanford Student authored and Sanford Student committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    b92c12c View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Close unclosed p tag

    Renzo Lucioni committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    60a3029 View commit details
    Browse the repository at this point in the history

  2. copy event on write

    @mulby
    mulby committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    239c382 View commit details
    Browse the repository at this point in the history

  3. Improve is_self_paced method

    Mushtaq Ali committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    df0b983 View commit details
    Browse the repository at this point in the history

  4. MA-1882 adding tests and reworking regex to exclude blocks routes

    Sanford Student authored and Sanford Student committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    52d8cb0 View commit details
    Browse the repository at this point in the history

  5. Add Randomize XBlock to DEPRECATED_BLOCK_TYPES.

    @symbolist
    symbolist committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    ec6a786 View commit details
    Browse the repository at this point in the history

  6. Use Course ID in logging an exception 

    TNL-4115
    @awaisdar001
    awaisdar001 committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    5be6d31 View commit details
    Browse the repository at this point in the history

  7. Copy this doc up from the bok_choy tests. 

    It's just as relevant to unit tests and I wish I had seen it earlier.

Stress the transient nature of this debugging step.
    @jibsheet
    jibsheet committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    21b75f8 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #11531 from edx/usman/deprecate-randomize 

    Add Randomize XBlock to DEPRECATED_BLOCK_TYPES.
    @symbolist
    symbolist committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    1a66726 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #11450 from edx/jia/MA-1985 

    MA-1985 add analytics event to thread/comment vote
    @wajeeha-khalid
    wajeeha-khalid committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    7a9fea0 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #11519 from edx/jibsheet/document-nose-breakpoints… 

    …-twice

Copy this doc up from the bok_choy tests.
    @jibsheet
    jibsheet committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    4037b16 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #11527 from edx/renzo/unclosed-p-tag 

    Close unclosed p tag
    Renzo Lucioni committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    4c79aba View commit details
    Browse the repository at this point in the history

  12. Add monitoring version of package.json

    @andy-armstrong
    andy-armstrong committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    7a6495c View commit details
    Browse the repository at this point in the history

  13. Disable credentials-related settings/tests under cms.

    jsa committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    8a62064 View commit details
    Browse the repository at this point in the history

  14. specify routing / queue for program credentials task. 

    ECOM-3638
    jsa committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    46ad8a3 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #11528 from edx/andya/add-js-monitoring-package 

    Add monitoring version of package.json
    @andy-armstrong
    andy-armstrong committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    b46648e View commit details
    Browse the repository at this point in the history

  16. Install underscore from npm. 

    FEDX-47
    cahrens committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    c692268 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #11510 from edx/benp/TE-1194-example 

    TE-1194 update for test_teams.
    Ben Patterson committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    526e174 View commit details
    Browse the repository at this point in the history

  18. Add accidentally deleted lettuce DB cache.

    Peter Fogg committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    b6ca05d View commit details
    Browse the repository at this point in the history

  19. Merge pull request #11520 from edx/jsa/ecom-3638 

    Specify high priority queue for credentials generation task.
    Jim Abramson committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    fb3a09e View commit details
    Browse the repository at this point in the history

  20. Merge pull request #11522 from edx/gabe/remove-ga-fields 

    copy event on write
    @mulby
    mulby committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    fcfb0f4 View commit details
    Browse the repository at this point in the history

  21. adjust comment about program certification retry

    Jim Abramson committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    f71e7ca View commit details
    Browse the repository at this point in the history

  22. Merge pull request #11539 from edx/jsa/fix-retry-comment 

    adjust comment about program certification retry
    Jim Abramson committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    a052a30 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #11534 from edx/christina/jquery-npm 

    Install underscore from npm.
    Christina Roberts committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    36fc616 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #11535 from edx/peter-fogg/add-lettuce-cache 

    Add accidentally deleted lettuce DB cache.
    Peter Fogg committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    5e9577b View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2016

  1. correct FAVICON_PATH setting for comprehensive theming

    @saleem-latif
    saleem-latif committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    75f17ec View commit details
    Browse the repository at this point in the history

  2. Refactor test to check support for both modulestore and is_self_paced… 

    … method improvement
    Mushtaq Ali committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    3559bd1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #11433 from open-craft/smarnach/studio-add-xblock 

    Pass DOM element, not jQuery object to XBlock initialisation.
    @smarnach
    smarnach committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    8280e22 View commit details
    Browse the repository at this point in the history

  4. Add Drag-and-drop XBlock to requirements.

    @Kelketek
    Kelketek committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    97593f1 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2016

  1. Quality fixes.

    Toby Lawrence committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    ead2f04 View commit details
    Browse the repository at this point in the history

  2. fixed get_template_path to work with absolute path also 

    fixed quality violation

skipped test in CMS

changes after feedback from mattd
    @ziafazal
    ziafazal committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    6cd2657 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #11494 from edx/saleem-latif/WL-307 

    WL-307: correct FAVICON_PATH setting for comprehensive theming
    @saleem-latif
    saleem-latif committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    cd101d5 View commit details
    Browse the repository at this point in the history

  4. More quality fixes.

    Toby Lawrence committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    49d3a7d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11548 from edx/ziafazal/fix-get-template-path 

    WL-320: fixed get_template_path to work with absolute path also
    @ziafazal
    ziafazal committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    57af11c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #11495 from edx/aj/tnl4115-improve-log-get-course-… 

    …section

Use Course ID in logging an exception
    @awaisdar001
    awaisdar001 committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    31853d4 View commit details
    Browse the repository at this point in the history

  7. Render LMS main navigation (tabs) with template, override templates f… 

    …or a specific list item
    @dmitry-viskov
    dmitry-viskov committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    d532f8d View commit details
    Browse the repository at this point in the history

  8. Switch to SharedModuleStoreTestCase in the 'contentstore' app where p… 

    …ossible.
    Toby Lawrence committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    e2cbb54 View commit details
    Browse the repository at this point in the history

  9. ECOM-3640 add a new info log message on program certificate task to m… 

    …ark successful task completion
    @schenedx
    schenedx committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    2f595c1 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #11465 from edx/perf/speed-up-courseware-tests 

    Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
    @tobz
    tobz committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    9654449 View commit details
    Browse the repository at this point in the history

  11. Quality fixes.

    Toby Lawrence committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    fe545e0 View commit details
    Browse the repository at this point in the history

  12. Fix a mistake with initializing something in the test setup.

    Toby Lawrence committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    0d040bc View commit details
    Browse the repository at this point in the history

  13. ECOM-3177 fix the flaky js test by doing dependency injection

    @schenedx
    schenedx committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    f6fc711 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #11553 from edx/schen/ECOM-3640 

    ECOM-3640 add a new info log message on program certificate task to mark successful task completion
    @schenedx
    schenedx committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    4b8a737 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #11508 from edx/sylvia/DOC-2692 

    Update help text for Pages page in Studio to reflect Courseware-Course etc change
    @srpearce
    srpearce committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    b68beea View commit details
    Browse the repository at this point in the history

  16. Remove duplicate test setup.

    Toby Lawrence committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    af102a6 View commit details
    Browse the repository at this point in the history

  17. Update screenshot for Help modal on Pages page

    @srpearce
    srpearce committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    a858bb9 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #11364 from edx/kelketek/drag-and-drop 

    Add Drag-and-drop XBlock to requirements.
    @Kelketek
    Kelketek committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    ddd7b61 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #11416 from edx/schen/ECOM-3177 

    ECOM-3177 fix flaky js tests on dashboard.TrackEvents
    @schenedx
    schenedx committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    3fa62a6 View commit details
    Browse the repository at this point in the history

  20. Make base.html Mako template safe by default 

    Make base.html Mako template safe by default by:
1. Add page-level default of html escaping
2. Fix escaping of all variables in base.html
3. Fix escaping of all dependent underscore templates
Also includes additional best practices for certificates and
textbooks JavaScript/Underscore in order to complete that work.

TNL-3425
    @robrap
    robrap committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    b69c6d6 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #11557 from edx/sylvia/DOC-2692-2 

    Update screenshot for Help modal on Pages page
    @srpearce
    srpearce committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    b9ccff7 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #11552 from edx/perf/speed-up-contentstore-tests 

    Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible.
    @tobz
    tobz committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    d3c88d7 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #11059 from edx/robrap/TNL-3425 

    Properly escape Studio base.html
    @robrap
    robrap committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    6cc8bbf View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. Code refactor pass store_type in course create method

    Mushtaq Ali committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    d3fc262 View commit details
    Browse the repository at this point in the history

  2. Bypass unnecessary logs on loging out

    @Qubad786
    Qubad786 committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    faf3a64 View commit details
    Browse the repository at this point in the history

  3. Added staff role on ccx to staff of master course and added a data mi… 

    …gration for existing ccx courses.
    @amir-qayyum-khan
    amir-qayyum-khan committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    91bf48f View commit details
    Browse the repository at this point in the history

  4. make is_course_self_paced default to False

    Mushtaq Ali committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    5485d0c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout 

    Fix - Bypass unnecessary logs on logging out.
    @Qubad786
    Qubad786 committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    af9e26f View commit details
    Browse the repository at this point in the history

  6. LMS: fixing skip links and adding a11y tests

    Chris Rodriguez committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    2a4e141 View commit details
    Browse the repository at this point in the history

  7. set show_full_result_count false 

    ECOM-2831
    Ahsan Ulhaq committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    88df456 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #11452 from edx/mushtaq/ECOM-3615-fix-self-paced-s… 

    …cheduled-content

Fix self paced course content visiblity
    Mushtaq Ali committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    b94204a View commit details
    Browse the repository at this point in the history

  9. Merge pull request #9909 from edx/clrux/ac-179 

    AC-179 fixing skip links
    clrux committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    21aa7ed View commit details
    Browse the repository at this point in the history

  10. making check more generic

    Sanford Student authored and Sanford Student committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    45f8e52 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #11560 from edx/ahsan/ECOM-2831-GeneratedCertifica… 

    …tes-admin-broken

set show_full_result_count false
    Ahsan Ulhaq committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    d90c1a2 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #11526 from edx/sstudent/MA-1882-update-api-regex 

    MA-1882 adding course api to regex
    sanfordstudent committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    e4b59c3 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #11467 from edx/perf/speed-up-student-tests 

    Switch to SharedModuleStoreTestCase in the 'student' app where possible.
    @tobz
    tobz committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    80c68e4 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #11564 from edx/release 

    Release Feb 17, 2016
    @nasthagiri
    nasthagiri committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    eb914a0 View commit details
    Browse the repository at this point in the history

  15. Otto checkout flow

    @vkaracic
    vkaracic committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    86a4710 View commit details
    Browse the repository at this point in the history

  16. Add API endpoint for issuing programs certificates 

    Allows staff users to manually enqueue the task responsible for awarding programs certificates. ECOM-3692.
    Renzo Lucioni committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    619420b View commit details
    Browse the repository at this point in the history

  17. Merge pull request #11503 from edx/coupons/otto-checkout 

    Checkout on Otto
    @vkaracic
    vkaracic committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    2312b22 View commit details
    Browse the repository at this point in the history

  18. Added a UI for confirming OAuth Access. 

    This will allow users to delegate permissions to a 3rd party service.
    @justinabrahms
    justinabrahms committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    885785d View commit details
    Browse the repository at this point in the history

  19. Merge pull request #11464 from mitocw/oauth-confirmation-views 

    Added a UI for confirming OAuth Access.
    @clintonb
    clintonb committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    922269f View commit details
    Browse the repository at this point in the history

  20. Merge pull request #11541 from edx/renzo/manual-cert-trigger 

    Add API endpoint for issuing programs certificates
    Renzo Lucioni committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    62d07c9 View commit details
    Browse the repository at this point in the history

  21. Update translations (autogenerated message)

    Ned Batchelder committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    6c3ae82 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #11572 from edx/ned/update-translations 

    Update translations (autogenerated message)
    @nedbat
    nedbat committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    080b7d7 View commit details
    Browse the repository at this point in the history

  23. removes alt attribute value

    @cptvitamin
    cptvitamin committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    1a5fa4b View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. Merge pull request #11076 from CredoReference/render-lms-main-navigat… 

    …ion-with-template

Render lms main navigation (tabs) with template
    @ziafazal
    ziafazal committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    e8ccc2f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10877 from mitocw/enhancement/aq/add_master_cours… 

    …e_staff_in_ccx

Added staff and instructor roles on ccx to all the staff and instructors of the master course plus fixed view as student masquerade and display name of ccx on coach dashboard
    @pdpinch
    pdpinch committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    dcb04cb View commit details
    Browse the repository at this point in the history

  3. Studio homepage escaping

    Mushtaq Ali committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    7a9991e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11551 from edx/mushtaq/fix-tnl4006 

    Studio homepage escaping
    Mushtaq Ali committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    689bb73 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11576 from edx/cptvitamin/AC-332 

    removes unnecessary alt attribute value (empty value is more appropriate)
    Mark Sadecki committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    94d5b5d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #11316 from open-craft/remove-django-template-loaders 

    Remove default django template loaders.
    @mtyaka
    mtyaka committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    f4e462c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #11584 from edx/release 

    Merging release back to master
    @mjfrey
    mjfrey committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    5903ef8 View commit details
    Browse the repository at this point in the history

  8. Inform openassessment to clear submission 

    The openassessment xblock stores some information that assumes
a given student module is never cleared, it needs to be informed of
this operation.
    Eric Fischer committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    920cc3d View commit details
    Browse the repository at this point in the history

  9. Merge pull request #11422 from edx/efischer/reset_state_fix 

    Reset state fix
    Eric Fischer committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    09d0f43 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #11587 from edx/release 

    Release
    @adampalay
    adampalay committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    4dbcf9a View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2016

  1. Upgraded edx-proctoring to 0.12.10

    Douglas Hall committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    4a246dd View commit details
    Browse the repository at this point in the history

  2. Using display_name_with_default instead of display_name. 

    TNL-4103
    muzaffaryousaf committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    5095224 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #11550 from edx/muzaffar/tnl4013 

    Using display_name_with_default  instead of display_name.
    @symbolist
    symbolist committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    4be5aeb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11594 from edx/douglashall/edx_proctoring_0_12_10 

    Upgraded edx-proctoring to 0.12.10
    Douglas Hall committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    8f7c158 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2016

  1. Revert "Added staff role on ccx to staff of master course and added a… 

    … data migration for existing ccx courses."

This reverts commit 91bf48f.
    @mikekatz
    mikekatz committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    bf5d203 View commit details
    Browse the repository at this point in the history

  2. Revert "Inform openassessment to clear submission" 

    This reverts commit 920cc3d.
    Eric Fischer committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    73fa319 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2016

  1. keep version bumps

    Eric Fischer committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    5e38030 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11625 from edx/efischer/revert_ora_release 

    Revert "Inform openassessment to clear submission"
    Eric Fischer committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    67b128d View commit details
    Browse the repository at this point in the history