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

1757 Commits

Author SHA1 Message Date
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
Don Mitchell
fa5537ab71 On first request for handouts, create the db record. (bug 160) 2013-02-07 17:09:57 -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
9cd1162a60 Grading and details split out. Put the unimplemented tabs into a single 
file not used.
 2013-02-07 14:45:24 -05:00
Don Mitchell
277bd0dba6 Documentation update 2013-02-07 09:50:16 -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
7668c70f62 Update test now updates existing attrs 2013-02-06 17:01:00 -05:00
Don Mitchell
8f18522d58 Unit tests for edit metadata 2013-02-06 12:01:22 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -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
b63c3c5a67 Change modulestore name and subclass TestCase 2013-02-06 10:36:28 -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
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
Don Mitchell
5275db9ab9 Cancel kind of works (reverts but leaves in new fields :-( ) 
Filter out system metadata fields
 2013-02-05 19:17:43 -05:00
Don Mitchell
8f16d639b7 CRUD on policy fields w/ some validation 2013-02-05 17:21:02 -05:00
Christina Roberts
3222e083eb Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix 
Fix bug where we imported two functions w/ the same name
 2013-02-05 13:36:56 -08:00
Christina Roberts
0d8cfb9baa Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404 
change from throwing a Http404 exception, which I believe will try to re...
 2013-02-05 13:36:28 -08:00
Chris Dodge
3fa1fe0cd6 change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404. 2013-02-05 16:26:07 -05:00
Calen Pennington
8360a7a7f5 Fix bug where we imported two functions w/ the same name 2013-02-05 16:23:10 -05:00
Calen Pennington
401f564e6a Fix data directory passed to replace_static_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
Don Mitchell
07f87d4729 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy 2013-02-04 15:34:19 -05:00
Don Mitchell
f48af8b80c Server side controller and model stubbed in. Now to wire to view. 2013-02-04 15:34:05 -05:00
Brian Talbot
ecbe297936 studio - soft landing UI: how it works pathing, html and basic layout styling 2013-02-04 09:39:36 -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
Deena Wang
1a6fc1b505 Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	cms/djangoapps/contentstore/tests/test_views.py
 2013-02-01 16:05:44 -05:00
Deena Wang
c144b2519a more tests in test_views.py 2013-02-01 15:57:11 -05:00
Deena Wang
25aca5866d Merge branch 'master' into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_access.py
 2013-02-01 10:19:40 -05:00
Deena Wang
7908d87902 more tests for views.py 2013-01-31 15:58:14 -05:00
Deena Wang
abc3e5b09d more tests in test_views.py 2013-01-31 14:47:59 -05:00
Chris Dodge
ab9d30cbc6 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs 2013-01-31 10:51:24 -05:00
Chris Dodge
fc57e7afdb add testing for course info export. Plus DRY things out a bit 2013-01-31 10:51:20 -05:00
Calen Pennington
76b367e062 Merge pull request #1388 from MITx/bug/dhm/mar13 
Swallow event calls to squash 404 errors (and remove an unused var in
 2013-01-30 14:10:02 -08:00
Don Mitchell
756a071634 misspelled request (altho as an unused identifier) 2013-01-30 17:08:21 -05:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Deena Wang
40ddaa9976 more tests on test_views.py 2013-01-30 16:03:16 -05:00
Don Mitchell
85faab1dc6 Swallow event calls to squash 404 errors (and remove an unused var in 
another function)
 2013-01-30 15:18:51 -05:00
Calen Pennington
ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic 
Don't run collectstatic on course content
 2013-01-30 12:07:47 -08:00
Christina Roberts
54c1fe9c67 Merge pull request #1384 from MITx/fix/cdodge/export-static-tabs 
adding exporting of tabs and custom_tags. Also added unit tests
 2013-01-30 10:52:31 -08:00
Chris Dodge
c676046341 adding exporting of tabs and custom_tags. Also added unit tests 2013-01-30 13:25:17 -05:00
Deena Wang
cdbe9857d6 tests in cms.djangoapps.contentstore/tests/test_views.py 2013-01-30 12:30:48 -05:00
Chris Dodge
7f32aae47d rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability 2013-01-30 11:50:11 -05:00
Chris Dodge
e5115953ad rework redorder tabs so that we account for the fact that static tabs can be in any arbitrary order (with respect to non-static tabs) when working with an imported course 2013-01-30 11:36:28 -05:00
Chris Dodge
74fcf96611 don't hard code the ordering of the tabs in the test. Take the current ordering defintion (in the test data) and reverse it 2013-01-30 09:43:57 -05:00