Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
15,584 Commits 1 Branch 0 Tags
d83d49cac40fd1720d7b8c07146002c1c94de7e7
Commit Graph

52 Commits

Author SHA1 Message Date
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
David Baumgold
437e658f98 pylint fixes 2013-07-09 19:16:44 -04:00
Don Mitchell
8b23eeca7e Minor pylint/whitespace changes 2013-06-25 22:34:29 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
Don Mitchell
2266028921 Have the draft module store actively prevent non-leaf nodes from being 
saved as draft.
 2013-06-07 15:40:30 -04:00
cahrens
c715edf57a Strip off https:// 2013-06-06 10:55:41 -04:00
cahrens
39397c5c2f Bullet-proofing for MKTG_URLS. 2013-06-06 10:29:10 -04:00
cahrens
93be67d49a Fix bug STUD-103. The url base for about page links needs to be www.edx.org for Drupal site, vs. LMS_BASE which is used for Studio. Note that the complete URL is still not correct, but a redirect exists to take it to the new location. 2013-06-03 15:21:02 -04:00
cahrens
522b76e847 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). 
https://edx.lighthouseapp.com/projects/102637/tickets/331
 2013-05-23 16:27:05 -04:00
Arthur Barrett
0ed07779c8 kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules." 2013-05-07 17:27:06 -04:00
Chris Dodge
6d6b3a59fe violation fixes 2013-04-12 15:27:36 -04:00
Chris Dodge
b640866748 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 
Conflicts:
	common/lib/xmodule/xmodule/x_module.py
 2013-04-03 14:05:59 -04:00
cahrens
8ace7fe57c Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-04-01 12:30:07 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
chrisndodge
1c47573bd7 Merge pull request #1669 from MITx/fix/vik/add-oe-tab 
Fix/vik/add oe tab
 2013-03-29 13:55:58 -07:00
Vik Paruchuri
033f5ce73c Make process to add open ended tab to studio reversible 2013-03-29 15:53:28 -04:00
Chris Dodge
60e295895e remove unused parameter 2013-03-29 15:26:21 -04:00
Vik Paruchuri
b8e6c94dd6 Add in a comment 2013-03-29 13:57:16 -04:00
Vik Paruchuri
20bbf75fba Merge remote-tracking branch 'origin/master' into fix/vik/add-oe-tab 
Conflicts:
	cms/djangoapps/contentstore/utils.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_metadata.py
 2013-03-29 13:10:47 -04:00
Chris Dodge
8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 
Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-28 13:27:29 -04:00
Chris Dodge
3cdd973af4 get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore 2013-03-28 09:28:19 -04:00
Chris Dodge
7a23893557 wip 2013-03-26 16:40:28 -04:00
cahrens
505a382421 Re-enable all the tests! 2013-03-22 14:00:20 -04:00
cahrens
016fe196ae Add Python unit tests, don't convert URLs every time. 2013-03-21 21:21:24 -04:00
cahrens
1ae9e9bde3 Tests for opening action links. 2013-03-21 13:56:11 -04:00
cahrens
6d6e144c35 Urls working. 2013-03-20 16:37:08 -04:00
Chris Dodge
9a18685c1c add a discussion module write through cache to speed up Forum rendering 2013-03-18 09:01:54 -04:00
Vik Paruchuri
10eb7e45ea Add in some docs 2013-03-14 13:42:41 -04:00
Vik Paruchuri
4c8a45f85e Code to add in an open ended tab automatically 2013-03-14 13:29:26 -04: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
Chris Dodge
724c6c9eaa reapply Ike's pull-request in a new branch. The PR branch got mangled on the rebase by accident. 2013-03-01 15:25:36 -05:00
Chris Dodge
8a7211da05 remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument. 2013-02-28 09:40:30 -05:00
Chris Dodge
905199b5eb restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive. 2013-02-27 22:37:13 -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
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
8991cdd3b5 Stop raising BaseExceptions 2012-12-28 14:51:50 -05:00
cahrens
91ce214964 Fix for Studio #96. 2012-12-20 14:59:21 -05:00
Don Mitchell
e2918c2dbd Don't save null about items to db as it chokes lms. 2012-12-13 17:23:40 -05:00
Don Mitchell
a48a392eb2 Trying to get scss back 2012-11-28 10:02:01 -05:00
Don Mitchell
91a91f4ddb Hopefully the course-info changes I had made w/o link destruction 2012-11-19 10:38:58 -05:00
Chris Dodge
1530341d55 have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder. 2012-10-22 16:01:57 -04:00
Calen Pennington
a160f6144f Fix date display in unit page 2012-10-12 15:16:44 -04:00
Calen Pennington
607b99dece Make separate links for lms_preview and lms as needed 2012-10-12 15:03:06 -04:00
Lyla Fischer
0bd5446f80 fixed date display 2012-10-11 11:58:49 -04:00
Calen Pennington
2f675be20d Coerce location to Location when generating LMS link 2012-10-10 12:49:53 -04:00
Calen Pennington
ebf2f7de60 Make enum for unit states 2012-10-10 12:49:52 -04:00
Calen Pennington
310f26a6de Basic implementation of draft, public and private modes 2012-10-10 12:49:51 -04:00
Calen Pennington
1328fc5ac0 Store published date in module metadata, and display it on draft pages 2012-10-10 12:49:51 -04:00
Calen Pennington
1a8532d8ad Make it possible to create, edit, and publish a draft 2012-10-10 12:49:51 -04:00