Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
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
Brian Talbot
cb9d960a28 studio - soft landing: style dropdown arrows 2013-02-06 15:46:10 -05:00
cahrens
3f15b3b8ff Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy 2013-02-06 15:29:36 -05:00
cahrens
c243eec604 Move to view file. 2013-02-06 15:29:17 -05:00
Brian Talbot
d8a6010d0f studio - manual policy editor: added in example messages for confirm, error, warning 2013-02-06 15:13:44 -05:00
Brian Talbot
d00a1f35c7 studio - soft landing: resolved not signed in header nav length issue 2013-02-06 15:00:40 -05:00
Brian Talbot
571e1106a4 studio - manual policy editor: styled error states to appear inline with row actions visually 2013-02-06 14:57:18 -05:00
Brian Talbot
d11f10cc66 studio - course nav: corrected JS behavior of dropdowns to hide all others and self-hide appropriately 2013-02-06 14:37:09 -05:00
Brian Talbot
946d1617e7 studio - resolving merge conflict in header widget 2013-02-06 14:18:55 -05:00
Brian Talbot
1dae21e969 studio - course nav: styled dropdown navigation 2013-02-06 14:16:49 -05:00
Don Mitchell
31d541e5ad Wire up settings to menu (3 different ways just b/c it's possible) 2013-02-06 13:42:51 -05:00
Don Mitchell
8f18522d58 Unit tests for edit metadata 2013-02-06 12:01:22 -05:00
Brian Talbot
b0be1cd3dc studio - soft landing: revised app nav flexible grid 2013-02-06 11:36:08 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Brian Talbot
b98c643aaf studio - merging soft landing local work with rebased branch 2013-02-06 10:59:59 -05:00
Jay Zoldak
72023cb5d2 Improve docstring wording for ModuleStoreTestCase class. 2013-02-06 10:42:21 -05:00
Jay Zoldak
abf4ad36f4 Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class. 2013-02-06 10:42:21 -05:00
Jay Zoldak
fde6d1ba1c Refactor tests for cms contentstore. 2013-02-06 10:42:21 -05:00
Jay Zoldak
3324615270 Reorganize test cases 2013-02-06 10:41:08 -05:00
Jay Zoldak
5a6b039208 Reorganize the CmsTestCase subclass 2013-02-06 10:36:28 -05:00
Jay Zoldak
2c5a7ccdf7 Rearrange factories and clean up imports 2013-02-06 10:36:28 -05:00
Jay Zoldak
b329b0ea42 Remove toy dbs from CMS test settings.py file as they are not used. 2013-02-06 10:36:28 -05:00
Jay Zoldak
b63c3c5a67 Change modulestore name and subclass TestCase 2013-02-06 10:36:28 -05:00
cahrens
08ce212bd5 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy 
Conflicts:
	cms/static/js/models/settings/advanced.js
 2013-02-06 10:35:12 -05:00
Don Mitchell
1cc62fae75 Catch null pointer for uninitialized dates 2013-02-06 10:23:29 -05:00
Brian Talbot
bb789e758b studio - course nav: general flex-grid layout - WIP 2013-02-06 09:57:03 -05:00
Don Mitchell
4ba7de3402 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy 2013-02-06 09:56:19 -05:00
cahrens
8093de1d93 Set size of ACE Editor. 2013-02-06 09:49:27 -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
280de111e1 studio - soft landing: fixed flexible grid proportions on sign up/in UI 2013-02-06 09:18:34 -05:00
Don Mitchell
05ec0c11c6 Oops, when i alphabetized i got the value incorrectly. 
Fixed cancel to not retain new entries.
 2013-02-06 09:08:28 -05:00
Brian Talbot
8c86eb2522 studio - soft landing: revised copy 2013-02-06 09:03:07 -05:00