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

14265 Commits

Author SHA1 Message Date
Vik Paruchuri
b0599ea133 Fix queries and some controller query stuff 2013-01-29 19:30:03 -05:00
Vik Paruchuri
2191f3e228 Add in open ended problems view 2013-01-29 19:30:03 -05:00
Vik Paruchuri
fe77bb00c4 Fix naming for overall need to check 2013-01-29 19:25:56 -05:00
Vik Paruchuri
5e63a4690b Work on getting combined notifications 2013-01-29 19:25:56 -05:00
Vik Paruchuri
d28228639e Add in controller query stuff 2013-01-29 19:25:56 -05:00
Vik Paruchuri
c62ce7822e Add in service support for getting the grading status list 2013-01-29 19:23:36 -05:00
Vik Paruchuri
43783e4ff0 Add in an item to check for combined notifications 2013-01-29 19:23:36 -05:00
Vik Paruchuri
7b65f56121 Add service to query controller for eta of submission and to check if name is unique 2013-01-29 19:23:36 -05:00
Your Name
5bfd2c33b0 send cohort to post view context 2013-01-29 17:34:52 -05:00
Your Name
43d4661c3f Merge branch 'master' into feature/kevin/groups_ui_changes 2013-01-29 17:23:29 -05:00
Your Name
3404011f16 update front end to support selection and display of cohort ids 2013-01-29 17:23:08 -05:00
David Ormsbee
40d59faa68 Merge pull request #1330 from MITx/diana/open-ended-ui-updates 
Rubric Integration and other UI improvements
 2013-01-29 14:10:18 -08:00
Diana Huang
f7424eb8d6 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-29 16:44:15 -05:00
cahrens
26cb1c5a25 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-29 16:30:41 -05:00
jarv
877f757f94 Merge pull request #1369 from MITx/feature/jarv/certificate-restriction 
Feature/jarv/certificate restriction
 2013-01-29 13:14:41 -08:00
Jay Zoldak
1a398980d0 Add tests for diango-comment-client middleware 2013-01-29 14:47:05 -05:00
Jay Zoldak
053547453e Add tests for django-comment-client models 2013-01-29 14:45:35 -05:00
Jay Zoldak
d81da9df4d Add tests for django comment client mustache helpers 2013-01-29 14:44:37 -05:00
Jay Zoldak
593b038780 Add tests for django-comment-client helpers 2013-01-29 14:43:28 -05:00
Jay Zoldak
1f049410ae Add tests for django comment client utils 2013-01-29 14:34:02 -05:00
Deena Wang
4f58e9c177 Merge branch 'master' into feature/deena/testing to get factory files 2013-01-29 14:33:54 -05:00
Jay Zoldak
e745087455 Fix permissions bug and add test cases for django comment client permissions. 2013-01-29 14:30:15 -05:00
Deena Wang
d9fdccb567 testing testing tests 2013-01-29 14:23:55 -05:00
Victor Shnayder
39a9c47512 make links look like links 2013-01-29 11:33:26 -05:00
John Jarvis
a9ee71fffc Adding section on eligibility 2013-01-29 11:26:55 -05:00
John Jarvis
3a6d45e716 Grade a student even if they are on the restricted list 2013-01-29 11:13:30 -05:00
John Jarvis
4b0999939b Adding docstring to CertificateWhitelist model 2013-01-29 10:26:21 -05:00
John Jarvis
415ebec879 renaming whitelist to is_whitelisted 2013-01-29 10:24:29 -05:00
John Jarvis
dbc0f353c5 cert_status temporary assignment removed 2013-01-29 10:22:58 -05:00
John Jarvis
e9722b259b Removing whitespace 2013-01-28 19:29:53 -05:00
John Jarvis
e81394c2b0 Adding new model for certificate whitelist 2013-01-28 19:29:13 -05:00
John Jarvis
666828f71a Command for certificate whitelist 2013-01-28 19:28:47 -05:00
John Jarvis
7e033d0265 django command for certificate restriction 2013-01-28 19:28:24 -05:00
Deena Wang
7918c35414 fixing up tests 2013-01-28 15:29:55 -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
1d4b674c79 Address code review feedback 2013-01-28 10:57:06 -05:00
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
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
47c24d8e7e Raise smarter exceptions when parsing rubrics. 2013-01-25 13:33:35 -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
Deena Wang
583505b95b test_courses.py 2013-01-25 12:19:16 -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