Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,908 Commits 1 Branch 0 Tags
b2c0e0584dfdc75dff4e9cc658eac8cd57879cb7
Commit Graph

1057 Commits

Author SHA1 Message Date
polesye
0e2bf2234d BLD-726: ChoiceTextGroup i18n. 2014-06-11 16:09:58 +03:00
Alexander Kryklia
2eae8b8380 Merge pull request #3981 from edx/alex/fix_matlab_check 
Improve escaping in code response.
 2014-06-05 15:59:28 +03:00
Alexander Kryklia
97e8f94379 Improve escaping in code response. 2014-06-03 18:56:36 +03:00
Nick Parlante
0039536fe2 Merge pull request #3872 from edx/nick/disable-masking 
Temporarily disable masking
 2014-06-02 13:21:47 -07:00
Anton Stupak
ee368da66b Merge pull request #3946 from edx/anton/i18n-code-response 
CodeResponse: fix i18n.
 2014-06-02 16:32:45 +03:00
polesye
73df5a9343 BLD-724: ChoiceTextResponse i18n. 2014-06-02 09:22:25 +03:00
Dave St.Germain
ed9ab3ad71 Merge pull request #3501 from edx/dcs/matlab-api-key 
Allow courses to set Matlab API key globally, in advanced settings.
 2014-05-30 11:40:32 -04:00
Oleg Marshev
daf4840cb6 Add span tag. 2014-05-30 10:30:23 +03:00
Nick Parlante
3ef1e0f7ad Temporarily disable capa name masking 
There is a bug I need to fix when a student re-visits a problem that they
had solved previously without masking enabled, their old state does not
load correclty.

It's simplest to turn off masking now, and re-enable it with the whole fix.

The change here is a small deletion to remove the masking=True logic, and more
lengthy changes to adjust the tests.
 2014-05-29 22:12:43 -07:00
Anton Stupak
50e820db4e Merge pull request #3916 from edx/anton/fix-choice-text-response 
Fix ChoiceTextResponse.
 2014-05-29 15:56:30 +03:00
jmclaus
f45dc94930 JavascriptResponse i18n. [BLD-737] 2014-05-29 13:49:04 +02:00
Anton Stupak
79a0cd2445 Merge pull request #3902 from edx/anton/i18n-choice-group 
ChoiceGroup  i18n.
 2014-05-29 11:47:09 +03:00
polesye
1f7d59de5b BLD-1103: Fix ChoiceTextResponse. 2014-05-29 11:03:15 +03:00
Dave St.Germain
0173eaf9d2 Updated payload for new matlab endpoint. 2014-05-28 15:32:46 -04:00
Dave St.Germain
964e73f053 Allow courses to set Matlab API key globally, in advanced settings. 2014-05-28 15:32:46 -04:00
jmclaus
d6a54c697d i18n of Image Response [BLD-723] 2014-05-28 18:37:16 +02:00
polesye
71b90a918d BLD-725: ChoiceGroup i18n. 2014-05-28 16:03:14 +03:00
Calen Pennington
29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master 2014-05-23 10:05:56 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Dave St.Germain
232df30b3e support aria-grabbed and aria-dropeffect 2014-05-22 09:51:50 -04:00
Dave St.Germain
f4391b5eb9 fixing drag and drop 2014-05-22 09:51:50 -04:00
jmclaus
db239c69fe Tolerance expressed in percentage now computes correctly. [BLD-522] 2014-05-21 17:14:12 +02:00
Anton Stupak
61414c7c92 Merge pull request #3715 from edx/anton/i18n-string-response 
StringResponse i18n.
 2014-05-20 19:51:50 +03:00
Anton Stupak
d8f1ebefb7 Merge pull request #3734 from edx/anton/i18n-custom-response 
CustomResponse: fix log message.
 2014-05-20 19:51:40 +03:00
polesye
67a20d6536 Fix message. 2014-05-20 14:15:01 +03:00
Calen Pennington
8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/templates/widgets/header.html
 2014-05-19 09:20:08 -04:00
polesye
934b8dbcf9 Add translators. 2014-05-19 09:00:54 +03:00
polesye
aedde3397e SymbolicResponse fix error message. 2014-05-19 09:00:09 +03:00
polesye
237fca067f CustomResponse: fix log message. 2014-05-19 08:58:31 +03:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
 2014-05-13 15:30:56 -04:00
Waheed Ahmed
7a96faf9a3 Merge pull request #3585 from dragonfi/master 
Fix #3347: "Run Code" reloads page in Matlab Problem
 2014-05-13 19:06:40 +05:00
Nick Parlante
f48e470f54 Fix targeted-feedback bug 
The bug is with the case of multiple-questions with targeted
feedback within a single problem.

Refactor the targeted-feedback tests to house
the most common xml in external files.

Move the capa test load_fixture function to __init__.py so it
can be used generally.
 2014-05-12 14:26:05 -07:00
dragonfi
8430be3d18 Fix #3347: "Run Code" reloads page in Matlab Problem 
Instead of refreshing only the necessary parts,
"Run Code" reloads the whole page.

This commit fixes this behaviour, by refreshing the
specific elements belonging to the Problem instead.

Also tidies up indentation.
 2014-05-12 22:26:52 +02:00
Calen Pennington
19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
 2014-05-12 11:35:03 -04:00
ichuang
34c28cf42d Merge pull request #3068 from edx/fix/ichuang/capa-customresponse-anonid 
allow capa problems access to anonymous_student_id
 2014-05-09 16:21:36 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Anton Stupak
f2086f2336 Merge pull request #3586 from edx/anton/i18n-custom-response 
CustomResponse i18n.
 2014-05-07 15:13:13 +03:00
Anton Stupak
ed70a0823c Merge pull request #3608 from edx/anton/i18n-code-response 
CodeResponse i18n.
 2014-05-07 13:39:28 +03:00
Calen Pennington
974e66b74f Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit updates miscellaneous files in common.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-06 12:03:42 -04:00
Anton Stupak
4a80b14ade Merge pull request #3607 from edx/anton/i18n-symbolic-response 
SymbolicResponse i18n.
 2014-05-06 15:58:49 +03:00
polesye
d8e5647a10 BLD-721: SymbolicResponse i18n. 2014-05-06 12:46:33 +03:00
polesye
0fa910aa3d BLD-714: CustomResponse i18n. 2014-05-06 12:02:26 +03:00
polesye
7effca9ec6 BLD-722: CodeResponse i18n. 2014-05-06 11:26:49 +03:00
polesye
d9aa28b829 BLD-715: StringResponse i18n. 2014-05-05 16:57:45 +03:00
Dave St.Germain
c5627b41c8 Merge pull request #3002 from edx/dcs/status-object 
Convert CAPA inputtype statuses from strings to objects,
 2014-04-29 10:35:05 -04:00
Oleg Marshev
0f70a997f5 Add timestamp and wait for 35 sec. 2014-04-25 10:26:46 +03:00
ichuang
6647cc1958 allow capa poroblems access to anonymous_student_id 
fix system->capa_system in capa_problem change for anonid
 2014-04-22 21:00:01 -04:00
ichuang
d4201f028e Merge pull request #3413 from edx/bugfix/ichuang/multiple-choice-question-hints 
bugfix: allow multiple choice questions to display hints

Thanks, @sarina, @pmitros
 2014-04-22 12:03:43 -04:00
polesye
ca93855fcf BLD-717: MultipleChoiceResponse i18n. 2014-04-22 12:17:16 +03:00
ichuang
f91b96565d bugfix: allow multiple choice questions to display hints 2014-04-21 22:03:26 -04:00