Vik Paruchuri
|
8e213f53d8
|
Fix rubric parsing errors
|
2013-01-14 15:52:57 -05:00 |
|
cahrens
|
0a7de9aa4d
|
Merge branch 'feature/christina/tiny-mce' of github.com:MITx/mitx into feature/christina/tiny-mce
|
2013-01-14 15:47:54 -05:00 |
|
Vik Paruchuri
|
f5600c2b8a
|
Make things more robust, ensure that a rubric is specified properly before combined open ended module will render
|
2013-01-14 15:42:38 -05:00 |
|
cahrens
|
1f681b4dcf
|
Visual Editor work.
|
2013-01-14 15:41:13 -05:00 |
|
cahrens
|
29f49895d3
|
Pretty much works.
|
2013-01-14 15:41:12 -05:00 |
|
cahrens
|
db9875758f
|
Saving work.
|
2013-01-14 15:41:12 -05:00 |
|
cahrens
|
b58577a913
|
Version 3.5.8 of tinyMCE. http://www.tinymce.com/
|
2013-01-14 15:41:12 -05:00 |
|
cahrens
|
6312022b6e
|
Delete old version of tiny_mce.
|
2013-01-14 15:41:12 -05:00 |
|
cahrens
|
3cc63f1b2f
|
tiny_mce
|
2013-01-14 15:41:12 -05:00 |
|
cahrens
|
c4ec8ead4a
|
Work in progress, related to rich HTML editor.
|
2013-01-14 15:41:12 -05:00 |
|
Calen Pennington
|
602435fc60
|
Don't break the course if the grading policy is broken
|
2013-01-14 15:36:17 -05:00 |
|
Calen Pennington
|
79e4c606fc
|
Whitespace fixes
|
2013-01-14 15:36:17 -05:00 |
|
Calen Pennington
|
64df5cc00e
|
Make errors during course loading not break the site, but just hide that course instead
|
2013-01-14 15:36:17 -05:00 |
|
Calen Pennington
|
51868aadb3
|
Prune deleted remote branches
|
2013-01-14 15:36:16 -05:00 |
|
Chris Dodge
|
c195b139b4
|
add end_date.html file
|
2013-01-14 15:33:00 -05:00 |
|
Chris Dodge
|
7878a3d02d
|
add another assert test
|
2013-01-14 15:33:00 -05:00 |
|
Chris Dodge
|
7873a44b56
|
add tests for about content overrides
|
2013-01-14 15:33:00 -05:00 |
|
Chris Dodge
|
fb4766e6be
|
be sure to first import 'extra' course content from base folder as well as a special override folder for the course run
|
2013-01-14 15:33:00 -05:00 |
|
cahrens
|
f1ed561125
|
Visual Editor work.
|
2013-01-14 15:28:28 -05:00 |
|
Vik Paruchuri
|
4353c4ab05
|
Clean up some logic
|
2013-01-14 15:16:06 -05:00 |
|
Vik Paruchuri
|
cc56e47633
|
Fix active page issue
|
2013-01-14 15:12:54 -05:00 |
|
Diana Huang
|
79c8efcb68
|
Update the rubric renderer
|
2013-01-14 15:02:24 -05:00 |
|
Vik Paruchuri
|
4ffa00b400
|
Add in notifications, peer grading tab, tab image
|
2013-01-14 15:00:13 -05:00 |
|
Diana Huang
|
bb867ba3b4
|
Use the new CombinedOpenEndedRubric class for everything
related to rubric rendering. Remove the old input type.
|
2013-01-14 14:46:44 -05:00 |
|
Carlos Andrés Rocha
|
2f99d38e90
|
Update FAQ page: new content and styling
|
2013-01-14 14:17:39 -05:00 |
|
chrisndodge
|
e884f17d12
|
Merge pull request #1272 from MITx/feature/cale/course-loading-errors
Feature/cale/course loading errors
|
2013-01-14 10:41:03 -08:00 |
|
Diana Huang
|
ae65bb0332
|
Merge branch 'master' into feature/diana/rubric-input
Conflicts:
common/lib/capa/capa/inputtypes.py
|
2013-01-14 13:40:45 -05:00 |
|
Diana Huang
|
cc4095807f
|
Handle scores if they exist in the xml
|
2013-01-14 13:38:44 -05:00 |
|
Diana Huang
|
b067b0bf74
|
Merge pull request #1275 from MITx/feature/vik/integrate-sa-and-oe
Clean up capa by removing message post actions that aren't needed
|
2013-01-14 10:19:39 -08:00 |
|
Calen Pennington
|
330a2eac80
|
Don't break the course if the grading policy is broken
|
2013-01-14 13:18:54 -05:00 |
|
Calen Pennington
|
95478922d0
|
Whitespace fixes
|
2013-01-14 13:18:54 -05:00 |
|
Calen Pennington
|
86be73f6a2
|
Make errors during course loading not break the site, but just hide that course instead
|
2013-01-14 13:16:22 -05:00 |
|
Vik Paruchuri
|
ad1e73fa86
|
Clean up capa by removing message post actions that aren't needed
|
2013-01-14 13:12:38 -05:00 |
|
VikParuchuri
|
a64111a6e7
|
Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe
Feature/vik/integrate sa and oe
|
2013-01-14 10:06:43 -08:00 |
|
Calen Pennington
|
fc2d5c43f1
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
lms/envs/aws.py
|
2013-01-14 12:51:19 -05:00 |
|
Calen Pennington
|
19f79fa364
|
Prune deleted remote branches
|
2013-01-14 12:40:44 -05:00 |
|
Calen Pennington
|
0c00923a47
|
Merge pull request #1274 from MITx/fix/vik/staff-grading-settings
Fix/vik/staff grading settings
|
2013-01-14 09:36:19 -08:00 |
|
Calen Pennington
|
f91a5f0e23
|
Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes
Fix/cdodge/filesystem xml fixes
|
2013-01-14 09:34:25 -08:00 |
|
Vik Paruchuri
|
1316728aaa
|
Minor naming fix
|
2013-01-14 12:32:31 -05:00 |
|
Vik Paruchuri
|
0e11deffcf
|
Fix staff and peer grading settings to not fail catastrophically
|
2013-01-14 12:31:50 -05:00 |
|
Chris Dodge
|
9f73294959
|
add end_date.html file
|
2013-01-14 12:23:36 -05:00 |
|
Vik Paruchuri
|
a64806656a
|
Integrate rubric into self assessment
|
2013-01-14 12:20:27 -05:00 |
|
Chris Dodge
|
b5776a775e
|
add another assert test
|
2013-01-14 12:17:51 -05:00 |
|
Chris Dodge
|
edb913f6ac
|
add tests for about content overrides
|
2013-01-14 12:12:40 -05:00 |
|
Vik Paruchuri
|
16f06ae7b7
|
Fix some minor html
|
2013-01-14 11:57:09 -05:00 |
|
Vik Paruchuri
|
3e0cf9d234
|
Make rubric render more nicely
|
2013-01-14 11:53:23 -05:00 |
|
Chris Dodge
|
ac7eceb636
|
be sure to first import 'extra' course content from base folder as well as a special override folder for the course run
|
2013-01-14 11:16:48 -05:00 |
|
Vik Paruchuri
|
59e5b494a9
|
Proper rubric rendering for self assessment
|
2013-01-14 10:51:17 -05:00 |
|
Vik Paruchuri
|
2b4929562a
|
Fix up rubric rendering
|
2013-01-14 10:39:58 -05:00 |
|
Diana Huang
|
90c39d51ee
|
Fix wrong order in the text
|
2013-01-14 10:39:20 -05:00 |
|