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

14265 Commits

Author SHA1 Message Date
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
Deena Wang
f9b0ec37cd more tests in test_views, needs templates to continue 2013-01-24 16:08:19 -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
Deena Wang
9663973038 more tests for courseware/views 2013-01-24 14:59:46 -05:00
Calen Pennington
592d044864 Fix more tests 2013-01-24 14:37:46 -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
Calen Pennington
9a3e122a48 Fix a few failing tests 2013-01-24 14:04:03 -05:00
Ned Batchelder
ac9d162d86 Fix a failing test. Pennington's Law strikes again. 2013-01-24 13:07:55 -05:00
Deena Wang
d81b031624 Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-01-24 10:05:04 -05:00
Deena Wang
61e12f57e7 experimenting with creating a course 2013-01-24 09:59:33 -05:00
Jay Zoldak
4d469fd9f7 Add test for jump_to. 2013-01-24 09:55:24 -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
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