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

156 Commits

Author SHA1 Message Date
Diana Huang
cc67017d4c Merge branch 'master' into diana/open-ended-ui-updates 2013-01-23 16:45:40 -05:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Brian Talbot
2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:50:10 -05:00
Diana Huang
5ca1586e0c Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-23 08:57:47 -05:00
Diana Huang
71e4541c69 Merge branch 'master' into feature/diana/rubric-input 2013-01-23 08:56:55 -05:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
Brian Talbot
fd3ae2c478 studio html editor - matched up styles for <pre> elements 2013-01-22 16:16:30 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 
Conflicts:
	cms/static/css/tiny-mce.css
 2013-01-22 16:15:27 -05:00
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
Diana Huang
9a53c37530 Use something more visually easy to use for self-assessment. 2013-01-22 11:25:12 -05:00
Diana Huang
f500958439 More fixes for the merge and some display updates. 2013-01-18 13:52:50 -05:00
Brian Talbot
d2f79f10f0 studio - synced LMS common content styles with HTML component display/edit rendering styles 2013-01-18 09:59:08 -05:00
Diana Huang
481580c702 Remove hints from self-assessment and misc display fixes 2013-01-18 08:48:50 -05:00
Brian Talbot
70457176f1 studio - stubbed in basic LMS styling to HTML displaygst 2013-01-17 21:28:14 -05:00
Chris Dodge
0e2d8be442 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 2013-01-17 20:29:41 -05:00
Diana Huang
87990b36f4 Rubric sizing tweaks and text improvements. 2013-01-17 14:35:49 -05:00
Diana Huang
3646ff53d8 Display updates and fixes. 2013-01-17 14:00:02 -05:00
Diana Huang
2b4e9f45b9 Updates to the CSS and html formatting for statuses 
and self-assessment
 2013-01-17 11:34:44 -05:00
cahrens
b6fcf3a51e Some refactoring from Brian's submission. 2013-01-17 10:36:04 -05:00
Diana Huang
df8d088492 Display updates to the xmodule. 2013-01-17 09:44:47 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -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
Diana Huang
9079c66a32 Some interface cleanup stuff for the combined open ended module. 2013-01-16 16:35:58 -05:00
Brian Talbot
e8ba078d4e studio HTML editor - codemirror/tinymce toggle work - wip 2013-01-16 14:54:28 -05:00
Diana Huang
db366d4ebb Update CSS to make rubric even narrower. 2013-01-16 14:36:08 -05:00
Diana Huang
d844730f71 Fix some sizing issues in the CSS. 2013-01-16 09:17:00 -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
29f49895d3 Pretty much works. 2013-01-14 15:41:12 -05:00
cahrens
db9875758f Saving work. 2013-01-14 15:41:12 -05:00
Diana Huang
ae65bb0332 Merge branch 'master' into feature/diana/rubric-input 
Conflicts:
	common/lib/capa/capa/inputtypes.py
 2013-01-14 13:40:45 -05:00
Vik Paruchuri
3e0cf9d234 Make rubric render more nicely 2013-01-14 11:53:23 -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
cahrens
a4b6851e6c Remove some dead css. 2013-01-11 16:11:09 -05:00
Brian Talbot
7d445f5630 studio - tweaking problem editor's advanced editor toggle control UI and prompt message 2013-01-11 14:25:22 -05:00
Vik Paruchuri
7febe2c2c8 Integrate minimal rubric display 2013-01-11 12:43:57 -05:00
Diana Huang
5a211f566d Make the rubric smaller so that we can accomodate more columns. 2013-01-11 09:31:38 -05:00
Vik Paruchuri
ee2990da4f Change hidden div to input name 2013-01-10 19:00:04 -05:00
Vik Paruchuri
e4568c3a20 Use include clearfix in css 2013-01-10 19:00:04 -05:00
Vik Paruchuri
3bf532e199 Check marks in each step 2013-01-10 19:00:03 -05:00
Vik Paruchuri
7b08114805 More restyling, fix buttons 2013-01-10 19:00:02 -05:00
Vik Paruchuri
943c0ff820 Display results separately from submission logic 2013-01-10 19:00:02 -05:00
Vik Paruchuri
3620fd93d9 Create a result container and put results into it 2013-01-10 19:00:02 -05:00
Vik Paruchuri
24bfe44049 Some restyling, automatically check for feedback, remove reload button 2013-01-10 19:00:02 -05:00
Vik Paruchuri
5273d44788 Fix css and display current step 2013-01-10 19:00:02 -05:00
Vik Paruchuri
25d25c004b Restyling on feedback response 2013-01-10 19:00:02 -05:00
Vik Paruchuri
9788535416 Get rid of open ended message 2013-01-10 19:00:02 -05:00
Vik Paruchuri
5b0181c925 Status moved to the right 2013-01-10 19:00:02 -05:00