Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

1401 Commits

Author SHA1 Message Date
Victor Shnayder
1a5fc065ad Add beta test group management view to instructor dashboard 
* still needs to support uploading a list
* also want to clean up and refactor the code a bit
 2013-01-15 11:44:26 -05:00
Victor Shnayder
58a9fdeddc add note about settings needed for manual testing 2013-01-15 11:36:25 -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
Vik Paruchuri
4353c4ab05 Clean up some logic 2013-01-14 15:16:06 -05:00
Vik Paruchuri
cc56e47633 Fix active page issue 2013-01-14 15:12:54 -05:00
Vik Paruchuri
4ffa00b400 Add in notifications, peer grading tab, tab image 2013-01-14 15:00:13 -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
ec94f7328c remove try...except workaround for circular import bug fixed by https://github.com/MITx/mitx/issues/1260 2013-01-10 23:32:48 -05:00
ichuang
e5c958082b list/add/delete instructors on instructor dashboard 2013-01-10 23:32:48 -05:00
ichuang
04d6f08c0c add offline grade computation & DB table for this 2013-01-10 23:32:48 -05:00
ichuang
82e31d533b Hookup CourseEnrollmentAllowed to lms/djangoapps/courseware/access.py 2013-01-10 23:31:46 -05:00
Carlos Andrés Rocha
8f21d7a738 Add property to course module to check if a course is new 
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.

Also adds a property to check how many days are left until the course starts.
 2013-01-10 15:57:29 -05:00
Calen Pennington
cb3b17d44c Catch ItemNotFound errors at the top of get_module, rather than in get_module_for_descriptor, to maintain previous LMS behavior 2013-01-10 14:30:12 -05:00
Calen Pennington
0726294c35 Use get_child_descriptors for grades.py 2013-01-10 13:55:46 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware 
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
 2013-01-10 13:55:46 -05:00
Chris Dodge
99750a6812 make sure we turn off module wrappers for the 'ancillary' course content 2013-01-08 11:18:41 -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
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -05:00
Calen Pennington
8874d9d7f8 Add a draft implementation of the Poll module for Justice 2013-01-03 12:21:13 -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
Jay Zoldak
ccc8b599f1 Fixed tests to work OK so far. 2013-01-02 10:44:21 -05:00
Jay Zoldak
7e5a67badf Add new partner universities and remove cs50 from smart accordion testing 2013-01-02 10:44:20 -05:00
Jay Zoldak
7f6d55ad86 Create acceptance tests for open ended grading. 2013-01-02 10:44:20 -05:00
Jay Zoldak
6df565e468 Interim work on open-ended grading acceptance testing POC 2013-01-02 10:44:20 -05:00
Jay Zoldak
d65985b445 Use beautiful soup to massage the HTML for easier comparison. 
Strip off the data-id tag for HTML diff of courseware

Strip data-id attributes so they are not compared in the HTML
 2013-01-02 10:44:20 -05:00
Jay Zoldak
8934f54d6f Save the HTML to a file for each section and comment out debug msgs 2013-01-02 10:44:20 -05:00
Jay Zoldak
5cad5d5fba Add scenarios for all Fall 2012 courses to smart accordion feature. 2013-01-02 10:44:20 -05:00
Jay Zoldak
20cc930312 Bring over acceptance test changes from cms master branch. 2013-01-02 10:44:20 -05:00
Jay Zoldak
af4f1668d7 Stub out the video and capture the html files of the high level tabs for diff comparison 
Conflicts:
	lms/templates/video.html
 2013-01-02 10:44:20 -05:00
Jay Zoldak
10275e9709 Add item checking within courseware tabs 2013-01-02 10:44:19 -05:00
Jay Zoldak
a40ea202d2 Cleanup of imports in courseware tests 2013-01-02 10:44:19 -05:00
Jay Zoldak
0a77dd4431 Smart accordion walkthrough working for cms-master branch 
Conflicts:
	lms/envs/cms/acceptance.py
 2013-01-02 10:44:19 -05:00
Jay Zoldak
668bc81d7f New branch for clean lms acceptance tests 2013-01-02 10:44:19 -05:00
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
2509308ce9 Remove reference to shared_state_key 2013-01-02 09:05:48 -05:00
Calen Pennington
84cb0ce99b Move inheritance logic out into a separate file in the modulestore 2012-12-28 14:56:42 -05:00
Calen Pennington
7f8b79694c Grade problems that have ungraded student modules 2012-12-28 14:55:32 -05:00
Calen Pennington
9c5a922eee Create tables for all known scopes, and add tests of the LmsKeyValueStore 2012-12-28 14:55:32 -05:00
Calen Pennington
7cb95aad47 WIP: Add grade publishing functionality 2012-12-28 14:55:32 -05:00
Calen Pennington
7679fda172 Remove debugging print statements 2012-12-28 14:54:13 -05:00
Calen Pennington
d61c91c139 Fix errors around error descriptors and custom tag modules 2012-12-28 14:53:30 -05:00
Calen Pennington
8693d288c8 Fix errors from running unit tests (some tests still fail) 2012-12-28 14:51:50 -05:00
Calen Pennington
2879853eee Pep8 fixes 2012-12-28 14:51:50 -05:00
Calen Pennington
fbd9499c51 Make debug message use the available request.user object 2012-12-28 14:51:50 -05:00
Calen Pennington
64848a32ee Delete get_instance_module and get_shared_instance_module, as they are obsolete with the new properties 2012-12-28 14:51:50 -05:00
Calen Pennington
13cab34a7d Always use the url form of the location when making StudentModules 2012-12-28 14:51:50 -05:00
Calen Pennington
306dbcff9c Rationalize StudentModule unicode and repr strings 2012-12-28 14:51:50 -05:00
Calen Pennington
3adb1e7109 Make grading not require get_instance_module 2012-12-28 14:51:50 -05:00
Calen Pennington
01411ae66e WIP: Trying to get tests working 2012-12-28 14:48:47 -05:00