Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,879 Commits 1 Branch 0 Tags
f443c66bcdea0c3ef104b75904c86561ba7a2c54
Commit Graph

7879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
f443c66bcd Rename, add css file. 2013-01-03 14:11:53 -05:00
cahrens
b4312cbfef Starting the markdown editor. 2013-01-03 13:39:01 -05:00
cahrens
e09a8e4a9b Don't show markdown if it doesn't exist. 2013-01-03 12:50:38 -05:00
cahrens
1c886b33cd Get buttons working again (with old behavior). 2013-01-03 12:24:17 -05:00
Don Mitchell
b5b11c696a Merge branch 'feature/cas/speed-editor' of git@github.com:MITx/mitx.git into feature/cas/speed-editor 2013-01-03 12:03:40 -05:00
Don Mitchell
47ca316d25 populate markdown into problem editor template 2013-01-03 12:02:45 -05:00
Brian Talbot
439addc130 resolving further Sass conflicts within unit editing view styling 2013-01-03 11:49:58 -05:00
Brian Talbot
7b75703556 resolving Sass issues caused by previous merge conflict resolution in branch 2013-01-03 11:44:09 -05:00
cahrens
68def8af5b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 11:21:35 -05:00
cahrens
e60230dd5a More deletion 2013-01-03 11:21:01 -05:00
Don Mitchell
4e9d5c8a6a Placeholders for markdown editor js and reference to pull it in from 
CapaDescriptor. Overrode XMLEditorDescription
 2013-01-03 11:15:06 -05:00
Don Mitchell
702636c00c Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 11:01:56 -05:00
Don Mitchell
31141299e8 Cache to pull CR's cleanup of branch 2013-01-03 11:00:41 -05:00
cahrens
b91e85c09f Remove tiny_mce. 2013-01-03 10:53:42 -05:00
cahrens
e1b7a266fb Remove askbot. 2013-01-03 10:42:54 -05:00
Don Mitchell
4f32d5f34d Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor 
Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html
 2013-01-02 17:39:27 -05:00
chrisndodge
edd9b2bc7b Merge pull request #1220 from MITx/fix/cdodge/handout-links 
trigger another build
 2013-01-02 12:02:24 -08:00
Chris Dodge
b5ccb4b8fc trigger another build 2013-01-02 15:01:21 -05:00
chrisndodge
fa0fd4b50b Merge pull request #1219 from MITx/fix/cdodge/handout-links 
another comment commit just to trigger a new build
 2013-01-02 11:29:56 -08:00
Chris Dodge
d008cb9f3c another comment commit just to trigger a new build 2013-01-02 14:25:35 -05:00
Don Mitchell
94f396b988 Merge pull request #1218 from MITx/bug/btalbot/editview-images 
studio - resolved overflowing images in unit editing
 2013-01-02 10:19:36 -08:00
Brian Talbot
a5aafc42ad studio - resolved unit editing bug where larger images would overflow out of editing visual area 2013-01-02 12:58:59 -05:00
chrisndodge
a25021b613 Merge pull request #1215 from MITx/fix/cdodge/handout-links 
basically force another build by adding a comment
 2012-12-28 13:49:08 -08:00
Chris Dodge
cf3df23094 basically force another build by adding a comment 2012-12-28 16:48:02 -05:00
chrisndodge
3d6cbf4709 Merge pull request #1214 from MITx/fix/cdodge/handout-links 
add a comment. Namely we just want to trigger another build.
 2012-12-28 11:28:18 -08:00
Chris Dodge
f343052711 add a comment. Namely we just want to trigger another build. 2012-12-28 14:26:52 -05:00
chrisndodge
4834ed3574 Merge pull request #1213 from MITx/fix/cdodge/handout-links 
add forgotten new file
 2012-12-28 10:53:39 -08:00
Chris Dodge
725805f1cf add forgotten new file 2012-12-28 13:52:49 -05:00
Don Mitchell
cba888c615 Merge pull request #1212 from MITx/fix/cdodge/handout-links 
Fix/cdodge/handout links
 2012-12-28 09:43:58 -08:00
Chris Dodge
6d20292ae8 add unit test to make sure rewriting is occuring when querying the handouts 2012-12-28 12:21:14 -05:00
Chris Dodge
7a4d89b1ad add in static asset link rewriting to the Course Handout section 2012-12-28 11:34:45 -05:00
Don Mitchell
bd8661a8b5 Merge pull request #1211 from MITx/feature/cdodge/export 
Feature/cdodge/export
 2012-12-27 13:38:28 -08:00
Chris Dodge
507a1dc073 remove unused white space and imports 2012-12-27 16:33:10 -05:00
Don Mitchell
a0fa8c98bc Merge pull request #1210 from MITx/fix/cdodge/wiki-slug-setting 
append some character, in this case a '_', if the course number is reall...
 2012-12-27 13:20:40 -08:00
Chris Dodge
c0f12e69f7 fixes on the export. There's some attributes not being handled correctly 2012-12-27 16:15:52 -05:00
Chris Dodge
239b118abe add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup. 2012-12-27 15:31:12 -05:00
Chris Dodge
8e5fc2917a Merge branch 'feature/btalbot/cms-export' into feature/cdodge/export 2012-12-27 14:43:36 -05:00
Chris Dodge
3fa425c5d0 add unit test for import->export->import simple flow 2012-12-27 14:40:38 -05:00
Chris Dodge
625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export 
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
 2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da Merge pull request #1208 from MITx/feature/cdodge/clone-course 
fix up some thumbnail issues. Also we need to manage the user permission...
 2012-12-27 09:26:51 -08:00
Chris Dodge
6951865229 add unit tests for course cloning and deleting 2012-12-27 12:20:45 -05:00
chrisndodge
a2d283d9e9 Merge pull request #1209 from MITx/bug/dhm/dec12 
Got settings details unit tests to invoke the view handlers
 2012-12-27 08:34:58 -08:00
Chris Dodge
9dff39dd6d start adding clone unit test 2012-12-27 11:25:04 -05:00
Don Mitchell
03e79cc819 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-27 11:22:29 -05:00
Don Mitchell
da343fd1d7 Finally! Details unit tests work and pass. Grading ones are fairly far 
along.
 2012-12-27 11:22:15 -05:00
Chris Dodge
fe408be1cc message edit 2012-12-27 10:32:07 -05:00
Chris Dodge
7088821233 fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message 2012-12-27 10:30:26 -05:00
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
chrisndodge
9f04f19a1c Merge pull request #1205 from MITx/bug/dhm/dec12 
Bug/dhm/dec12
 2012-12-27 07:03:34 -08:00
Don Mitchell
83bc9d7bf8 Grader unit tests (partial) 2012-12-26 15:48:37 -05:00