Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,277 Commits 1 Branch 0 Tags
65bbfab5668afb143effc8991a8eca4e3c1db5a2
Commit Graph

2535 Commits

Author SHA1 Message Date
Valera Rozuvan
65bbfab566 Changed text on reset button. 2013-02-25 16:02:26 +02:00
Alexander Kryklia
fbc8d0e9d7 renamed 2013-02-25 14:11:26 +02:00
Alexander Kryklia
ebc37f1d2d reset updates 2013-02-25 13:35:58 +02:00
Valera Rozuvan
767f0bd4b3 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-02-25 13:28:27 +02:00
Valera Rozuvan
1ca397c5eb Testing errors. 2013-02-25 13:28:19 +02:00
Alexander Kryklia
4600155f97 add icon class support 2013-02-25 13:13:00 +02:00
Valera Rozuvan
df2335c90c Bug fixing. 2013-02-25 13:08:37 +02:00
Valera Rozuvan
6f16455e70 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-02-25 12:57:31 +02:00
Alexander Kryklia
0f7db9e54d Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-02-25 12:55:58 +02:00
Valera Rozuvan
5a62eae726 Fixing bugs. 2013-02-25 12:55:29 +02:00
Alexander Kryklia
f5dc0afa07 fixed reset json 2013-02-25 12:54:56 +02:00
Valera Rozuvan
653154f11e UI changes. 2013-02-25 12:33:49 +02:00
Valera Rozuvan
d9ad4b5724 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-02-25 12:13:52 +02:00
Valera Rozuvan
268e5b4bf7 Front end stuff clean up. 2013-02-25 12:13:44 +02:00
Alexander Kryklia
82a74abd65 return ok on poll_reset 2013-02-25 12:12:28 +02:00
Alexander Kryklia
9cdd271ee4 added icon class 2013-02-25 12:04:18 +02:00
Alexander Kryklia
3dae4d29bd reset part-1 2013-02-25 11:21:47 +02:00
Alexander Kryklia
6940cb334a small refactor 2013-02-19 13:33:55 +02:00
Alexander Kryklia
e2470842f7 get_module get descr insted of loc 2013-02-19 13:31:28 +02:00
Alexander Kryklia
841cfd28cc fix typo 2013-02-19 13:06:14 +02:00
Alexander Kryklia
72f6578395 fix typo 2013-02-18 11:46:07 +02:00
Alexander Kryklia
0a80f835c0 Revert "fix typo" 
This reverts commit 24d2c11c3e.
 2013-02-18 11:45:21 +02:00
Alexander Kryklia
24d2c11c3e fix typo 2013-02-18 11:45:03 +02:00
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02:00
Calen Pennington
927da34477 Fix data_dirs for /static link replacement 2013-02-13 16:15:22 -05:00
Calen Pennington
bd822b9d2f Fix tests post-merge 2013-02-13 14:13:22 -05:00
Calen Pennington
793bbfd351 Set up dev environment for testing xml vs mongo vs split_mongo modulestores 2013-02-13 14:04:21 -05:00
jkarni
2197bd987f Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks 
Feature/julian/multiple choice tweaks
 2013-02-12 13:32:15 -08:00
Ned Batchelder
27e8d699be On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't. 2013-02-12 13:43:03 -05:00
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05:00
Don Mitchell
46a7f7427a Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy 
add exporting of grading_policy.json
 2013-02-11 12:53:36 -08:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -05:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
David Ormsbee
80843c1561 Merge pull request #1463 from MITx/feature/brian/pearson-exam 
Feature/brian/pearson exam
 2013-02-08 11:07:15 -08:00
cahrens
98026e4325 A couple minor bug fixes. 
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
 2013-02-08 12:46:32 -05:00
Jay Zoldak
0d0049ec76 Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional 
fix test_conditional
 2013-02-08 08:13:01 -08:00
Calen Pennington
dd4db0601f Remove generated files 2013-02-08 10:45:59 -05:00
Calen Pennington
bda46c423d Fix some issues that were prevent lms start 2013-02-08 10:41:02 -05:00
ichuang
7b7b0690b6 fix test_conditional 2013-02-07 18:19:48 -05:00
Brian Wilson
290368ef0d merge out from master 2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314 minor cleanup 2013-02-07 16:12:02 -05:00
Brian Wilson
2974b9eec3 Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam 2013-02-07 15:58:12 -05:00
Brian Wilson
cc11dc2aa3 switch to using timelimit module for Pearson test 2013-02-07 15:57:43 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Julian Arni
8a75e1ad19 Added comment 2013-02-07 14:50:18 -05:00
Brian Talbot
6d4cb558d3 lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav 2013-02-07 12:35:52 -05:00
Brian Wilson
33a5a5fd9f add implementation for fixed_time_module 2013-02-07 05:17:56 -05:00
Victor Shnayder
37b735d708 Merge pull request #1454 from MITx/hotfix/dave/youtube_object 
Hack to disable YouTube <iframe> API when they break it.
 2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12 Hack to disable YouTube <iframe> API when they break it. 2013-02-06 22:37:41 -05:00
Julian Arni
a770e34bec Adding multiple-choice loncapa integration. 2013-02-06 20:54:43 -05:00