This website requires JavaScript.
1f681b4dcf
Visual Editor work.
2013-01-14 15:28:28 -05:00
29f49895d3
Pretty much works.
2013-01-11 15:50:46 -05:00
db9875758f
Saving work.
2013-01-11 09:39:07 -05:00
b58577a913
Version 3.5.8 of tinyMCE. http://www.tinymce.com/
2013-01-10 15:00:30 -05:00
6312022b6e
Delete old version of tiny_mce.
2013-01-10 14:51:22 -05:00
3cc63f1b2f
tiny_mce
2013-01-03 09:50:35 -05:00
c4ec8ead4a
Work in progress, related to rich HTML editor.
2013-01-03 09:48:36 -05:00
602435fc60
Don't break the course if the grading policy is broken
2013-01-14 11:38:34 -05:00
79e4c606fc
Whitespace fixes
2013-01-14 11:34:06 -05:00
64df5cc00e
Make errors during course loading not break the site, but just hide that course instead
2013-01-14 11:33:59 -05:00
51868aadb3
Prune deleted remote branches
2013-01-14 12:40:17 -05:00
c195b139b4
add end_date.html file
2013-01-14 12:23:36 -05:00
7878a3d02d
add another assert test
2013-01-14 12:17:51 -05:00
7873a44b56
add tests for about content overrides
2013-01-14 12:12:40 -05:00
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 11:16:48 -05:00
f1ed561125
Visual Editor work.
2013-01-14 15:28:28 -05:00
4353c4ab05
Clean up some logic
2013-01-14 15:16:06 -05:00
cc56e47633
Fix active page issue
2013-01-14 15:12:54 -05:00
79c8efcb68
Update the rubric renderer
2013-01-14 15:02:24 -05:00
4ffa00b400
Add in notifications, peer grading tab, tab image
2013-01-14 15:00:13 -05:00
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
2f99d38e90
Update FAQ page: new content and styling
2013-01-14 13:22:46 -05:00
e884f17d12
Merge pull request #1272 from MITx/feature/cale/course-loading-errors
2013-01-14 10:41:03 -08:00
ae65bb0332
Merge branch 'master' into feature/diana/rubric-input
2013-01-14 13:40:45 -05:00
cc4095807f
Handle scores if they exist in the xml
2013-01-14 13:38:44 -05:00
b067b0bf74
Merge pull request #1275 from MITx/feature/vik/integrate-sa-and-oe
2013-01-14 10:19:39 -08:00
330a2eac80
Don't break the course if the grading policy is broken
2013-01-14 11:38:34 -05:00
95478922d0
Whitespace fixes
2013-01-14 11:34:06 -05:00
86be73f6a2
Make errors during course loading not break the site, but just hide that course instead
2013-01-14 11:33:59 -05:00
ad1e73fa86
Clean up capa by removing message post actions that aren't needed
2013-01-14 13:12:38 -05:00
a64111a6e7
Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe
2013-01-14 10:06:43 -08:00
fc2d5c43f1
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2013-01-14 12:51:19 -05:00
19f79fa364
Prune deleted remote branches
2013-01-14 12:40:17 -05:00
0c00923a47
Merge pull request #1274 from MITx/fix/vik/staff-grading-settings
2013-01-14 09:36:19 -08:00
f91a5f0e23
Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes
2013-01-14 09:34:25 -08:00
1316728aaa
Minor naming fix
2013-01-14 12:32:31 -05:00
0e11deffcf
Fix staff and peer grading settings to not fail catastrophically
2013-01-14 12:31:50 -05:00
9f73294959
add end_date.html file
2013-01-14 12:23:36 -05:00
a64806656a
Integrate rubric into self assessment
2013-01-14 12:20:27 -05:00
b5776a775e
add another assert test
2013-01-14 12:17:51 -05:00
edb913f6ac
add tests for about content overrides
2013-01-14 12:12:40 -05:00
16f06ae7b7
Fix some minor html
2013-01-14 11:57:09 -05:00
3e0cf9d234
Make rubric render more nicely
2013-01-14 11:53:23 -05:00
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
59e5b494a9
Proper rubric rendering for self assessment
2013-01-14 10:51:17 -05:00
2b4929562a
Fix up rubric rendering
2013-01-14 10:39:58 -05:00
90c39d51ee
Fix wrong order in the text
2013-01-14 10:39:20 -05:00
0567e8f0aa
Factor out rubric rendering
2013-01-14 10:35:53 -05:00
1680336da6
Fix some minor bugs in the staff grading interface
2013-01-14 10:22:22 -05:00
c7339ee664
Minor bug fix
2013-01-14 10:16:57 -05:00
c1c64e6b92
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
2013-01-14 09:53:39 -05:00
c9c9f7e54f
Merge pull request #1268 from MITx/feature/cas/speed-editor
2013-01-14 06:39:07 -08:00
e82987a32d
problem editor - revised classes on editor cheatsheet text and explanation tooltip text
2013-01-14 09:37:38 -05:00
fdba0e48dc
Merge pull request #1270 from MITx/bug/dhm/jan13
2013-01-14 06:21:47 -08:00
a0c0005e95
Updates to the javascript and the grading controller to handle rubric input
2013-01-14 08:58:33 -05:00
11656feba3
one last style tweak to problem header styling
2013-01-13 13:10:29 -05:00
2429192765
resolved problem headers/general H1 elements floating by default in component views
2013-01-13 13:07:11 -05:00
1cf5e10a34
revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet
2013-01-13 12:47:30 -05:00
04e9447367
added in icons for header and explanation markdown elements
2013-01-13 12:15:29 -05:00
8e059ff934
fix placeholders for phone_country_code values, and subject line of exam_help email.
2013-01-12 00:58:04 -05:00
3d0384692c
add pearson_make_tc_registration command
2013-01-11 17:50:02 -05:00
f3e8d01e08
Pull out old rubric and score selection logic and set up the new rubric
2013-01-11 17:29:39 -05:00
d230c1b03c
Added example of geographic student distribution over world map.
2013-01-11 17:14:29 -05:00
1bf2cdd528
Changed order of buttons to match order of cheat sheet
2013-01-11 17:01:50 -05:00
033264b58d
Change case of Explanation to match markdown (although it's functionally equivalent)
2013-01-11 16:57:00 -05:00
06aa4a553e
Correct file name case (which I thought mac os would catch :-(
2013-01-11 16:53:23 -05:00
7d8276b6c5
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 16:52:10 -05:00
208ed0a438
Fixed bug 114: randomized problems never right b/c state not preserved on server
2013-01-11 16:48:19 -05:00
a4b6851e6c
Remove some dead css.
2013-01-11 16:11:09 -05:00
7d0bb7b3fe
Minor string to boolean fix
2013-01-11 16:02:09 -05:00
caf55f5f8d
Merge branch 'feature/cas/speed-editor' into feature/christina/tiny-mce
2013-01-11 15:51:42 -05:00
682ac3455b
Address some comments from code review, fix rubric display
2013-01-11 15:51:37 -05:00
dcad564044
Pretty much works.
2013-01-11 15:50:46 -05:00
4efe5789ed
Merge pull request #1269 from MITx/feature/cdodge/cms-master-merge3
2013-01-11 12:23:29 -08:00
ab7be1a6e0
Unit tests
2013-01-11 15:22:30 -05:00
5920142f71
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 15:05:30 -05:00
755bf709a5
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 14:44:38 -05:00
9479ef3c84
fix up call signatures for get_parent_locations()
2013-01-11 14:29:53 -05:00
7d445f5630
studio - tweaking problem editor's advanced editor toggle control UI and prompt message
2013-01-11 14:25:22 -05:00
08adf9c0d5
Merge branch 'master' into feature/cdodge/cms-master-merge3
2013-01-11 14:04:46 -05:00
9a752f51c7
Fix rubric return, add in score field
2013-01-11 12:48:15 -05:00
7febe2c2c8
Integrate minimal rubric display
2013-01-11 12:43:57 -05:00
d0c4e2e916
Merge pull request #1267 from MITx/bug/btalbot/cms-sectiontoggling-test
2013-01-11 09:33:15 -08:00
e7e26a471c
studio - changed expectation of lettuce test for course overview section toggling
2013-01-11 12:03:17 -05:00
445a923ab8
Merge pull request #1266 from MITx/fix/cdodge/preview-failing
2013-01-11 08:59:24 -08:00
476e6c7b3b
need to add the depth parameter to the DraftMongoStore implementation of get_instance
2013-01-11 11:57:41 -05:00
52164f58ff
Fix self.get call in peer grading service
2013-01-11 11:39:32 -05:00
5dd83e4d5f
Remove import
2013-01-11 11:10:51 -05:00
0919c185f6
Merge pull request #1265 from MITx/bug/dhm/jan13
2013-01-11 07:55:51 -08:00
c05d887904
Handle metadata from save being empty
2013-01-11 10:39:57 -05:00
64507bd5fd
Drop down for markup done but w/o new icons
2013-01-11 10:36:42 -05:00
5368a9ad3e
Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf
2013-01-11 07:23:00 -08:00
4eca8254ae
Merge pull request #1264 from MITx/feature/cas/speed-editor
2013-01-11 06:53:26 -08:00
5d40d22136
revised rejected state error message content, markup, and styling on registration's right hand side status area
2013-01-11 09:52:46 -05:00
1dca370a7f
Better initial documentation of combined open ended
2013-01-11 09:50:43 -05:00
bcbf65e2b9
Code reformat, line length fix, change text names to variables
2013-01-11 09:45:10 -05:00
cbf5174bcd
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
2013-01-11 09:40:05 -05:00
26e55f34a4
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 09:39:25 -05:00
882eed4f89
Saving work.
2013-01-11 09:39:07 -05:00
5e28e59817
Merge pull request #1262 from MITx/feature/cas/speed-editor
2013-01-11 06:37:26 -08:00
cahrens