Don Mitchell
|
c2f0ea49bd
|
Hopefully fixed yamls for markdown
|
2013-01-07 12:32:54 -05:00 |
|
cahrens
|
75b9740932
|
Update for Don's change.
|
2013-01-07 12:08:34 -05:00 |
|
cahrens
|
e296d52c7d
|
merge
|
2013-01-07 12:06:12 -05:00 |
|
cahrens
|
be07c7f86f
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-07 12:01:54 -05:00 |
|
cahrens
|
bf2a945a6c
|
Starting to add toolbar items.
|
2013-01-07 12:01:12 -05:00 |
|
Don Mitchell
|
42246142dd
|
Numerical response now works and round tripping works.
|
2013-01-07 11:50:37 -05:00 |
|
Jay Zoldak
|
0e9cf17b82
|
Merge pull request #1232 from MITx/feature/christina/misc
Feature/christina/misc
|
2013-01-07 08:43:48 -08:00 |
|
cahrens
|
c443cd83fa
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-07 11:17:05 -05:00 |
|
Don Mitchell
|
12abdbce73
|
Added 'has_markdown' property to templates in unit.html so that we can
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
|
2013-01-07 10:55:10 -05:00 |
|
cahrens
|
b108435a32
|
Make xmodule Jasmine tests fail build.
|
2013-01-07 10:51:32 -05:00 |
|
cahrens
|
4740965413
|
Skip tests instead of commenting them out (for merge that is coming).
|
2013-01-07 10:49:10 -05:00 |
|
Carlos Andrés Rocha
|
60f5089941
|
Merge pull request #1231 from MITx/content/rocha/job-page-update
Fix typos in job and faq pages
|
2013-01-07 07:31:48 -08:00 |
|
cahrens
|
9ec658cf7d
|
Skip tests that aren't passing. This is a few capa test points, all of sequence, and all video tests.
|
2013-01-07 10:25:42 -05:00 |
|
Carlos Andrés Rocha
|
56f1c6aad9
|
Fixed extra characters in faq page
|
2013-01-07 10:14:00 -05:00 |
|
Robert Chirwa
|
faa2373256
|
Fix typo in the job page
Signed-off-by: Carlos Andrés Rocha <rocha@edx.org>
|
2013-01-07 10:08:16 -05:00 |
|
cahrens
|
534c294e08
|
Merge branch 'feature/cale/cms-master' into feature/christina/misc
|
2013-01-07 09:59:42 -05:00 |
|
cahrens
|
ab1173cfdc
|
Merge with cms-master.
|
2013-01-07 09:59:08 -05:00 |
|
chrisndodge
|
7ced6b5e68
|
Merge pull request #1222 from MITx/feature/cale/cms-master-merge
Feature/cale/cms master merge
|
2013-01-07 06:54:57 -08:00 |
|
Diana Huang
|
2293a37f7d
|
Move over old Staff Grading tests to new app.
|
2013-01-07 09:17:09 -05:00 |
|
Brian Talbot
|
6b8944ad6b
|
studio - section expanding/collapsing UI - wip
|
2013-01-07 09:07:40 -05:00 |
|
Brian Wilson
|
e57656e24f
|
Add TestCenterExam class to course module, and plumb through.
|
2013-01-06 17:57:13 -05:00 |
|
cahrens
|
05428f5b07
|
Comment out markdown in optionresponse.yaml, hook up toXML method.
|
2013-01-05 15:08:09 -05:00 |
|
cahrens
|
164d8a50f1
|
Move toXML code into edit.coffee, create unit test scaffolding.
|
2013-01-05 14:39:58 -05:00 |
|
cahrens
|
96bad91353
|
Comment out Jasmine tests that are failing.
|
2013-01-05 14:07:34 -05:00 |
|
cahrens
|
65ee5105e2
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-05 13:16:44 -05:00 |
|
ichuang
|
9a0d85667c
|
symmath use https, no server cert verify
|
2013-01-05 12:29:03 -05:00 |
|
ichuang
|
bf3669395b
|
update symmath snuggletex server
|
2013-01-05 12:29:00 -05:00 |
|
Brian Wilson
|
ea8a56da0a
|
add id generation and validation
|
2013-01-04 18:45:46 -05:00 |
|
Diana Huang
|
e410703e33
|
Minor bug fixes and improvements
|
2013-01-04 17:20:03 -05:00 |
|
Don Mitchell
|
2e527a6ae0
|
Fixed all regex's in toXml (I hope) and added 2 markdown templates
|
2013-01-04 17:15:44 -05:00 |
|
Diana Huang
|
093560e859
|
Updates to copy and styling and a few bugfixes
|
2013-01-04 16:36:28 -05:00 |
|
Diana Huang
|
fa09e25a1a
|
Add interstitial page between calibration and grading.
Make individual Prompt and Rubric Sections hideable.
|
2013-01-04 15:18:39 -05:00 |
|
Diana Huang
|
e88fbd26e3
|
Merge branch 'master' into feature/diana/rubric-input
|
2013-01-04 14:12:18 -05:00 |
|
Diana Huang
|
befe36f626
|
Improvements to calibration feedback step
|
2013-01-04 14:11:48 -05:00 |
|
Brian Talbot
|
ce4994dd94
|
studio - revised course overview section collapse button to toggle collapsing/expanding
|
2013-01-04 13:27:59 -05:00 |
|
Diana Huang
|
ad63c492be
|
Minor updates to the page to handle showing Calibration feedback.
Also, allow for the hiding of the Prompt and the Rubric.
|
2013-01-04 12:42:38 -05:00 |
|
cahrens
|
2859cfddd0
|
minor cleanup
|
2013-01-04 12:37:00 -05:00 |
|
Chris Dodge
|
1d7baccb38
|
add info-icon.png
|
2013-01-04 11:41:16 -05:00 |
|
Diana Huang
|
d2228205e2
|
Merge branch 'master' into diana/peer-grading-views
|
2013-01-04 11:19:10 -05:00 |
|
Diana Huang
|
b5f34a9da6
|
Show special text when calibrating or when grading.
|
2013-01-04 11:03:24 -05:00 |
|
Chris Dodge
|
349fd89eb8
|
fix tests on merge
|
2013-01-04 10:32:31 -05:00 |
|
Carlos Andrés Rocha
|
d0221808db
|
Merge pull request #1228 from MITx/content/rocha/media-kit
Add new tab/window behavior to media kit
|
2013-01-04 07:07:43 -08:00 |
|
Brian Talbot
|
04524ef58f
|
media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text
|
2013-01-04 10:02:14 -05:00 |
|
cahrens
|
ecfc96c73b
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-04 09:57:15 -05:00 |
|
cahrens
|
e017363ae1
|
Tabs now showing.
|
2013-01-04 09:56:52 -05:00 |
|
Don Mitchell
|
591f1be8ba
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-04 09:51:47 -05:00 |
|
Don Mitchell
|
d99e7f5d33
|
Supports markdown
|
2013-01-04 09:51:36 -05:00 |
|
cahrens
|
5493fd586a
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-04 09:05:09 -05:00 |
|
cahrens
|
6d732c217b
|
Tabs now showing.
|
2013-01-04 09:04:27 -05:00 |
|
Brian Wilson
|
e32dfcf0a0
|
get display of validation errors to work.
|
2013-01-04 01:39:40 -05:00 |
|