Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
Diana Huang
cc67017d4c Merge branch 'master' into diana/open-ended-ui-updates 2013-01-23 16:45:40 -05:00
Kevin Chugh
1bd9366e40 Merge remote-tracking branch 'origin/master' into feature/kevin/groups 2013-01-23 16:26:06 -05:00
Kevin Chugh
59b3dc61a2 lms producing grouped content 2013-01-23 16:25:26 -05:00
Calen Pennington
993c24b72b WIP: Model data caching work 2013-01-23 14:51:07 -05:00
Calen Pennington
507d2021cd Remove unused reference to StudentModuleCache 2013-01-23 14:47:06 -05:00
Calen Pennington
4779043a5f Add message during 404 for debugging 2013-01-23 14:47:05 -05:00
Calen Pennington
6e7afb968d Move xqueue handler to new module format, and continue to distinguish grades set by xqueue from those set by ajax in stats 2013-01-23 14:47:05 -05:00
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00
Ned Batchelder
6f322bcd81 Simplify the construction of the ErrorDescriptor 2013-01-23 11:34:42 -05:00
Ned Batchelder
376575dedd Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match. 2013-01-23 11:34:24 -05:00
Chris Dodge
54ee1607b8 add unit test to test DraftModuleStore.get_items() fix 2013-01-23 11:22:37 -05:00
Deena Wang
ca185c034f Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-01-23 10:50:37 -05:00
Deena Wang
3fd69bcae4 more tests in test_views.py 2013-01-23 10:41:12 -05:00
David Ormsbee
eab9511466 Merge pull request #1295 from MITx/feature/jarv/certificate-force-update 
Feature/jarv/certificate force update
 2013-01-23 06:32:41 -08:00
Diana Huang
71e4541c69 Merge branch 'master' into feature/diana/rubric-input 2013-01-23 08:56:55 -05:00
Jay Zoldak
26ee9a24ef Add test for TOC rendering 2013-01-22 15:15:47 -05:00
Deena Wang
7884e2c690 more tests 2013-01-22 15:08:44 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Calen Pennington
bbcab7314a Anonymous users don't have an email attribute, and shouldn't be checked for CourseEnrollmentAllowed 2013-01-22 14:10:01 -05:00
Deena Wang
3565023389 created test_courses.py 2013-01-22 14:01:01 -05:00
Deena Wang
6e773909e4 added test_views 2013-01-22 10:36:05 -05:00
Kevin Chugh
b26c59bda0 fix syntax error 2013-01-20 01:53:25 -05:00
Diana Huang
dd20226ec3 Merge branch 'master' into feature/diana/rubric-input 
Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 16:36:22 -05:00
Chris Dodge
0efd6e6a15 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-18 16:14:27 -05:00
Chris Dodge
550e805b74 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
 2013-01-18 15:44:41 -05:00
David Ormsbee
878640b651 Merge pull request #1316 from MITx/bugfix/victor/beta_testers 
fix tests--nosetests is overly excited about my code
 2013-01-18 12:43:11 -08:00
Victor Shnayder
1411bd1a88 fix tests--nosetests is overly excited about my code 2013-01-18 15:39:28 -05:00
Deena Wang
1565cd5bd3 Test cases for lms/djangoapps/courseware/module_render in test_module_render 2013-01-18 14:44:17 -05:00
David Ormsbee
bdc55d3686 Merge pull request #1308 from MITx/feature/rocha/sort-by-announcement-date 
Sort courses by announcement date
 2013-01-18 11:20:18 -08:00
ichuang
6d73a399b1 fix bug in instructor dashboard groups code 2013-01-18 14:04:01 -05:00
Your Name
b8e3cfcf96 added get_cohort_ids 2013-01-18 13:50:05 -05:00
Your Name
dba39e2431 add group support to lms 2013-01-18 12:50:25 -05:00
Chris Dodge
575ff02f8a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 
Conflicts:
	jenkins/test.sh
 2013-01-18 10:26:44 -05:00
Chris Dodge
c6276c8394 only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata 2013-01-17 23:58:07 -05:00
Carlos Andrés Rocha
ef69b738c9 Sort courses announcement date 
If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.

If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
 2013-01-17 21:46:58 -05:00
jmvt
bc268aa791 Merged to lastest master. 2013-01-17 17:39:12 -05:00
John Jarvis
08b8a9f674 Better help message for the force-gen option 2013-01-17 14:36:08 -05:00
Diana Huang
18a3d5e734 Merge branch 'master' into feature/diana/rubric-input 2013-01-17 14:00:43 -05:00
Chris Dodge
fcf92a371d fix up testing failures post merge 2013-01-17 09:48:10 -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
John Jarvis
e09728a3b2 Removing the unavailable tally 
It doesn't make sense to print out unavailable students
since it will go negative as students unenroll
 2013-01-16 17:48:46 -05:00
John Jarvis
52e387e029 Add the force flag 
This will allow you to force the certificate generation
for when certificate requests are lost and stuck in
'generating', this happens when we have xqueue issues.
 2013-01-16 17:44:19 -05:00
John Jarvis
44141b6a55 pep8 cleanup 2013-01-16 17:39:26 -05:00
John Jarvis
491027a814 Allow generation of certificates if they are in the generating state 2013-01-16 17:34:48 -05:00
David Ormsbee
fd20496a60 Merge pull request #1280 from MITx/feature/jth/attempts_reset 
Added 2 new instructor tools
 2013-01-16 13:48:26 -08:00
John Hess
f7f563db9b Use reverse() to lookup student progress page, use index to lookup module_state_key 2013-01-16 16:44:25 -05:00
jmvt
a9d3736cfb Replace all calls to analytics service to use the get methods (pulls from mongodb). Added error handling. 2013-01-16 15:09:54 -05:00
Victor Shnayder
9519087d84 Merge pull request #1271 from MITx/feature/victor/beta-testers 
Feature/victor/beta testers
 2013-01-16 06:50:57 -08:00
Diana Huang
8b3fb33fe3 Update tests to handle rubric scores 2013-01-16 09:47:54 -05:00
Diana Huang
9b2faa4987 Merge branch 'master' into feature/diana/rubric-input 2013-01-16 09:02:51 -05:00