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

2715 Commits

Author SHA1 Message Date
John Jarvis
0f39e04697 Adding certificate restriction lookup 
If certificate status is 'restricted' the grade
and survey link will be shown, the download link will not
 2013-01-29 10:27:53 -05:00
John Jarvis
289301e0ea adding more to help string 2013-01-28 19:38:51 -05:00
John Jarvis
0c43e69c00 command for certificate restriction (embargoed countries) 2013-01-28 19:30:40 -05:00
John Jarvis
7e033d0265 django command for certificate restriction 2013-01-28 19:28:24 -05:00
John Jarvis
fba88db5fa Adding django-admin command for certificate_restriction 2013-01-28 15:10:35 -05:00
John Jarvis
5d5642673c Add new field to disable certificate download 2013-01-28 12:58:02 -05:00
Victor Shnayder
46570b01ef refactor tests, add test for is_commentable_cohorted, fix a bug 2013-01-26 13:49:12 -05:00
Victor Shnayder
439acf2df7 Fix docstring and test for get_cohort 
Returns None if course isn't cohorted, even if cohorts exist.  Shouldn't happen on prod, but could if cohorting is turned off mid-course.
 2013-01-26 13:06:09 -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
David Ormsbee
c07917d918 Merge pull request #1354 from MITx/feature/ichuang/fix-flashing-background-in-video 
fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes
 2013-01-25 13:55:16 -08:00
David Ormsbee
ca28796a86 Merge pull request #1345 from MITx/feature/apenney/pearson-merge 
Pearson export/import code. (No merging before 25th Jan)
 2013-01-25 13:54:55 -08:00
ichuang
c56982e6f0 fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes 2013-01-25 16:45:16 -05:00
Victor Shnayder
87e92644b6 Make all tests pass 
caveat: with a bit of hackery.  Need to do better testing once things are live.
 2013-01-25 16:13:55 -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
d453a6136b fix regexp 2013-01-25 13:42:04 -05:00
Victor Shnayder
76c4730532 whitespace 2013-01-25 13:33:25 -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
Don Mitchell
e58193f87f Updated comment 2013-01-25 13:03:54 -05:00
Victor Shnayder
3d303518eb Remove old user replication code. 
- we don't use it, and if we do want to change the arch, we should have a proper central user info service.
 2013-01-25 12:51:34 -05:00
Don Mitchell
45393ac6f8 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-25 12:46:09 -05:00
Don Mitchell
5ef3f3ee66 Update jquery ui. Overrode draggable w/ an in place fix for scroll 
racing condition.
 2013-01-25 12:44:58 -05:00
Ashley Penney
a54778551e This needs to be a list of strings. 2013-01-25 10:49:20 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
Jay Zoldak
896933a3c4 Fix broken IE 2013-01-24 17:02:18 -05:00
Victor Shnayder
69711a91ff Fix inline discussion cohorting, debug logging 2013-01-24 16:58:19 -05:00
Brian Wilson
872f4b6c13 fix handling of rejected accommodations 2013-01-24 16:37:02 -05:00
Victor Shnayder
fb7614a81c oops--fix logging bug 2013-01-24 15:47:41 -05:00
Victor Shnayder
ea3aebdfe5 add logging, explicit check whether course is cohorted 2013-01-24 15:46:22 -05:00
Victor Shnayder
103db8aaf3 add conflict detection--users should be in at most one cohort per course 2013-01-24 15:14:34 -05:00
Victor Shnayder
3bfe9decf4 Change config keys to use underscores for consistency with other policy keys 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -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
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
0d41a04490 fix line length 2013-01-24 15:12:52 -05:00
Victor Shnayder
3488083e6b Add a get_course_cohorts function and test 2013-01-24 15:12:52 -05:00
Victor Shnayder
90a5703419 Test for cohort config 2013-01-24 15:12:52 -05:00
Victor Shnayder
f005b70f3b Minor test cleanups 2013-01-24 15:12:52 -05:00
Victor Shnayder
fa17913a91 is_cohorted course descriptor property, docs 2013-01-24 15:12:52 -05:00
Victor Shnayder
1b9a3557eb get_cohort() function and test 2013-01-24 15:12:52 -05:00
Victor Shnayder
0e78eaaf80 Add a course_groups djangoapp with a CourseUserGroup model. 2013-01-24 15:12:52 -05:00
Victor Shnayder
c655f62f7a Remove out-of-date text about user replication, askbot 2013-01-24 15:12:51 -05:00
Brian Wilson
4f37ea9149 add --create_dummy_exam option to pearson_make_tc_registration 2013-01-24 14:45:31 -05:00
Brian Wilson
cb2d8db57c store files in S3 bucket in separate directories by mode 2013-01-24 12:46:00 -05:00
Brian Wilson
20db3841cb Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 12:42:01 -05:00
David Ormsbee
e074c629fc Merge pull request #1344 from MITx/bugfix/brian/pearson-reg-end-date 
add UTC time to registration end date
 2013-01-24 09:27:11 -08:00
Brian Wilson
1199b1ecfa debug pearson import and update unit tests 2013-01-24 09:42:25 -05:00
Brian Wilson
d395c4448d add more pearson tests, and update commands in response 2013-01-24 09:42:25 -05:00
Brian Wilson
740d0403e9 change name of function back to get_testcenter_registration, and disable its use as a test 2013-01-24 09:42:25 -05:00
Brian Wilson
f4703b40cb add test-with-settings 2013-01-24 09:42:25 -05:00