Brian Talbot
|
e8ba078d4e
|
studio HTML editor - codemirror/tinymce toggle work - wip
|
2013-01-16 14:54:28 -05:00 |
|
Brian Talbot
|
ed6134ea11
|
abstracted out common editor styles shared by problem and html editors
|
2013-01-15 14:14:31 -05:00 |
|
Brian Talbot
|
623769e9d8
|
separated common editor UI from problem and HTML editor SCSS - wip
|
2013-01-15 09:57:48 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
cahrens
|
c1c64e6b92
|
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
|
2013-01-14 09:53:39 -05:00 |
|
Christina Roberts
|
c9c9f7e54f
|
Merge pull request #1268 from MITx/feature/cas/speed-editor
menu bar for heading and explanation
|
2013-01-14 06:39:07 -08:00 |
|
Brian Talbot
|
e82987a32d
|
problem editor - revised classes on editor cheatsheet text and explanation tooltip text
|
2013-01-14 09:37:38 -05:00 |
|
chrisndodge
|
fdba0e48dc
|
Merge pull request #1270 from MITx/bug/dhm/jan13
Fixed bug 114: randomized problems never right b/c state not preserved
|
2013-01-14 06:21:47 -08:00 |
|
Brian Talbot
|
11656feba3
|
one last style tweak to problem header styling
|
2013-01-13 13:10:29 -05:00 |
|
Brian Talbot
|
2429192765
|
resolved problem headers/general H1 elements floating by default in component views
|
2013-01-13 13:07:11 -05:00 |
|
Brian Talbot
|
1cf5e10a34
|
revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet
|
2013-01-13 12:47:30 -05:00 |
|
Brian Talbot
|
04e9447367
|
added in icons for header and explanation markdown elements
|
2013-01-13 12:15:29 -05:00 |
|
Don Mitchell
|
1bf2cdd528
|
Changed order of buttons to match order of cheat sheet
|
2013-01-11 17:01:50 -05:00 |
|
Don Mitchell
|
033264b58d
|
Change case of Explanation to match markdown (although it's functionally
equivalent)
|
2013-01-11 16:57:00 -05:00 |
|
Don Mitchell
|
06aa4a553e
|
Correct file name case (which I thought mac os would catch :-(
|
2013-01-11 16:53:23 -05:00 |
|
Don Mitchell
|
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 |
|
Don Mitchell
|
208ed0a438
|
Fixed bug 114: randomized problems never right b/c state not preserved
on server
|
2013-01-11 16:48:19 -05:00 |
|
cahrens
|
a4b6851e6c
|
Remove some dead css.
|
2013-01-11 16:11:09 -05:00 |
|
cahrens
|
caf55f5f8d
|
Merge branch 'feature/cas/speed-editor' into feature/christina/tiny-mce
|
2013-01-11 15:51:42 -05:00 |
|
cahrens
|
dcad564044
|
Pretty much works.
|
2013-01-11 15:50:46 -05:00 |
|