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

121 Commits

Author SHA1 Message Date
Victor Shnayder
b0356e32b2 Merge pull request #1589 from MITx/peter/symbolic 
Added support for superscripts in variables
 2013-03-27 10:40:50 -07:00
David Ormsbee
5863ba5ac4 Merge pull request #1686 from MITx/feature/vaxxxa/docs-poll-conditional-xml 
Feature/vaxxxa/docs poll conditional xml
 2013-03-22 13:30:47 -07:00
Victor Shnayder
3f18e5c3d7 In sign up form, merge PhD-science and PhD-other, add Associate's degree 
Includes corresponding documentation changes.

Per request from Harvard: LH #276
 2013-03-21 17:23:46 -04:00
Vasyl Nakvasiuk
9e7258d887 fix rakefile, fix docs 2013-03-19 12:38:08 +02:00
Vasyl Nakvasiuk
be27dfd500 poll_module.rst done 2013-03-18 16:30:29 +02:00
Vasyl Nakvasiuk
63ecc64d82 conditional_module.rst done 2013-03-18 16:13:44 +02:00
Vasyl Nakvasiuk
911c384527 remove old xml docs, add rake buildpubdocs, showpubdocs, pubdoc 2013-03-18 15:53:07 +02:00
Vasyl Nakvasiuk
f172405c9a remove xml documentation from docs/source/ 2013-03-18 15:37:29 +02:00
Peter Baratta
bac9f1f571 Merge branch 'master' into peter/symbolic 2013-03-14 06:31:17 -06:00
Peter Baratta
75b561267c Script feature fix 2013-03-14 06:29:51 -06:00
Victor Shnayder
84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-03-08 00:40:18 -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
Brian Wilson
9c92c92fda add textbook and pdf textbook documentation 2013-03-06 17:35:32 -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
Peter Baratta
c6545eb092 Begin to document symmath as we go 2013-03-06 06:21:08 -07:00
Brian Wilson
cde4cdf839 starting pdfbook doc 2013-03-05 17:51:44 -05:00
Valera Rozuvan
ff26913795 Added a limitation to the DnD docs. 2013-03-05 14:40:02 +02:00
Valera Rozuvan
3bcd1467d9 Added documentation for drag and drop - targets on draggables feature. 2013-03-05 13:36:24 +02:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	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_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
Will Daly
f8893e9cc1 Updated custom response documentation 2013-03-01 11:19:39 -05:00
Will Daly
c3da73ed1e Changed title of custom response doc. 
Added custom response doc to index
 2013-03-01 10:57:57 -05:00
David Ormsbee
8f4d11a608 set build dir back to where it is by default 2013-02-26 13:39:11 -05:00
David Ormsbee
eeddf89c34 doc config changes to make things compatible with GitHub pages 2013-02-26 12:21:19 -05:00
David Ormsbee
49563eae18 Delete course_grading.md and xml-format.md (moved to doc/public) 2013-02-26 11:59:51 -05:00
David Ormsbee
dc27d197e6 Changed title of public docs to edX Data 2013-02-26 11:31:03 -05:00
David Ormsbee
972df00f84 Copied over drag and drop docs, graphical slider tool docs to public, non-dev documentation 2013-02-26 11:20:36 -05:00
David Ormsbee
102494f643 Add grading doc and split internal and course data docs into subdirs 2013-02-26 11:11:29 -05:00
David Ormsbee
d3c784a4e7 More formatting/editing of Course XML guide. 2013-02-26 10:55:14 -05:00
David Ormsbee
76320b0e19 Add slightly revised course XML tutorial 2013-02-26 02:22:59 -05:00
David Ormsbee
a2a536b5ed Add docs sketching data formats. 2013-02-25 17:03:59 -05:00
Victor Shnayder
01a38c29be Add auto-cohorting functionality. 
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
 2013-02-24 18:48:01 -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
ichuang
6a7e30e331 add doc about disable_progress_graph 2013-02-06 04:01:28 +00:00
ichuang
e59b0b87b1 add docs for conditional module; clean up a bit more 2013-02-03 21:07:23 -05:00
Ned Batchelder
97bb56b302 Tweak the dev instructions. 2013-01-25 12:33:30 -05:00
Victor Shnayder
ea3aebdfe5 add logging, explicit check whether course is cohorted 2013-01-24 15:46:22 -05:00
Victor Shnayder
3bfe9decf4 Change config keys to use underscores for consistency with other policy keys 2013-01-24 15:14:34 -05:00
Victor Shnayder
fa17913a91 is_cohorted course descriptor property, docs 2013-01-24 15:12:52 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Victor Shnayder
2f7210ed0c address Ike's comments 2013-01-15 11:44:27 -05:00
Victor Shnayder
3e5a2f9bde Add beta test group support 
* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
 2013-01-15 11:36:25 -05:00
David Ormsbee
a2d5d0bc89 Merge pull request #1279 from MITx/jaakana 
added problem weight description
 2013-01-15 08:25:14 -08:00
Jennifer Akana
833b0c34ab added problem weight description 2013-01-14 19:20:49 -05:00
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -05:00
ichuang
ed96046ad7 add documentation on remote gradebook xserver API 2013-01-10 23:59:20 -05:00
Jay Zoldak
d3fd6ac151 Clarify the syntax of the rake fasttest command 2013-01-07 15:23:08 -05:00
Jay Zoldak
0c6e8c4820 Clarify that you need to start up the mongo daemon 2013-01-07 14:08:18 -05:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Jay Zoldak
8c4edc459c update testing doc 2013-01-03 11:22:21 -05:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00