Commit Graph

7389 Commits

Author SHA1 Message Date
Adam
460b3311b2 Merge pull request #9273 from edx/adam/add-lti-logging
add more lti logging around oauth (TNL-2980)
2015-08-14 08:53:21 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration
Integration of Proctoring into the LMS
2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Andy Armstrong
01065b6ae5 Merge pull request #9217 from edx/andya/land-teams
Enable teams and deprecate the advanced setting
2015-08-13 17:47:15 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release
Release
2015-08-12 13:06:39 -04:00
Adam Palay
c486eadd87 add more lti logging around oauth (TNL-2980) 2015-08-12 10:10:29 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import"
This reverts commit 4c1c4619f0.
2015-08-12 02:06:09 +05:00
Chris Rodriguez
f958272149 Updating video bumper play button 2015-08-11 12:51:18 -04:00
Colin-Fredericks
c940814c8c OSPR-535 Partial Credit
Squashed commit of the following:

commit 0f7c2af5f7b8caed575dd253a45299293b2729d7
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 12:04:43 2015 -0400

    Forgot icon

commit b48970392741130f774709c54eb6e5ab0089812c
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 11:49:57 2015 -0400

    OSPR-535 Partial Credit

    Squashed commit of the following:

    commit 6dd34f58f994e32d0d54bf1d67bffd04e0f8ef08
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:44:01 2015 -0400

        Fixing accidental overwrite.

    commit 1ff8fc4b0e83b90356e8e8dce1022f49bfd162cf
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:18:36 2015 -0400

        OSPR-535 Partial Credit

        Revised after first pull discussion.

Fixing scss typos

Fixing check/x display problem

Empty set is not []

Shuffling empty answer code to grade properly.

I don't think I ever wrote this in the first place...

Adding tests for MC and Checkbox

including proper partial-credit marking and scoring

Numerical and OptionResponse tests

Also a few improvements to NumericalResponse problem type and
exception-raising.

CustomResponse tests and more numerical tests

Increasing coverage and fixing typos

Exception added for pylint false positive

Hopefully fixing coverage issue

Retabulating line continuation

Bok Choy test for partial credit

Copypasta fix

Adding tooltip for partial credit

Improving and expanding comments

Minor fixes
2015-08-10 10:58:50 -04:00
Christina Roberts
4e9b7ea9ec Merge pull request #9235 from edx/christina/tnl-1776
Handle case of video in a content library with no transcripts.
2015-08-10 10:08:52 -04:00
Davorin Šego
7da0864997 Merge pull request #9110 from edx/dsego/SOL-611
Remove signal_handler conditionals in BulkOperationMixin
2015-08-10 15:50:07 +02:00
cahrens
2b57603436 Handle case of video in a content library with no transcripts.
This partially addresses TNL-1776
2015-08-07 13:19:12 -04:00
Andy Armstrong
e845dda8b0 Enable teams and deprecate the advanced setting 2015-08-07 10:35:19 -04:00
Awais Jibran
7bf81195ad Strip aways slashes from the asset 'displayname' as they cause export to fail.
TNL-2669
2015-08-07 18:10:26 +05:00
Davorin Sego
0d4f602e33 pep8 2015-08-06 22:35:44 +02:00
Davorin Sego
d06e16d953 Initialize signal handler, so we can remove getattr 2015-08-06 22:06:56 +02:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Nimisha Asthagiri
5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support 2015-08-05 11:37:33 -04:00
Ned Batchelder
ff243eaa70 Merge pull request #9187 from edx/release
Release merge to master
2015-08-04 14:18:50 -04:00
Awais Jibran
6d16da7339 Merge pull request #9015 from edx/aj/tnl2857-mathjax-probelm-in-problem-hints
Fixed MathJax rendering in problem hint
2015-08-04 23:12:03 +05:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Marco Morales
90fcf4646a adds back in correct and incorrect styling for annotations problems 2015-08-03 10:57:31 -04:00
Marco Morales
10a0bc6f1d Merge pull request #9122 from jolyonb/questionfix
CAPA CSS: Fixing indicator spacing on dropdown problems
2015-07-31 09:52:02 -04:00
David Baumgold
ebe8b25210 Upgrade setuptools to 18.0.1
This reverts commit 1a3f0958b9.
2015-07-30 16:22:42 -04:00
Davorin Šego
a7f2b025a9 Delete null_handler.py 2015-07-30 16:00:31 +02:00
Davorin Sego
73f163091f Initial idea 2015-07-30 00:42:49 +02:00
Jolyon Bloomfield
d06abbf01e Fixing indicator spacing 2015-07-29 17:10:08 -04:00
Davorin Sego
a62ef9ffa9 quality 2015-07-29 21:24:38 +02:00
Davorin Sego
7a923cf520 fix errors 2015-07-29 20:30:39 +02:00
Mushtaq Ali
40f8947334 Merge pull request #9100 from edx/mushtaq/tnl2593-fix-publish-automatically-after-deleting-unit
Autopublish when vertical is deleted
2015-07-29 23:02:54 +05:00
Davorin Sego
ab923ea250 use a universal null handler 2015-07-29 19:07:00 +02:00
Davorin Sego
dd457c2f49 Revert "a different take"
This reverts commit 74d7b2a7d6.
2015-07-29 18:13:19 +02:00
frances botsford
f8d1776698 Merge pull request #8972 from jolyonb/jolyonb/discussion
Small printing fixes (LMS)
2015-07-29 10:10:47 -04:00
frances botsford
cfe3acb7c4 Merge pull request #7594 from jolyonb/jolyonb/p-spacing
Fixing paragraph spacing with inline class (capa)
2015-07-29 10:06:28 -04:00
Davorin Sego
74d7b2a7d6 a different take 2015-07-29 14:41:22 +02:00
Davorin Sego
a2dbd403c8 add a null signal handler to BulkOperationMixin, remove conditionals 2015-07-29 11:43:48 +02:00
mushtaqali
edad392a26 Autopublish when vertical is deleted 2015-07-29 11:44:11 +05:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files
No need to go through Mako
2015-07-28 09:36:31 -04:00
David Ormsbee
8d9e907635 Merge pull request #9070 from edx/ormsbee/test_ms_class_setup_teardown
Modulestore test base class using setUpClass() and tearDownClass()
2015-07-27 15:05:46 -04:00
John Eskew
756008aa9b Merge pull request #8768 from open-craft/jump_to_children_ospr
Jump to children
2015-07-27 13:42:32 -04:00
David Ormsbee
58f36d3e93 Enable faster ModuleStore tests with SharedModuleStoreTestCase.
This is a new TestCase base class, intended for situations where
you only want to initialize course content in the setUpClass(),
as opposed to setUp(). This is done for performance reasons, since
many test cases only use courses in a read-only fashion,
particularly in LMS tests.

This commit also converts the following modules to use this new
base class:

  lms/djangoapps/ccx/tests/test_ccx_modulestore.py (38s -> 4s)
  lms/djangoapps/discussion_api/tests/test_api.py (2m45s -> 51s)
  lms/djangoapps/teams/tests/test_views.py (1m17s -> 33s)
2015-07-27 13:02:16 -04:00
David Ormsbee
701f5fc1c6 Optimize test course creation with bulk_operations.
Use bulk operations to both minimize the number of writes
to MongoDB, as well as to suppress signals which could
trigger things like search indexing or course structure
caching.
2015-07-24 19:45:10 -04:00
Christina Roberts
cb21756393 Merge pull request #9063 from edx/christina/tnl-231
Delete mention of direction from checkboxgroup.
2015-07-24 16:58:26 -04:00
Christina Roberts
09b352cca3 Merge pull request #9056 from edx/christina/tnl-645
Set default value of showanswer to Never since it doesn't work.
2015-07-24 15:12:45 -04:00
Peter Fogg
9d0dd4bbb2 Merge pull request #9034 from edx/peter-fogg/round-grades
WIP: Display rounded problem results.
2015-07-24 14:55:50 -04:00
cahrens
85b8a88152 Delete mention of direction from checkboxgroup.
It was never implemented.
TNL-231
2015-07-24 14:44:08 -04:00
Peter Fogg
814cc5688c Display rounded problem results. 2015-07-24 14:18:14 -04:00
cahrens
8276172802 Set default value of showanswer to Never since it doesn't work.
TNL-645
2015-07-24 13:32:56 -04:00
Peter Fogg
50f6ca891b Merge pull request #9045 from edx/peter-fogg/fix-true-false-response
Fix TrueFalse responses with single answers.
2015-07-24 12:52:43 -04:00