Calen Pennington
|
dce65f2ab7
|
Merge pull request #1404 from MITx/feature/edz/service-variant
service variant code for loading different config
|
2013-02-01 06:49:51 -08:00 |
|
e0d
|
969737c58e
|
service variant code for loading different config
|
2013-01-31 21:43:35 -05:00 |
|
David Ormsbee
|
a89503431f
|
Merge pull request #1403 from MITx/style/btalbot/lms-calendartables
lms - syllabus/calendar table styling fixes
|
2013-01-31 15:17:38 -08: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 |
|
Don Mitchell
|
aad5015a82
|
Merge pull request #1398 from MITx/feature/christina/misc2
Fixes date bug (#149).
|
2013-01-31 10:59:07 -08:00 |
|
Don Mitchell
|
fbd9a126ba
|
Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs
add exporting of course info
|
2013-01-31 10:55:45 -08:00 |
|
Christina Roberts
|
5f170d118f
|
Merge pull request #1395 from MITx/bug/dhm/mar13
Remove format field as it's the one for grading type.
|
2013-01-31 10:51:44 -08:00 |
|
Jay Zoldak
|
c590c24e25
|
Add vendor files to files.json for the cms jasmine tests to work.
|
2013-01-31 13:48:38 -05:00 |
|
cahrens
|
b613bdc336
|
Fixes date bug (#149).
|
2013-01-31 13:37:45 -05:00 |
|
Don Mitchell
|
f257f12124
|
Meant to add the file here
|
2013-01-31 12:56:18 -05:00 |
|
Don Mitchell
|
6491363647
|
Remove format field as it's the one for grading type.
|
2013-01-31 12:11:11 -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 |
|
Chris Dodge
|
ab9d30cbc6
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs
|
2013-01-31 10:51:24 -05:00 |
|
Chris Dodge
|
fc57e7afdb
|
add testing for course info export. Plus DRY things out a bit
|
2013-01-31 10:51:20 -05:00 |
|
Chris Dodge
|
0d20c192b9
|
add exporting of course info
|
2013-01-31 09:57:07 -05: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 |
|
Diana Huang
|
8144a1dfaf
|
Add in next_problem jasmine tests
|
2013-01-30 17:25:13 -05:00 |
|
Calen Pennington
|
76b367e062
|
Merge pull request #1388 from MITx/bug/dhm/mar13
Swallow event calls to squash 404 errors (and remove an unused var in
|
2013-01-30 14:10:02 -08:00 |
|
Don Mitchell
|
756a071634
|
misspelled request (altho as an unused identifier)
|
2013-01-30 17:08:21 -05: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 |
|
Diana Huang
|
6322263c90
|
New Jasmine tests
|
2013-01-30 16:40:55 -05:00 |
|
Victor Shnayder
|
0353cb98e1
|
7.00x press release
|
2013-01-30 16:07:47 -05:00 |
|
Diana Huang
|
e873da76d5
|
Wrap reload to allow us to mock it. Add in some polling testing.
|
2013-01-30 16:01:28 -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 |
|
chrisndodge
|
676e80bd9d
|
Merge pull request #1389 from MITx/fix/cdodge/export-static-tabs
add new tab file
|
2013-01-30 12:26:12 -08:00 |
|
Chris Dodge
|
a9da761b18
|
add new tab file
|
2013-01-30 15:25:00 -05:00 |
|
Don Mitchell
|
85faab1dc6
|
Swallow event calls to squash 404 errors (and remove an unused var in
another function)
|
2013-01-30 15:18:51 -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 |
|
Jay Zoldak
|
91b8a95ed7
|
Add unit tests for lms courseware access
|
2013-01-30 15:03:43 -05:00 |
|
Carlos Andrés Rocha
|
7a8e87c789
|
Merge pull request #1385 from MITx/feature/jarv/certificate-restriction
FAQ update for the embargo restriction
|
2013-01-30 10:56:15 -08:00 |
|
Christina Roberts
|
54c1fe9c67
|
Merge pull request #1384 from MITx/fix/cdodge/export-static-tabs
adding exporting of tabs and custom_tags. Also added unit tests
|
2013-01-30 10:52:31 -08:00 |
|
John Jarvis
|
e7e16b94d8
|
FAQ update for the embargo restriction
|
2013-01-30 13:51:14 -05:00 |
|
Chris Dodge
|
cc09a90245
|
DRY things up a bit
|
2013-01-30 13:50:30 -05:00 |
|
Chris Dodge
|
c676046341
|
adding exporting of tabs and custom_tags. Also added unit tests
|
2013-01-30 13:25:17 -05:00 |
|
David Ormsbee
|
f295dae34e
|
Merge pull request #1383 from MITx/feature/jarv/certificate-restriction
Updating FAQ text
|
2013-01-30 10:06:43 -08:00 |
|
John Jarvis
|
d52a619d74
|
Updating FAQ text
|
2013-01-30 13:02:42 -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 |
|
Christina Roberts
|
91b3a220b8
|
Merge pull request #1367 from MITx/fix/cdodge/static-tab-reordering
support reordering of static tabs in studio
|
2013-01-30 08:51:36 -08:00 |
|
Chris Dodge
|
7f32aae47d
|
rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability
|
2013-01-30 11:50:11 -05:00 |
|
Chris Dodge
|
e5115953ad
|
rework redorder tabs so that we account for the fact that static tabs can be in any arbitrary order (with respect to non-static tabs) when working with an imported course
|
2013-01-30 11:36:28 -05:00 |
|
Christina Roberts
|
8720d1ac3a
|
Merge pull request #1379 from MITx/bug/dhm/grading
Catch save error and throw it in the user's face (bug 147).
|
2013-01-30 08:34:32 -08:00 |
|
Don Mitchell
|
19927a83a5
|
Ensure settings and course info CRUD operations tell the user if there's
a server error and pull the server error handler into a common function.
|
2013-01-30 11:24:55 -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 |
|
Diana Huang
|
b38595f115
|
Fix the fixtures, add new tests, remove useless code
from the original JS
|
2013-01-30 10:50:47 -05: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 |
|