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
Don Mitchell
de0fd2ef0c Cross reference the settings pages 2013-02-11 15:02:02 -05:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -05:00
cahrens
437c806fce Enable/disable new entry button. 2013-02-11 14:16:04 -05:00
cahrens
67a557d59a Update Save/Cancel button state on typing events. 2013-02-11 14:07:11 -05:00
Brian Talbot
04e3d68bd5 studio - settings: added back in broken links for Don to check out 2013-02-11 13:47:03 -05:00
Brian Talbot
8367f565dc studio - settings: revised URLs for temporary consistency and added in help/explanation text 1st draft 2013-02-11 13:21:35 -05:00
cahrens
044a8a5cf6 CodeMirror. 2013-02-11 12:37:31 -05:00
Brian Talbot
ea709684d0 studio - settings: synched up styling/controls for existing video with other existing fields 2013-02-11 12:13:25 -05:00
Brian Talbot
34272beba3 studio - merge resolving 2013-02-11 12:09:01 -05:00
Brian Talbot
77343519c6 studio - settings: revising enumerated item lists 2013-02-11 12:08:31 -05:00
Don Mitchell
773dfce68d Try to make server and validation errors work together. Getting double 
errors when there are parent and child views both defining on error
handlers still.
 2013-02-11 12:04:45 -05:00
Brian Talbot
274d1752e0 studio - general UI cleanup in prep for this branch's end/release vs. future work 2013-02-11 11:49:03 -05:00
cahrens
039160f50c Beginning of CodeMirror. 2013-02-11 11:20:14 -05:00
Brian Talbot
a3a0e8b5e5 studio - view header UI: unit page revamp WIP 2013-02-11 09:57:16 -05:00
Brian Talbot
0983df9463 studio - view header UI: added in initial markup for several pages WIP 2013-02-11 09:35:31 -05:00
Brian Talbot
1936b47ba5 studio - small display tweaks to setting form new/remove actions 2013-02-11 09:01:52 -05:00
Brian Talbot
5730cf45b7 studio - window class revamp 2013-02-11 08:57:34 -05:00
Brian Talbot
a5ccfc61cd studio - hiding footer links until we have copy/pages 2013-02-11 08:48:58 -05:00
Brian Talbot
ed15997259 studio - settings: grading revamp WIP 2013-02-11 08:48:01 -05:00
Chris Dodge
4f67c6c052 quick hack to give some protection from unauthorized users from making new courses. Make it so only is_staff people see the 'Create New Course' button. 2013-02-10 16:17:08 -05:00
cahrens
ac732f6b07 Beginnings of feedback regarding unsaved and saved changes. 2013-02-08 17:19:19 -05:00
Don Mitchell
09e8628037 add editor to new entries and when key changes 2013-02-08 16:58:50 -05:00
Don Mitchell
5254af2918 Letting render do its thing. The wrap confused the this pointer. 2013-02-08 15:36:42 -05:00
chrisndodge
891e350a83 Merge pull request #1464 from MITx/bug/bug161 
On first request for handouts, create the db record. (bug 160)
 2013-02-08 10:49:01 -08:00
Brian Talbot
210086fed3 studio - settings: grading revamp WIP 2013-02-08 13:42:36 -05:00
cahrens
98026e4325 A couple minor bug fixes. 
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
 2013-02-08 12:46:32 -05:00
Brian Talbot
1b679750ad studio - settings: more revamp of tabs to views WIP 2013-02-08 12:36:21 -05:00
cahrens
4718c9a51a Forgot to define self when I moved code. 2013-02-08 11:17:02 -05:00
Calen Pennington
33a3d5dbb7 Make it so that cms doesn't try to run collectstatic on course content 2013-02-08 10:49:43 -05:00
Brian Talbot
dc07e7375f studio - settings: revamp of tabs to views WIP 2013-02-08 09:36:18 -05:00
cahrens
950f5de3ca Move getSession() call out of render method to avoid crash on Chrome. 2013-02-08 08:26:24 -05:00
Don Mitchell
fa5537ab71 On first request for handouts, create the db record. (bug 160) 2013-02-07 17:09:57 -05:00
Don Mitchell
48e582647c bug 171 2013-02-07 16:24:43 -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
Don Mitchell
9f5eeaf815 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/templates/settings.html
	cms/templates/widgets/header.html
 2013-02-07 14:56:48 -05:00
Don Mitchell
31393043d0 More for that commit 2013-02-07 14:46:42 -05:00
Don Mitchell
9cd1162a60 Grading and details split out. Put the unimplemented tabs into a single 
file not used.
 2013-02-07 14:45:24 -05:00
Brian Talbot
ed42fa8830 studio - soft landing: revised page title structure and values 2013-02-07 14:23:00 -05:00
Brian Talbot
5b9609abf6 studio - soft landing: various fixes/tweaks 2013-02-07 14:09:47 -05:00
cahrens
287715c6ff Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy 2013-02-07 13:05:52 -05:00
cahrens
c907cf756c Add ACE Editors. 2013-02-07 13:05:39 -05:00
Brian Talbot
fedd0aac9a studio - course nav: added in styling to account for stateful menus 2013-02-07 11:25:11 -05:00
Brian Talbot
903115d6a9 studio - soft landing: refined user icon vs. dropdown icon styles 2013-02-07 11:07:18 -05:00
Don Mitchell
70560d2237 Put DnD back into edit_subsection page 2013-02-07 10:41:37 -05:00
Brian Talbot
5674dd19c4 studio - soft landing and nav: slight visual tweaks to soft landing UI and added in support link + new tab/window and modal management JS 2013-02-07 09:58:52 -05:00
Don Mitchell
277bd0dba6 Documentation update 2013-02-07 09:50:16 -05:00
Don Mitchell
1e68834e03 Remove from to-be-deleted list any readded keys w/ same name. 2013-02-06 17:42:00 -05:00
Don Mitchell
253bc10d9f did other test cleanups which Christina mentioned (should have read the 
note first)
 2013-02-06 17:31:17 -05:00
Don Mitchell
7b3c81ca53 blacklist violations now properly trigger violation error 
delete keys only after save completes
 2013-02-06 17:25:12 -05:00
Don Mitchell
7668c70f62 Update test now updates existing attrs 2013-02-06 17:01:00 -05:00