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

9654 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
Brian Wilson
09ab52bc94 fix log message in pearson import 2013-01-29 10:21:41 -05:00
Chris Dodge
5a4c0fb907 imports should have a marketing video. Treat it as a warning as every course might not have one. 2013-01-29 09:38:59 -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
Brian Wilson
bae2162fa0 add pearson_dump command. Modify rule for determining authorization transaction type. 2013-01-28 18:29:34 -05:00
John Jarvis
fba88db5fa Adding django-admin command for certificate_restriction 2013-01-28 15:10:35 -05:00
Victor Shnayder
734a8bd6e5 make tests pass with cms config as well as lms 2013-01-28 15:07:44 -05:00
Diana Huang
14d9633fa6 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests 2013-01-28 14:58:50 -05:00
Diana Huang
7d82b6cb0e Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-28 13:49:37 -05:00
John Jarvis
5d5642673c Add new field to disable certificate download 2013-01-28 12:58:02 -05:00
Brian Wilson
9cf0f0900b Fix Pearson unit tests. 2013-01-28 12:56:26 -05:00
Diana Huang
ffbda8a0be Update test 2013-01-28 11:52:15 -05:00
Diana Huang
1d4b674c79 Address code review feedback 2013-01-28 10:57:06 -05:00
Diana Huang
fe4dc7622e Updates to combined open ended tests 2013-01-28 10:18:01 -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
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
Diana Huang
8d6d9285f5 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-25 16:38:09 -05:00
Diana Huang
9f6afcb606 Add some more tests 2013-01-25 16:33:45 -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
Ned Batchelder
08acf43575 Don't store first_time_user any more, instead interested observers 
can examine whether .position is None or not.
 2013-01-25 15:49:29 -05:00
Victor Shnayder
00dd3ad9f8 Fix some of the test bugs. Still more to fix. 2013-01-25 15:40:13 -05:00
Diana Huang
a26006f7c3 Add new test for the CombinedOpenEndedModule 2013-01-25 15:09:01 -05:00
Diana Huang
5e34f38ca9 Better error handling. 2013-01-25 13:46:57 -05:00
Victor Shnayder
d453a6136b fix regexp 2013-01-25 13:42:04 -05:00
Diana Huang
47c24d8e7e Raise smarter exceptions when parsing rubrics. 2013-01-25 13:33:35 -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
Diana Huang
115f6c3acf Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-25 11:19:38 -05:00
Diana Huang
71d27def0d Fix tests and add new documentation 2013-01-25 11:18:30 -05:00
Ashley Penney
a54778551e This needs to be a list of strings. 2013-01-25 10:49:20 -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
Diana Huang
bb521a20b7 fix a bug caught with testing and update some tests 
(the last couple are still broken, though)
 2013-01-25 10:19:09 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
Diana Huang
bb60dde45e Add OpenEndedModule tests 2013-01-24 17:09:19 -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