Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
cec3475c9d Remove references to .definition and .metadata in modules 2013-03-06 18:07:56 -05:00
Brian Wilson
b5ab766092 initial framework for htmlbook 2013-03-06 17:57:33 -05:00
David Ormsbee
5b12793aee Merge pull request #1597 from MITx/docs/valera/drag_and_drop 
Added documentation for drag and drop - targets on draggables feature.
 2013-03-06 14:55:02 -08:00
David Ormsbee
d2f9b27d8e Merge pull request #1611 from MITx/fix/brian/doc-pdfbook 
add textbook and pdf textbook documentation
 2013-03-06 14:54:36 -08:00
Brian Wilson
9c92c92fda add textbook and pdf textbook documentation 2013-03-06 17:35:32 -05:00
jkarni
3bb108b12e Merge pull request #1608 from MITx/feature/jkarni/genex 
Feature/jkarni/genex
 2013-03-06 14:35:01 -08:00
Calen Pennington
af3c92c47e Remove old cms templates 2013-03-06 17:28:25 -05:00
Jay Zoldak
73bca8afd2 Merge pull request #1610 from MITx/fix/diana/fix-annotation-tests 
Update correctmap to handle partially correct answers, and
 2013-03-06 14:11:47 -08:00
Calen Pennington
ba69392f70 Fix inaccurate instructions around import 2013-03-06 17:10:45 -05:00
David Ormsbee
d0bff1ed3c Merge branch 'master' into jmpm-analytics 
Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
 2013-03-06 17:09:09 -05:00
Diana Huang
5c3dfd9280 Update correctmap to handle partially correct answers, and 
fix annotation tests so that they use the new test_system functionality
 2013-03-06 16:43:12 -05:00
Calen Pennington
5222c61d73 Fix how the 'empty' field is excluded from html_module editable fields 2013-03-06 16:34:21 -05:00
chrisndodge
05211d4fe8 Merge pull request #1607 from MITx/feature/christina/djdebug 
Enable Django debug toolbar on Studio (including Mongo panel).
 2013-03-06 13:14:19 -08:00
Brian Talbot
62514d85a3 studio - alerts: loosely wired advanced settings with new notification and alert messages 2013-03-06 15:36:38 -05:00
Calen Pennington
4327aa1885 If we can't parse policy, then set it to an empty dictionary 2013-03-06 15:18:03 -05:00
Calen Pennington
4cbae2269c Clean up how grading policy is set 2013-03-06 15:12:54 -05:00
Calen Pennington
e7900859b6 Remove the 'title' alias for lms.display_name 2013-03-06 15:11:08 -05:00
Victor Shnayder
12b6b7d403 Merge pull request #1609 from MITx/diana/refactor-chemical-equation 
Refactor Chemical Equation Preview
 2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule 
Feature/abarrett/annotatable xmodule DO NOT MERGE
 2013-03-06 12:05:27 -08:00
Brian Talbot
9a7b6c7eaf Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-06 15:04:34 -05:00
Diana Huang
42e711e7d2 Update tests and documentation. 2013-03-06 14:53:13 -05:00
Julian Arni
fb08942b63 Add 'get' default string 2013-03-06 14:49:36 -05:00
Diana Huang
1aa3580dcb Switch over to using the inputtype ajax handler for chemical input. 2013-03-06 14:41:48 -05:00
Arthur Barrett
dfc9176f6b fixed typo 2013-03-06 14:40:35 -05:00
Arthur Barrett
ddbab36439 Added instructions/documentation to the studio template for content authors. 2013-03-06 14:33:04 -05:00
Victor Shnayder
7af36eb633 Merge pull request #1598 from MITx/diana/capa-input-ajax 
Give InputTypes the ability to handle their own AJAX
 2013-03-06 11:30:28 -08:00
cahrens
de225e6623 Enable Django debug toolbar on Studio (including Mongo panel). 2013-03-06 14:08:54 -05:00
Arthur Barrett
5029d3a3dd Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule 2013-03-06 13:51:18 -05:00
Arthur Barrett
fd49aceb29 fixed highlight style for cascade. 2013-03-06 13:36:11 -05:00
Julian Arni
d05e82e35c Merge branch 'master' into feature/jkarni/genex 2013-03-06 13:25:30 -05:00
Arthur Barrett
9b32400b3a tweaked commentary textarea size so it looks correct in ff 2013-03-06 13:18:52 -05:00
Calen Pennington
3b7a589e5a Merge remote-tracking branch 'origin/feature/alex/poll-merged' into feature/alex/poll-merged 2013-03-06 12:58:24 -05:00
Vasyl Nakvasiuk
aa026387ce Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-06 19:52:28 +02:00
Vasyl Nakvasiuk
493421c1ec fix test_conditional, add new conditional to "conditional_and_poll" test course 2013-03-06 19:52:18 +02:00
Vik Paruchuri
7871fce7ff Merge branch 'feature/vik/fix-oe-storage' into feature/vik/storage-model-fixes 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:49:11 -05:00
Vik Paruchuri
b75b091581 Remove 2 more debug statements 2013-03-06 12:27:22 -05:00
Vik Paruchuri
c1218e8c08 Remove debug statements 2013-03-06 12:26:23 -05:00
Calen Pennington
8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:15:07 -05:00
Don Mitchell
69601047f2 Merge pull request #1605 from MITx/bug/christina/misc 
Use readonly attribute instead of disabled. Disabled text fields are not...
 2013-03-06 08:59:11 -08:00
Vik Paruchuri
f73979d03b Generate less db inserts 2013-03-06 11:57:14 -05:00
cahrens
b706d4a1f5 Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox. 
#225
 2013-03-06 11:50:23 -05:00
Vik Paruchuri
d20fc439ec Fix peer grading boolean parsing 2013-03-06 11:47:48 -05:00
Vik Paruchuri
3329af077a Force instance state to save periodically 2013-03-06 11:29:25 -05:00
Vik Paruchuri
7ea3d70c2c Caching attribute values from child module 2013-03-06 11:21:42 -05:00
Julian Arni
dfa590e71c Make exception a little more specific 2013-03-06 11:10:13 -05:00
Julian Arni
5682e02f53 Fix indendation that was causing only first submission to be saved 2013-03-06 11:05:10 -05:00
Diana Huang
4b7d1deb25 Fix a bug in extracting HTML 
Update tests to reflect new behavior.
 2013-03-06 10:34:57 -05:00
Will Daly
e1b99186ef Removed test_permissions.py 2013-03-06 10:20:02 -05:00
Will Daly
2f5ea630e7 Cleaned up courseware test_tabs unittests 2013-03-06 10:16:43 -05:00
Vasyl Nakvasiuk
3270caed83 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-06 17:10:27 +02:00