Brian Talbot
|
b456281a8f
|
studio - soft landing/nav: added in functionality/content to soft landing view and started punch list
|
2013-02-05 11:34:28 -05:00 |
|
Brian Talbot
|
1144b0eeed
|
studio - soft landing UI: initial header and templating work
|
2013-02-03 22:22:11 -05:00 |
|
Brian Talbot
|
83ad950887
|
studio - revised course nav: plumbed in current html and scss progress into header
|
2013-02-01 20:48:59 -05:00 |
|
Brian Talbot
|
d0d0296310
|
studio - revising course-based navigation - initial scss setup
|
2013-02-01 19:57:17 -05:00 |
|
VikParuchuri
|
01fab2ec68
|
Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes
Feature/vik/combined xmodule changes
|
2013-02-01 15:46:33 -08:00 |
|
Vik Paruchuri
|
9310dcbe0d
|
Remove reload test
|
2013-02-01 18:31:50 -05:00 |
|
Vik Paruchuri
|
b609bbeeed
|
Fix JS tests
|
2013-02-01 15:36:05 -05:00 |
|
John Jarvis
|
1c09d9cacb
|
For prod environments only log info and up
|
2013-02-01 13:34:29 -05:00 |
|
John Jarvis
|
8b01298969
|
Removing duplicate loggers
|
2013-02-01 13:11:14 -05:00 |
|
John Jarvis
|
4a08bc7759
|
Adding service_variant and a little pep8 cleanup
|
2013-02-01 13:10:26 -05:00 |
|
Ned Batchelder
|
6b6d8a94d0
|
Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems.
|
2013-02-01 10:50:01 -05:00 |
|
Vik Paruchuri
|
c4b9288c6d
|
Add comment describing why commented out code is there
|
2013-02-01 09:32:29 -05:00 |
|
Vik Paruchuri
|
78dda49764
|
Fix jasmine tests?
|
2013-02-01 09:28:52 -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 |
|
Vik Paruchuri
|
c5e80b9543
|
Fix open ended module tests
|
2013-01-31 17:34:33 -05:00 |
|
Vik Paruchuri
|
d6f8def733
|
Move over rubric parsing logic to rubric module
|
2013-01-31 17:18:32 -05:00 |
|
Vik Paruchuri
|
5eff483c76
|
Fix max score in combined xmodule tests
|
2013-01-31 17:08:13 -05:00 |
|
Vik Paruchuri
|
524047a11e
|
Fix key error in open ended child
|
2013-01-31 17:06:37 -05:00 |
|
Vik Paruchuri
|
01cdc6e7f8
|
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
|
2013-01-31 16:50:10 -05: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 |
|
Vik Paruchuri
|
a61746609c
|
Fix keyerror
|
2013-01-31 12:18:42 -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 |
|
Vik Paruchuri
|
ee06afcb27
|
Possibly fix self assessment tests
|
2013-01-31 11:06:12 -05: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
|
8144a1dfaf
|
Add in next_problem jasmine tests
|
2013-01-30 17:25:13 -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 |
|
Vik Paruchuri
|
2ba194a4f6
|
Change step names to human names
|
2013-01-30 16:44:40 -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 |
|
Vik Paruchuri
|
46101587b5
|
Add in some comments
|
2013-01-30 16:27:21 -05:00 |
|
Vik Paruchuri
|
afd42fc1dc
|
Fix some image okay problems
|
2013-01-30 16:22:35 -05:00 |
|
Vik Paruchuri
|
f3572c7193
|
Fix image checking logic
|
2013-01-30 16:13:24 -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 |
|
Vik Paruchuri
|
34bb0423d7
|
Reset default values
|
2013-01-30 15:57:10 -05:00 |
|
Vik Paruchuri
|
efe250f912
|
Fix logic, make better error messages
|
2013-01-30 15:55:33 -05:00 |
|
Vik Paruchuri
|
9fd36056d5
|
Fix some of the return logic, add better error messages
|
2013-01-30 15:51:06 -05:00 |
|
Vik Paruchuri
|
c6a81371e4
|
Add in some more docs
|
2013-01-30 15:37:48 -05:00 |
|
Vik Paruchuri
|
7911375603
|
Add in ability to submit an image URL
|
2013-01-30 15:31:28 -05: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 |
|
Vik Paruchuri
|
ac6f84ff2d
|
Allow url submissions instead of images
|
2013-01-30 15:17:47 -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 |
|
Vik Paruchuri
|
99ecc784f0
|
Fix skin tone check
|
2013-01-30 14:53:27 -05:00 |
|
Vik Paruchuri
|
3389802d8d
|
Fix logic in get_skin_ratio
|
2013-01-30 14:46:10 -05:00 |
|
Vik Paruchuri
|
da5ce144a9
|
Fix var names, remove debug statements
|
2013-01-30 14:42:56 -05:00 |
|
Vik Paruchuri
|
68c99192d2
|
Add some docstrings for image class
|
2013-01-30 14:40:29 -05:00 |
|
Vik Paruchuri
|
f729bf3bb6
|
Fix error message
|
2013-01-30 14:36:29 -05:00 |
|
Vik Paruchuri
|
1f221133d2
|
Remove skin tone check
|
2013-01-30 14:27:12 -05:00 |
|