Diana Huang
|
b5508b0123
|
Merge branch 'master' into tests/diana/update-oe-unit-tests
|
2013-01-29 17:36:54 -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 |
|
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 |
|
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 |
|
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 |
|
chrisndodge
|
163400e268
|
Merge pull request #1362 from MITx/feature/edz/revert-explicit-charset
Feature/edz/revert explicit charset
|
2013-01-27 15:29:54 -08:00 |
|
Victor Shnayder
|
1f6331161c
|
Update FAQ (LH #125)
|
2013-01-27 18:10:14 -05:00 |
|
Victor Shnayder
|
37a9dccbe7
|
Update media kit download (LH #168)
|
2013-01-27 17:50:53 -05:00 |
|
Victor Shnayder
|
d697c6b94c
|
Add associate legal counsel job description (LH #166)
|
2013-01-27 17:46:27 -05:00 |
|
Victor Shnayder
|
aee8c863cd
|
Make 'Students' link on FAQ page point to /help (LH #164)
|
2013-01-27 17:38:56 -05:00 |
|
e0d
|
c8e6bedc1a
|
add
|
2013-01-27 17:19:12 -05:00 |
|
e0d
|
6a7997f9ba
|
add
|
2013-01-27 17:19:00 -05:00 |
|
e0d
|
313eab90c3
|
add
|
2013-01-27 17:18:55 -05:00 |
|
David Ormsbee
|
fd8df0122e
|
Merge pull request #1361 from MITx/feature/victor/cohorts
Fix missing import
|
2013-01-27 07:20:59 -08:00 |
|
Victor Shnayder
|
c1f7b109d8
|
Fix missing import
|
2013-01-27 10:19:36 -05:00 |
|
chrisndodge
|
2b824c844a
|
Merge pull request #1360 from MITx/edz/feature/explicit-css-charset
adding explicit charset declaration to additional css
|
2013-01-26 18:44:16 -08:00 |
|
e0d
|
d747f54fc8
|
adding explicit charset declaration to additional css
|
2013-01-26 21:29:05 -05:00 |
|
e0d
|
956ccb06e9
|
explicitly set the domain for the csrf cookie to match the session domain.
|
2013-01-26 21:10:14 -05:00 |
|
David Ormsbee
|
eff5093cbf
|
Force charset for application.sass to be UTF-8
|
2013-01-26 14:38:49 -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
|
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 |
|
Diana Huang
|
ca0cb5b703
|
Merge branch 'master' into tests/diana/update-oe-unit-tests
|
2013-01-25 16:37:41 -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 |
|
Carlos Andrés Rocha
|
f35d4a16c3
|
Added one more year!
|
2013-01-25 13:31:23 -05:00 |
|
Diana Huang
|
115f6c3acf
|
Merge branch 'master' into tests/diana/update-oe-unit-tests
|
2013-01-25 11:19:38 -05:00 |
|