Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,649 Commits 1 Branch 0 Tags
9520290018edee0c9929f4bb02de216f3fd19bf4
Commit Graph

8649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
9520290018 add optional course_id parameter to DraftMongoStore.get_items() 2013-01-22 11:55:36 -05:00
chrisndodge
381ede20e1 Merge pull request #1312 from MITx/feature/christina/misc 
Need path to tiny mce JS file now.
 2013-01-18 07:54:11 -08:00
cahrens
700b0f14fd Need path to tiny mce JS file now. 2013-01-18 10:48:42 -05:00
Christina Roberts
b4de7fac26 Merge pull request #1311 from MITx/style/btalbot/cms-tinymce 
studio - adding in LMS synced styles for TinyMCE WYSIWYG preview
 2013-01-18 07:25:51 -08:00
Brian Talbot
72fc192f6e studio - adding in LMS synced styles for TinyMCE WYSIWYG preview 2013-01-18 10:24:29 -05:00
Ashley Penney
aeee13ab91 Fix the virtualenv creation for Jenkins. 2013-01-18 10:01:21 -05:00
Christina Roberts
71e358d72b Merge pull request #1305 from MITx/style/btalbot/cms-component-submenus 
Removed editor type icon/text from all component sub menus except problem
 2013-01-18 06:12:46 -08:00
chrisndodge
031e79ec24 Merge pull request #1310 from MITx/fix/cdodge/discussion-fixes 
only cache discussion forum info for 5 minutes before flushing. This is ...
 2013-01-17 20:59:27 -08:00
Chris Dodge
c6276c8394 only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata 2013-01-17 23:58:07 -05:00
chrisndodge
9753ff5677 Merge pull request #1307 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-17 18:18:25 -08:00
cahrens
a4196ffa00 Relative path seems to work. 2013-01-17 21:15:38 -05:00
cahrens
8cca193903 Add a comment. 2013-01-17 21:06:05 -05:00
cahrens
a1bb533b60 Workaround for sandbox. 2013-01-17 21:04:17 -05:00
Brian Talbot
5b82a68c18 studio - removing extra line/whitespace in sass 2013-01-17 17:06:07 -05:00
Brian Talbot
66a3e9621b studio - removed editor type icon and text for all components except for problems 2013-01-17 17:04:28 -05:00
chrisndodge
f64ffd2577 Merge pull request #1303 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-17 12:44:54 -08:00
cahrens
77865f7ab2 Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 2013-01-17 14:22:18 -05:00
chrisndodge
fe5d72857f Merge pull request #1300 from MITx/fix/cdodge/no-caching-in-preview 
disable caching in draft mode stores. It doesn't behave as we expect and...
 2013-01-17 10:17:16 -08:00
cahrens
5f05ec83f1 Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly. 2013-01-17 13:11:47 -05:00
Chris Dodge
fe964ec8ba disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate 2013-01-17 13:11:16 -05:00
Don Mitchell
ebb2976332 Merge pull request #1298 from MITx/feature/christina/misc 
Escape text being passed to markdown editor, delete copied (and unused) JS code
 2013-01-17 07:50:43 -08:00
cahrens
b6fcf3a51e Some refactoring from Brian's submission. 2013-01-17 10:36:04 -05:00
cahrens
d07a9203d1 in progress 2013-01-17 09:10:23 -05:00
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-17 05:55:22 -08:00
Brian Talbot
db7443ce7c studio html editor - added in visual assets needed for previous UI syncing 2013-01-16 16:56:22 -05:00
Brian Talbot
f34fd5c426 studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js 2013-01-16 16:55:11 -05:00
chrisndodge
2f1363843b Merge pull request #1293 from MITx/feature/christina/misc 
Fix bug related to creation of thumbnails for non-image files.
 2013-01-16 12:49:27 -08:00
cahrens
bc80779f6f Fix bug related to creation of thumbnails for non-image files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
 2013-01-16 15:40:14 -05:00
Brian Talbot
e8ba078d4e studio HTML editor - codemirror/tinymce toggle work - wip 2013-01-16 14:54:28 -05:00
Don Mitchell
808c99335e Merge pull request #1290 from MITx/feature/christina/misc 
A couple of bug fixes.
 2013-01-16 11:42:37 -08:00
cahrens
d4f79c0498 Fix bug related to img link for non-img files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet
 2013-01-16 13:51:17 -05:00
cahrens
cc5a5e2996 Fix multiple choice checkbox. 
#117
 2013-01-16 12:52:05 -05:00
chrisndodge
ebca3af789 Merge pull request #1286 from MITx/feature/christina/misc 
Feature/christina/misc
 2013-01-16 09:17:13 -08:00
cahrens
de2674e3df Minor cleanup. 2013-01-16 11:38:18 -05:00
cahrens
65d45d6dee Minor cleanup. 2013-01-16 09:57:21 -05:00
cahrens
07d6bee5a7 storing work 2013-01-16 09:53:28 -05:00
cahrens
9818664bb1 storing work 2013-01-15 16:04:34 -05:00
Brian Talbot
ed6134ea11 abstracted out common editor styles shared by problem and html editors 2013-01-15 14:14:31 -05:00
cahrens
0461407857 Proposed changes to fix asset caching bug. 2013-01-15 11:45:08 -05:00
Brian Talbot
623769e9d8 separated common editor UI from problem and HTML editor SCSS - wip 2013-01-15 09:57:48 -05:00
Chris Dodge
39769ea997 allow for optional 'COURSE_DIR' parameter for the import rake target so that we can import only a single course 2013-01-14 22:51:56 -05:00
Chris Dodge
1cb2a6724d add some additional logging for optional verbosity 2013-01-14 22:31:21 -05:00
Chris Dodge
3e736ae9c6 fix crash on command line import when no namespace rename has been given 2013-01-14 22:23:15 -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