Diana Huang
|
f1973dc660
|
minor update to new jasmine test
|
2013-01-29 17:34:54 -05:00 |
|
Diana Huang
|
f7424eb8d6
|
Merge branch 'master' into tests/diana/update-oe-unit-tests
|
2013-01-29 16:44:15 -05:00 |
|
Jay Zoldak
|
3669ea5c97
|
Merge pull request #1375 from MITx/diana/fix-requirejs-jasmine-xmodule
Add missing requirejs for xmodule jasmine tests
|
2013-01-29 13:26:36 -08:00 |
|
Calen Pennington
|
cb66ac7192
|
Merge pull request #1376 from MITx/fix/zoldak/cms-requirejs
Add RequireJS.js to files.json so that the cms jasmine tests will run
|
2013-01-29 13:26:02 -08:00 |
|
Jay Zoldak
|
c3eba0d2da
|
Add RequireJS.js to files.json so that the cms jasmine tests will run without erroring when importing RequireJS.
|
2013-01-29 16:22:37 -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
|
cb77209d3c
|
Add missing requirejs for xmodule jasmine tests
|
2013-01-29 16:09:27 -05:00 |
|
Diana Huang
|
585f1c41d6
|
New jasmine tests for combined open ended problems.
|
2013-01-29 16:04:43 -05:00 |
|
Christina Roberts
|
424cfd3cd7
|
Merge pull request #1372 from MITx/feature/dhm/drag
Auto expand on hover of drag&drop unit
|
2013-01-29 12:10:38 -08:00 |
|
Don Mitchell
|
574d6e8e28
|
Simple zIndex rather than fancy stack works best.
|
2013-01-29 15:00:49 -05:00 |
|
Diana Huang
|
efc572c24d
|
Fix navigation jasmine tests
|
2013-01-29 14:36:27 -05:00 |
|
Don Mitchell
|
63d269acf1
|
draggable is not the collapsed item :-( but ui.helper seems to be.
|
2013-01-29 14:31:14 -05:00 |
|
Don Mitchell
|
87d8598abe
|
subsection drag
|
2013-01-29 13:43:58 -05:00 |
|
John Jarvis
|
3f740976bc
|
Adding dashboard text for certificate restriction
|
2013-01-29 13:24:17 -05:00 |
|
Don Mitchell
|
b3d7dc779d
|
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
|
2013-01-29 13:17:15 -05:00 |
|
Don Mitchell
|
5fcb6bfcd4
|
Remove debug code
|
2013-01-29 13:16:21 -05:00 |
|
Don Mitchell
|
ba95cf2385
|
Auto expand on hover of drag&drop unit
|
2013-01-29 13:10:23 -05:00 |
|
Diana Huang
|
3f4c45468f
|
Fix courseware jasmine tests
|
2013-01-29 11:36:10 -05:00 |
|
David Ormsbee
|
a98c924d47
|
Merge pull request #1371 from MITx/victor/cohorts-tweaks
make links look like links
|
2013-01-29 08:35:07 -08: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 |
|
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 |
|
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 |
|
Brian Wilson
|
69ff879e95
|
add more validation for countries
|
2013-01-29 10:41:41 -05:00 |
|
Don Mitchell
|
17930e4186
|
Merge pull request #1370 from MITx/feature/cdodge/add-course-about-video-to-xlint
imports should have a marketing video. Treat it as a warning as every co...
|
2013-01-29 07:37:14 -08: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 |
|
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 |
|
Brian Wilson
|
09ab52bc94
|
fix log message in pearson import
|
2013-01-29 10:21:41 -05:00 |
|
Chris Dodge
|
5a4c0fb907
|
imports should have a marketing video. Treat it as a warning as every course might not have one.
|
2013-01-29 09:38:59 -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
|
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 |
|
Brian Wilson
|
bae2162fa0
|
add pearson_dump command. Modify rule for determining authorization transaction type.
|
2013-01-28 18:29:34 -05:00 |
|
Jay Zoldak
|
a0ccba6bf8
|
Merge pull request #1366 from MITx/bugfix/victor/fix-cohorts-test-in-cms
make tests pass with cms config as well as lms
|
2013-01-28 12:13:53 -08: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 |
|
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 |
|
Jay Zoldak
|
64a4dea429
|
Merge pull request #1365 from MITx/bugfix/brian/pearson-unittest
Fix Pearson unit tests.
|
2013-01-28 10:27:14 -08: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 |
|
Ashley Penney
|
d1e5632880
|
Remove the specific version of ruby here because it's breaking the dev scripts amongst other things.
|
2013-01-28 12:51:05 -05:00 |
|