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

1208 Commits

Author SHA1 Message Date
Diana Huang
8d64bfdbdb Update tests to handle rubric scores 2013-01-28 08:41:39 -05:00
Diana Huang
0852af3f35 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-28 08:28:39 -05:00
Victor Shnayder
c1f7b109d8 Fix missing import 2013-01-27 10:19:36 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
Victor Shnayder
00dd3ad9f8 Fix some of the test bugs. Still more to fix. 2013-01-25 15:40:13 -05:00
Victor Shnayder
66934ce220 Address Dave's comments on https://github.com/MITx/mitx/pull/1350 2013-01-25 13:33:19 -05:00
Diana Huang
115f6c3acf Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-25 11:19:38 -05:00
Diana Huang
3ec2a83ec1 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests 
Fix

Conflicts:
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-01-25 10:35:55 -05:00
Kevin Chugh
07c1999a95 prep for staging 2013-01-24 21:43:36 -05:00
Chris Dodge
1787157e00 put back the 'position' argument to get_module() which got accidentially - or so I think - dropped in a previous commit 2013-01-24 21:38:02 -05:00
Victor Shnayder
771a55a631 turn forums on in test.py 
- this may not be a good idea, but needed for testing cohorts for now...
 2013-01-24 18:35:34 -05:00
Victor Shnayder
d17aedf3b4 the reverse isn't working for some reason... need to figure it out 2013-01-24 18:08:51 -05:00
Victor Shnayder
0b7e7b35dc stub out django comment client test system 2013-01-24 17:33:40 -05:00
Chris Dodge
dfbe7dd4f9 fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict 2013-01-24 15:54:02 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes 
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
 2013-01-24 15:14:33 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
64f820828e whitespace 2013-01-24 15:12:53 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts 
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
 2013-01-24 15:12:53 -05:00
Victor Shnayder
ac8c59126d Add note about non-unique topic id across course runs bug 2013-01-24 15:12:53 -05:00
Kevin Chugh
def2d8adf2 fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable 2013-01-24 14:20:18 -05:00
Diana Huang
210cdf870e Updates to the mock peer grading service and new tests. 2013-01-24 09:41:24 -05:00
Diana Huang
dc3dd41aa7 Update tests to cover the peer grading service 2013-01-24 08:58:24 -05:00
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
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
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
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
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
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