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

3483 Commits

Author SHA1 Message Date
Kevin Chugh
fcbd4bd1cd produce and consume group_id from dropdowns 2013-02-02 05:46:11 -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
f2f7459656 remove more prints 2013-01-31 17:24:08 -05:00
Your Name
c25cd33214 remove print 2013-01-31 17:22:54 -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
Your Name
66e443ae63 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-01-30 15:18:45 -05: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
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
Your Name
043d962329 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-01-30 10:26:23 -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
David Ormsbee
c487e026f3 Merge pull request #1380 from MITx/press/bostonX 
BostonX press release
 2013-01-29 14:35:17 -08:00
Your Name
5bfd2c33b0 send cohort to post view context 2013-01-29 17:34:52 -05:00
Victor Shnayder
19c46d224f BostonX press release 2013-01-29 17:33:06 -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
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
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
Your Name
15a2890795 Merge branch 'master' into feature/marco/group 2013-01-29 15:05:38 -05:00
John Jarvis
3f740976bc Adding dashboard text for certificate restriction 2013-01-29 13:24:17 -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
chrisndodge
2e19de2d77 Merge pull request #1364 from MITx/bug/btalbot/lms-coursewaremenu 
LMS - added in additional JQUI accordion parameter...
 2013-01-28 10:32:41 -08:00
Brian Wilson
9cf0f0900b Fix Pearson unit tests. 2013-01-28 12:56:26 -05:00
Brian Talbot
ef3a124281 LMS - added in additional JQUI accordion parameter needed to display full height of active element in courseware sidebar 2013-01-28 11:13:21 -05:00
Diana Huang
1d4b674c79 Address code review feedback 2013-01-28 10:57:06 -05:00