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

77 Commits

Author SHA1 Message Date
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
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
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Chris Dodge
f5d07b1521 just tickle a file to for build cms-master. I dont seem to have the rights to force a jenkins build. 2012-12-15 15:15:45 -05:00
Victor Shnayder
7887f556d9 Add docs on using a queue server on aws from a local LMS 2012-12-05 09:29:42 -05:00
Victor Shnayder
a44e8887a8 add docs on staff grading tab type 
- also updated some out-of-date docs
 2012-12-03 13:22:50 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Victor Shnayder
35acbc840e add note about new end_of_course_survey_url flag to docs 2012-11-09 18:18:37 -05:00
Victor Shnayder
2846c61d15 Revert "remove (almost) all references to askbot." 
This reverts commit 793354a0dc.
 2012-11-09 18:18:37 -05:00
Victor Shnayder
76f0cf4a86 remove (almost) all references to askbot. 2012-11-09 18:18:33 -05:00
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests 
Feature/cale/js tests
 2012-11-08 06:44:49 -08:00
ichuang
1162f6f319 add doc file about use of mongo (by cms+lms) 2012-11-06 09:29:23 -05:00
David Ormsbee
8f756f0304 Document advertised_start and discussion_blackouts attributes of course 2012-11-01 04:45:00 -04:00
Calen Pennington
2ca63268d6 Add commands for Studio LMS 2012-10-31 10:39:26 -04:00
Calen Pennington
8d4ee3b05e Add more documentation of development tasks 2012-10-31 10:37:21 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
Victor Shnayder
16990c2743 Add an end date to courses. 
- needed for cert generation (and later lots of other things)
 2012-10-24 17:23:13 -04:00
Victor Shnayder
a508556521 Fix typo 2012-10-24 11:50:38 -03:00
kimth
b294c139ce Update doc/xml-format.md 
Add discussion tag
 2012-09-28 07:45:50 -07:00
Bridger Maxwell
55d7d2bc14 Updates to grading doc. 2012-09-27 13:29:04 -04:00
Bridger Maxwell
e1652c4790 Added doc explaining course grading at high level. 2012-09-25 13:56:01 -04:00
Victor Shnayder
7a88223ef7 custom tabs 
* still needs better error checking and testing
 2012-09-20 00:51:23 -04:00
Carlos Andrés Rocha
32d224c4d0 Update doc/xml-format.md 2012-09-19 18:10:13 -04:00
Victor Shnayder
09909c7ec2 Merge pull request #711 from MITx/kimth/onreset-type 
onreset rerandomize option
 2012-09-18 11:09:25 -07:00
Victor Shnayder
892cf7bace cleanup tabs documentation a bit 2012-09-18 13:46:57 -04:00
Victor Shnayder
d9219c6086 Custom tabs 
* specify in tabs list in course policy
  - active page tracking now done in tabs.py
  - properly handle the fact that there may be multiple textbooks

* Still need:
  - wiki pages
  - (if that's delayed, special-case syllabus support)
 2012-09-18 08:45:09 -04:00
kimth
0fdd0a005f Add docs to xml_format 2012-09-17 20:40:06 -04:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -07:00
Ibrahim Awwal
b4828db1e3 User profile page redone to act like the inline discussion, except threads are 
loaded into the page in a data attribute instead of loaded on request via ajax.
The user profile page also does not provide facilities for adding
comments/responses, which I think would clutter the page too much.

Also removed some unused stuff from views.py.
 2012-09-12 15:16:35 -07:00
Sarina
b6b9b15912 Make clear where to specify display_name in xml 2012-09-12 14:58:23 -03:00
Victor Shnayder
550889ea30 fix typo 2012-09-06 11:42:19 -04:00
Victor Shnayder
a1286b1c7d add some docs for new policy folder locations, per-course about and info pages 2012-09-06 11:39:43 -04:00
ichuang
5c90ec19d9 clarify that /gitreload is behind ENABLE_LMS_MIGRATION in docs 2012-09-04 19:08:28 -04:00
ichuang
4f8161df84 address two comments in https://github.com/MITx/mitx/pull/615 2012-09-04 11:10:22 -04:00
ichuang
9433e89710 add docs for gitreload 2012-09-01 10:16:38 -04:00
Victor Shnayder
cbfc117e8b a few edits to the xml format docs 2012-08-28 19:53:46 -04:00
Victor Shnayder
84732d03b6 add note about ":" in format docs 2012-08-27 11:43:47 -04:00
Victor Shnayder
25c83bbb5d xml format docs! 2012-08-26 21:55:55 -04:00
Rocky Duan
238adb1a03 Merge branch 'master' into profile 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html
 2012-08-18 17:04:37 -07:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Victor Shnayder
147bd5eb3d add initial docs on xml format and policy files 2012-08-16 14:04:41 -04:00
ichuang
033211a5d1 doc update - LMS migrate reload 2012-08-15 22:03:00 -04:00
Rocky Duan
72c3ad2acc updated doc 2012-08-15 12:50:30 -07:00
Rocky Duan
f5251249a6 updated documentation 2012-08-15 11:32:05 -07:00