Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

96 Commits

Author SHA1 Message Date
David Baumgold
9a61663dce Restore HTML escaping in Mako template 2013-05-22 15:55:55 -04:00
David Baumgold
0c368011da Move underscore templates into separate files, included in Mako templates 2013-05-22 15:55:50 -04:00
David Baumgold
1333717871 Message action callbacks have model set to this 2013-05-22 15:55:50 -04:00
David Baumgold
f5f7cf705f Subclass CMS.Models.SystemFeedback 
To create handy WarningMessage, ErrorMessage, and ConfirmationMessage classes
 2013-05-22 15:55:50 -04:00
David Baumgold
4e41c8060b Changed validation error to use new messaging framework 2013-05-22 15:55:50 -04:00
David Baumgold
e2f5acef46 Turn course sections into Backbone models 
Hook up course name edit interaction, with notification framework
 2013-05-22 15:55:49 -04:00
Frances Botsford
571ebb1fcd removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons 2013-05-22 15:55:48 -04:00
Frances Botsford
81cb921e32 removed symbolset, replaced with fontawesome throughout for new buttons; updated old code for new button at bottom of grading to also use the FA style 2013-05-22 15:55:48 -04:00
Brian Talbot
f069c1a1a1 Studio: style reorg 
typography, SASS import, mixins/extends
 2013-05-14 17:15:07 -04:00
cahrens
7f1c89b492 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-08 10:28:52 -04:00
Brian Talbot
f31588c81b studio - resolving section release date form issues (labels, saving, updating) 2013-04-05 16:44:09 -04:00
Brian Talbot
1a68d516fb resolving local merge with master 2013-04-05 15:27:08 -04:00
Brian Talbot
512e4fe3bd resolving local merge with master and sprucing style and templates for merge with master 2013-04-05 15:13:21 -04:00
Christina Roberts
33d39a85a9 Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock 
Studio Help Sock
 2013-04-05 11:37:57 -07:00
Brian Talbot
7ff975e0b6 studio - removing default styling for abbreviation elements, fixing typo in title attribute for timepickers 2013-04-05 11:06:34 -04:00
Brian Talbot
da6ac54d1a studio - added in labels and UTC reference for section release date modal forms 2013-04-04 18:00:08 -04:00
cahrens
cc6baf9dd4 Show GMT time, 24-hour. 2013-04-04 17:12:09 -04:00
cahrens
49e0753ef5 Show GMT time, 24-hour. 2013-04-04 16:56:10 -04:00
Brian Talbot
3c3a6e7503 studio - adding in view-based banners UI tweaks and removing global banner UI for now 2013-04-04 16:46:38 -04:00
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04:00
Brian Talbot
8b9ecd9367 studio - reverting footer UI to existing 2013-04-02 12:53:11 -04:00
cahrens
42b4ffdcf9 Cleanup. 2013-04-01 13:40:32 -04:00
cahrens
7279f9c460 Bug fix for grading type not showing on course outline (#258). 2013-03-28 10:54:10 -04:00
cahrens
2d677a834c Test for due dates. 2013-03-28 10:24:31 -04:00
Brian Talbot
cdcdfd49e0 studio - alerts: resolving local master merge conflcits 2013-03-18 10:58:16 -04:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
Brian Talbot
2ce4ecbc84 local merge with master - finished 2013-03-01 15:48:15 -05:00
Brian Talbot
8552b2d614 local merge with master - WIP 2013-03-01 15:47:23 -05:00
cahrens
d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. 2013-03-01 14:39:49 -05:00
Brian Talbot
d809df913d studio - alerts: moved all states and documentation into new /alerts view 2013-02-25 14:45:27 -05:00
Brian Talbot
8179b9fadc studio - alerts: initial pass at alert styling and markup complete 2013-02-25 14:19:22 -05:00
Brian Talbot
60f803f369 studio - alerts: initial pass at alert styling and markup complete 2013-02-22 14:29:19 -05:00
Brian Talbot
bb24a079a1 studio - alerts: initial pass at alert styling and markup complete 2013-02-22 14:28:13 -05:00
Brian Talbot
d7bbfbc707 studio - alerts: basic layout and general alert styling WIP 2013-02-22 13:52:24 -05:00
Brian Talbot
fca98c19a5 studio - adding in info icon to page intro help and making icon classes consistent in all new references 2013-02-19 12:13:08 -05:00
cahrens
596de8ab2c Hook up "View Live" buttons and get "New Static Tab" working again. 2013-02-19 11:34:41 -05:00
Brian Talbot
47c117bf03 studio - page headers: resolved new course update creation JS issue caused by new markup 2013-02-14 10:52:25 -05:00
Brian Talbot
1a1be106ae studio - page headers: added in view live links to course dashboard 2013-02-14 10:14:10 -05:00
Brian Talbot
2024f9eeca studio - page headers: added view course button to course outline 2013-02-14 09:48:19 -05:00
Brian Talbot
6ade6983ae studio - page headers: added in logic to style page actions' height based on title having a subtitle or not 2013-02-14 09:38:32 -05:00
Brian Talbot
e23c99961d studio - page headers: completed basic styling and simple page set-ups 2013-02-13 15:03:26 -05:00
Brian Talbot
70e11e823c studio - made all page heading chrome have consistent markup 2013-02-12 15:07:32 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Brian Talbot
ed42fa8830 studio - soft landing: revised page title structure and values 2013-02-07 14:23:00 -05:00
Don Mitchell
0f5571f499 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 2013-02-06 09:48:09 -05:00
Brian Talbot
1144b0eeed studio - soft landing UI: initial header and templating work 2013-02-03 22:22:11 -05:00
Don Mitchell
1595bd9b0e Move dnd code from base.js to a js file only loaded by overview.html 2013-02-01 17:20: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
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00