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

4005 Commits

Author SHA1 Message Date
Brian Talbot
f60a9d8d35 studio - problem speed editor: tweaking presentation of problem sub menu further 2013-01-09 08:54:40 -05:00
Don Mitchell
83b7997d12 Added unit tests and generalized a catch 2013-01-08 16:43:42 -05:00
Brian Talbot
75447eb80d studio - problem speed editor: revised html and DOM for problem sub menu 2013-01-08 15:43:02 -05:00
cahrens
c7feee5b67 Delete speed-editor.js and cruft from unit.html. 2013-01-08 15:39:45 -05:00
Don Mitchell
1708dc4080 Use html rather than xml parsing for course updates 2013-01-08 15:13:37 -05:00
cahrens
4ac15daf44 Fix formatting. 2013-01-08 15:04:48 -05:00
cahrens
f616aecd81 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 
Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee
 2013-01-08 14:56:59 -05:00
Jay Zoldak
f056f0624d Set up the framework for running lettuce tests against studio 2013-01-08 14:44:45 -05:00
cahrens
bc10d080df Save work 2013-01-08 13:39:16 -05:00
Don Mitchell
ae4e7815a9 CapaDescriptor new unit tests 2013-01-08 13:16:38 -05:00
Don Mitchell
6e2b4a07d8 Added is_empty to model presented to unit.html 2013-01-08 11:18:57 -05:00
Don Mitchell
76f2ef6f7c Empty template now recognized as allowing markdown editing 
Save saves markdown and updates the xml
 2013-01-08 10:53:45 -05:00
Chris Dodge
c7d81cc425 be sure to return an instance of the class 2013-01-07 16:28:30 -05:00
cahrens
e296d52c7d merge 2013-01-07 12:06:12 -05:00
Don Mitchell
12abdbce73 Added 'has_markdown' property to templates in unit.html so that we can 
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
 2013-01-07 10:55:10 -05:00
Brian Talbot
6b8944ad6b studio - section expanding/collapsing UI - wip 2013-01-07 09:07:40 -05:00
Don Mitchell
2e527a6ae0 Fixed all regex's in toXml (I hope) and added 2 markdown templates 2013-01-04 17:15:44 -05:00
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -05:00
Brian Talbot
ce4994dd94 studio - revised course overview section collapse button to toggle collapsing/expanding 2013-01-04 13:27:59 -05:00
cahrens
6d732c217b Tabs now showing. 2013-01-04 09:04:27 -05:00
cahrens
533f4876b5 Rename, add css file. 2013-01-03 14:27:32 -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
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
e60230dd5a More deletion 2013-01-03 11:21:01 -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
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -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
Calen Pennington
4040f9749d Correctly parse timetuple into datetime 2013-01-02 15:08:09 -05:00
Calen Pennington
7f39dd974b Minor whitespace cleanup 2013-01-02 15:07:56 -05:00
Calen Pennington
4bec871b0f Don't return BadRequest classes, return instances 2013-01-02 15:07:12 -05:00
Calen Pennington
8e0d218c7d Stop using .definition and .metadata directly 2013-01-02 15:06:43 -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
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
Calen Pennington
60fa8619cb Fixing tests 2013-01-02 10:37:49 -05:00
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
fa75245e8a WIP: Start cleaning up CMS to work with new field format 2013-01-02 09:05:48 -05:00
Chris Dodge
cf3df23094 basically force another build by adding a comment 2012-12-28 16:48:02 -05:00
Calen Pennington
84cb0ce99b Move inheritance logic out into a separate file in the modulestore 2012-12-28 14:56:42 -05:00
Calen Pennington
8991cdd3b5 Stop raising BaseExceptions 2012-12-28 14:51:50 -05:00
Calen Pennington
cbfc7b201a WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms 2012-12-28 14:44:31 -05:00
Calen Pennington
8ba4163557 WIP. Data loads, but not all of it 2012-12-28 14:39:13 -05:00