Commit Graph

1177 Commits

Author SHA1 Message Date
Adam Palay
c63dcf0dfe render mathjax in svg by default (TNL-4145)
mathjax preview should be inline by default
2016-02-24 12:51:30 -05:00
Chris Rodriguez
9e0497dfab Updating response status messaging 2016-02-09 08:16:20 -05:00
Martin Segado
a15388b20c Allow python variable interpolation in CustomResponse 'expect' and 'answer' attributes 2016-01-20 15:11:51 -05:00
Syed Hassan Raza
e630fba9a7 Add accessible text 2016-01-13 14:13:56 +05:00
Syed Hassan Raza
cfb761bf29 Indicator-container div apply to status 2016-01-12 15:03:03 +05:00
Sarina Canelake
96ddf544ff Remove Pylint violations 2015-12-17 16:29:28 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Nimisha Asthagiri
0698076440 Transformer: StudentViewTransformer 2015-11-05 23:29:12 +00:00
Renzo Lucioni
2f0e663581 Use ugettext_noop instead of lambdas assigned to the underscore
Replaces instances of an old hack with the more clear ugettext_noop.
2015-11-04 09:17:18 -05:00
muzaffaryousaf
35884195cc Fixing pep8/pylint violations.
TNL-3650
2015-10-29 15:37:52 +05:00
muzaffaryousaf
cc88cfaf64 Fixing "wrong-assert-type" pep8 warning.
TNL-3650
2015-10-29 15:01:49 +05:00
Colin-Fredericks
350387c0a9 TNL-3197 Partial Credit (not Dropdown)
Updated templates

Updating responsetype tests.

Updating other tests for PC

Putting OptionInput back the way it was.

Acceptance tests for partial credit

Testing tools

pep8

scss name fix

Missing }

icon fix

icon fix
2015-09-22 13:20:39 -04:00
Sarina Canelake
eb2be53876 Merge pull request #9639 from jolyonb/feqtext
Adding trailing_text to formulaequationinput
2015-09-18 14:05:19 -04:00
Jolyon Bloomfield
7f14a151b9 Modifying template for formulaequationinput and fixing CSS 2015-09-10 21:43:24 -04:00
jpaille
ef2a855e93 Fix dropdown problem (optioninput) template.
The correct answer is now correctly displayed after `show answer` is pressed.
2015-09-09 09:11:33 +00:00
Jolyon Bloomfield
daa4c67339 Adding trailing_text to formulaequationinput 2015-09-08 18:21:54 -04:00
Adam Palay
76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master
Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss
2015-09-01 16:01:04 -04:00
Syed Hassan Raza
f82662356f Revert "OSPR-535 Partial Credit"
This reverts commit 7624c63362.
2015-09-01 14:04:42 -04:00
Ned Batchelder
741f06864a Merge pull request #9502 from edx/ned/import-path-differently
Change imports from path to use the stablest name.
2015-08-28 11:12:10 -04:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name.
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
2015-08-27 12:59:25 -04:00
mirjamsk
336982e42b Adresses TNL-3096
Add acceptance test for TNL-3096

Adress comments on pull request

Fix test failing and img issue

Modify tests
2015-08-27 15:50:33 +00:00
Ned Batchelder
3eb2e31c52 Adjust the i18n extraction rules to get all the strings we should get.
There's a move afoot to put assets inside individual Django apps,
instead of in upper-level "templates" directories.  These i18n
configuration files have to take this into account.

.underscore files are easy to find by their unique file extension, so
the rule can be simple.  Mako files are .html, so we have to be more
nuanced about it.  We don't want to get pure HTML files, and we don't
want to get .html files for tests, even if they are Mako templates.
2015-08-24 16:27:36 -04:00
Colin-Fredericks
7624c63362 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-20 11:18:13 -04:00
Sarina Canelake
25a117613d Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit"
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
2015-08-19 11:07:14 -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
Nimisha Asthagiri
5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support 2015-08-05 11:37:33 -04:00
David Baumgold
ebe8b25210 Upgrade setuptools to 18.0.1
This reverts commit 1a3f0958b9.
2015-07-30 16:22:42 -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
cahrens
85b8a88152 Delete mention of direction from checkboxgroup.
It was never implemented.
TNL-231
2015-07-24 14:44:08 -04:00
Peter Fogg
95eccf6ea1 Fix TrueFalse responses with single answers. 2015-07-24 10:28:08 -04:00
David Baumgold
1a3f0958b9 Revert setuptools upgrade 2015-07-15 09:36:56 -04:00
Sarina Canelake
49f78b4742 Remove logging-not-lazy Pylint violations 2015-07-13 17:34:54 -04:00
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations
Skipped 'print' statement violations, as print() is Py3k syntax.
2015-07-13 17:33:28 -04:00
Régis Behmo
95ebf7f675 Upgrade distribute to the latest stable version of setuptools
'distribute' is the ancestor of 'setuptools', and many packages require
setuptools to be installed.

Upgrade of MySQL-python from 1.2.4 to 1.2.5 is required because of an
incompatibility with setuptools>0.7.
2015-07-09 13:04:33 -04:00
Christine Lytwynec
e9e4e3cf65 use 1 coveragerc file to generate 1 coverage report per build 2015-07-01 16:07:49 -04:00
Diana Huang
42d8091b49 Merge pull request #8688 from edx/diana/polling-cleanup
Clean up capa polling to have exponential backoff
2015-06-26 17:00:53 -04:00
Diana Huang
254d6c6821 Put a timeout on poling for codeinput and matlab problems. 2015-06-26 15:29:49 -04:00
Kyle McCormick
aa5e2f49bd Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc. 2015-06-23 10:27:22 -04:00
Marco Morales
8acc72975e Iniital refactor of capa styling for basic checkbox and multiple choice problem types, including additional comments to sass styles 2015-06-22 10:50:58 -04:00
Nick Parlante
77f3069655 Extended Feedback and Hints for Problems
Extends the common capa response types (string, numeric, multiple
choice, checkbox, dropdown) with feedback and hint
capabilities. "Feedback" refers to feedback shown to the student when
they check the problem, looking at their specific answer. "Hints"
refers to a Hint button in LMS which the student can click at any time
to see hints for that problem. The implementation extends the markdown
syntax to include feedback and hints. There are new Feedback-and-Hint
specific templates in Studio when the author clicks to add a new
problem.
2015-06-17 16:25:04 -07:00
Nimisha Asthagiri
89ea8b31c6 MA-725 responsive_ui indication on responsive xBlocks. 2015-06-12 09:27:21 -04:00
Adam Palay
1da047bd18 fix tolerance rounding error (TNL-904) 2015-06-03 11:10:06 -04:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -04:00
Adam Palay
683d2b3dbe fix quality violation 2015-05-29 21:46:02 -04:00
Adam Palay
0aba5874e6 Revert "Fieldset and legend solution is lost when edit Problem"
This reverts commit 16a248b997.
2015-05-29 18:50:34 -04:00
Adam Palay
509f27f02c Revert "changes for failing label test"
This reverts commit c75526ea5e.
2015-05-29 18:50:23 -04:00
Ahsan Ulhaq
c75526ea5e changes for failing label test 2015-05-19 13:17:17 +05:00
Ahsan Ulhaq
16a248b997 Fieldset and legend solution is lost when edit Problem
when user try to update a problem the fieldset and legend solution for that
problem is lost because legend and fieldset are not added in the markdownToXml.
So added new markups where fieldset is to be added and used ```>><<``` markup for
legend.

AC-103
2015-05-19 11:46:28 +05:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
2015-05-14 18:14:21 -04:00