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

489 Commits

Author SHA1 Message Date
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 2013-02-06 20:29:17 -05:00
Kevin Chugh
55c205b9b4 merged master 2013-02-06 17:13:52 -05:00
Victor Shnayder
92eb88d464 Merge pull request #1444 from MITx/feature/cale/dev-staticfiles 
Make local dev work by trying checking staticfiles_storage for both the ...
 2013-02-06 14:02:04 -08:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Calen Pennington
2302b40022 Fix static_replace tests 2013-02-06 10:33:36 -05:00
Calen Pennington
96eb16cd72 Make local dev work by trying checking staticfiles_storage for both the course_prefixed and non-course_prefixed urls 2013-02-06 10:08:20 -05:00
Christina Roberts
0d8cfb9baa Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404 
change from throwing a Http404 exception, which I believe will try to re...
 2013-02-05 13:36:28 -08:00
Chris Dodge
3fa1fe0cd6 change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404. 2013-02-05 16:26:07 -05:00
Diana Huang
120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule 
Feature/vik/peer grading xmodule
 2013-02-05 12:55:48 -08:00
Calen Pennington
0350d15e29 Make static_replace fall back to data_directory prefix, if it doesn't find the file anywhere else 2013-02-05 11:06:46 -05:00
Calen Pennington
90107fa88f Import cache function correctly 2013-02-05 11:06:46 -05:00
Calen Pennington
10f8dbfa46 Handle options passed to clear_collectstatic_cache 2013-02-05 11:06:46 -05:00
Calen Pennington
ae5d3cbc57 Add admin command to flush the staticfiles cache 2013-02-05 11:06:46 -05:00
Calen Pennington
8592db92bf Add more tests of static_replace 2013-02-05 11:06:46 -05:00
Calen Pennington
f1f2bd8fd2 Start adding tests for static replacement 2013-02-05 11:06:46 -05:00
Calen Pennington
ba7bd9022b Replace the correct /course/ urls, rather than /courses/ 2013-02-05 11:06:46 -05:00
Calen Pennington
0da1467a90 Pull out missing variable 2013-02-05 11:06:46 -05:00
Calen Pennington
88fc2e3756 Fix unbalanced paren in regex 2013-02-05 11:06:45 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Vik Paruchuri
bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule 
Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py
 2013-02-04 17:55:55 -05:00
Vik Paruchuri
c6c89e4216 Make peer grading xmodule work with notifications 2013-02-04 13:16:05 -05:00
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -05:00
Your Name
da1660a043 fix get_cohorted_commentables 2013-01-31 17:34:37 -05:00
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -05:00
Your Name
1fc26de945 merge master 2013-01-30 15:19:43 -05:00
David Ormsbee
fecad2a3e1 Merge pull request #1382 from MITx/feature/brian/pearson-status 
pearson_dump: prettify, add missing error, provide default filename
 2013-01-30 09:55:45 -08:00
Brian Wilson
a6a58d0e2a pearson_dump: prettify, add missing error, provide default filename 2013-01-30 12:15:12 -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
David Ormsbee
0a1f5bc154 Merge pull request #1368 from MITx/feature/brian/pearson-status 
add pearson_dump command.
 2013-01-29 08:19:41 -08:00
Brian Wilson
15a11e9cb7 add validation of accommodation codes 2013-01-29 11:16:23 -05:00
Brian Wilson
69ff879e95 add more validation for countries 2013-01-29 10:41:41 -05:00
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
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
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
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
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
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