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

3492 Commits

Author SHA1 Message Date
e0d
969737c58e service variant code for loading different config 2013-01-31 21:43:35 -05:00
Brian Talbot
f6cd4c75b8 lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling 2013-01-31 18:15:20 -05:00
Jay Zoldak
6fe209b0cf Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests 
New tests for OpenEndedGrading
 2013-01-31 08:34:06 -08:00
Diana Huang
32524727ce Create a test framework and make it so that we force a mock backend 
when we don't have an ajax url
 2013-01-31 09:00:06 -05:00
Victor Shnayder
bc1452f288 Merge pull request #1390 from MITx/press/7.00x 
7.00x press release
 2013-01-30 15:35:51 -08:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Diana Huang
36d8b8768c Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-30 16:41:18 -05:00
Victor Shnayder
0353cb98e1 7.00x press release 2013-01-30 16:07:47 -05:00
Victor Shnayder
f2944334ab Merge pull request #1387 from MITx/feature/zoldak/courseware-unit-tests 
Add unit tests for lms courseware access
 2013-01-30 12:51:50 -08:00
Calen Pennington
ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic 
Don't run collectstatic on course content
 2013-01-30 12:07:47 -08:00
Jay Zoldak
91b8a95ed7 Add unit tests for lms courseware access 2013-01-30 15:03:43 -05:00
John Jarvis
e7e16b94d8 FAQ update for the embargo restriction 2013-01-30 13:51:14 -05:00
John Jarvis
d52a619d74 Updating FAQ text 2013-01-30 13:02:42 -05:00
chrisndodge
67775fbfa9 Merge pull request #1377 from MITx/feature/christina/misc 
Bug fixes for problem progress not updating.
 2013-01-30 08:24:38 -08:00
David Ormsbee
d0ea29358a Merge pull request #1381 from MITx/press/bostonX 
fix copy+paste bug.
 2013-01-30 07:48:22 -08:00
Victor Shnayder
99dd9636ce fix copy+paste bug. 2013-01-30 10:43:36 -05:00
Christina Roberts
fd4b3f9489 Merge pull request #1332 from MITx/fix/cdodge/unit-test-of-draft-store 
add unit test to test DraftModuleStore.get_items() fix
 2013-01-30 06:49:53 -08:00
Chris Dodge
dbf15fc2ac add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id 2013-01-30 09:46:38 -05:00
cahrens
3c1c61fb19 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-30 09:23:07 -05:00
Calen Pennington
2854d7d066 Point course_image.jpg at the correct place in the /static url space 2013-01-30 09:12:50 -05:00
Calen Pennington
07487a8d8f Use descriptor when setting up replace_urls, as it's been created at that point 2013-01-30 09:12:50 -05:00
Calen Pennington
e773b8e7b1 Fix import error 2013-01-30 09:12:50 -05:00
Calen Pennington
95f2c9e275 Standardize how static urls are replaced by modules in their own html 2013-01-30 09:12:50 -05:00
Calen Pennington
89f984c08b Prefix courseware urls with /static, since they are no longer served through collectstatic 2013-01-30 09:12:50 -05:00
Calen Pennington
d132f2e18a Only put data repos in STATICFILES_DIRS if we're serving them from django (which is only in dev) 2013-01-30 09:12:50 -05:00
Diana Huang
b5508b0123 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-29 17:36:54 -05:00
David Ormsbee
c487e026f3 Merge pull request #1380 from MITx/press/bostonX 
BostonX press release
 2013-01-29 14:35:17 -08:00
Victor Shnayder
19c46d224f BostonX press release 2013-01-29 17:33:06 -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
jarv
0b9262a478 Merge pull request #1378 from MITx/feature/jarv/certificate-restriction 
Minor update to embargo text
 2013-01-29 13:48:05 -08:00
John Jarvis
615e6da2f4 Minor update to embargo text 2013-01-29 16:47:09 -05: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
Diana Huang
efc572c24d Fix navigation jasmine tests 2013-01-29 14:36:27 -05:00
John Jarvis
3f740976bc Adding dashboard text for certificate restriction 2013-01-29 13:24:17 -05:00
Diana Huang
3f4c45468f Fix courseware jasmine tests 2013-01-29 11:36:10 -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
Victor Shnayder
37b82a66eb Merge pull request #1363 from MITx/marketing/victor 
Marketing/victor
 2013-01-29 08:12:33 -08: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
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