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

4229 Commits

Author SHA1 Message Date
Chris Dodge
66c91b704a init work. Export the 'draft' store under a distinct folder in the export. TBD: do the import from that directory as well. 2013-02-15 17:16:05 -05:00
Calen Pennington
2bc3000156 Fix tests 2013-02-15 15:44:11 -05:00
Brian Talbot
93949ab342 resolving local merge problem 2013-02-15 14:12:46 -05:00
Brian Talbot
a5e2b5c53a resolving merge conflict and missing Sass mixin 2013-02-15 14:10:52 -05:00
Jay Zoldak
34a4b35e66 Fix lettuce acceptance tests to reflect the new soft landing page changes. 2013-02-15 14:07:46 -05:00
Brian Talbot
6c95460761 studio - resolving merge from master 2013-02-15 09:15:06 -05:00
cahrens
38632c52c3 Beginnings of Selenium test. 2013-02-14 17:36:37 -05:00
Don Mitchell
bfcc0559a7 Merge pull request #1503 from MITx/fix/cdodge/export-policy-json 
add exporting of policy.json
 2013-02-14 12:47:37 -08:00
Chris Dodge
ea068d4aa8 add exporting of policy.json 2013-02-14 14:19:38 -05:00
Calen Pennington
793bbfd351 Set up dev environment for testing xml vs mongo vs split_mongo modulestores 2013-02-13 14:04:21 -05:00
Don Mitchell
6e5968e2cd html changed; so, removed mostly meaningless comparison and fixed one. 2013-02-13 11:53:26 -05:00
Don Mitchell
6f3a954d7b howitworks is default home page if not logged in. Otherwise course 
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
 2013-02-13 09:30:54 -05:00
Christina Roberts
0b91c1c346 Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates 
clean up templates that were removed from disk - we need to remove from ...
 2013-02-13 06:29:35 -08:00
Chris Dodge
fbe3d29f19 added tests 2013-02-13 09:25:09 -05:00
Carlos Andrés Rocha
dff0c10b7a Merge pull request #1493 from MITx/bug/dhm/misc 
Fix broken test and don't pass time units as strings but as ints.
 2013-02-12 15:14:37 -08:00
Don Mitchell
c904174bb7 Fix broken test and don't pass time units as strings but as ints. 2013-02-12 17:30:57 -05:00
Don Mitchell
d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html
 2013-02-12 16:57:00 -05:00
chrisndodge
af364166fe Merge pull request #1491 from MITx/bug/dhm/misc 
lms required grace period fields to be in specific order
 2013-02-12 12:42:53 -08:00
Don Mitchell
8e213fb0d7 lms required grace period fields to be in specific order 2013-02-12 13:48:54 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Don Mitchell
46a7f7427a Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy 
add exporting of grading_policy.json
 2013-02-11 12:53:36 -08:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -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
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