Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,143 Commits 1 Branch 0 Tags
08eb8fa7c19eaff4870cd0bea6d06a80915000eb
Commit Graph

84 Commits

Author SHA1 Message Date
Jay Zoldak
ad714a1435 Merge pull request #2517 from ionis-education-group/remove-video-autoplay 
Remove autoplay for video in course about page
 2014-03-05 10:19:52 -05:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
Bertrand Marron
1ad6468d33 Remove autoplay for video in course about page 
The iframe was generated with autoplay=1, which, sometimes, would cause
the video to play in the background.
 2014-02-07 18:33:10 +01:00
Don Mitchell
b8ea7f3c43 update_item and other refactorings continued 2014-02-05 10:24:24 -05:00
Don Mitchell
c601b75675 MixedModulestore wraps most getters, update_item, delete_item 
with code to translate between addressing schemes based on app
and persistence layer addressing scheme specification.

STUD-1206
 2014-02-05 09:34:30 -05:00
Adam Palay
e07c80e1e8 Internationalize "Not Graded" on front end (STUD-989) 
change code-side "Not Graded" to "notgraded"
 2014-01-27 14:16:34 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors 
[LMS-1614]
 2013-12-20 14:05:53 -05:00
Don Mitchell
7f91ce40ae Restful api for course advanced settings 
STUD-948
 2013-11-26 10:17:52 -05:00
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
cahrens
2c9fc59d79 Unused import. 2013-09-12 14:30:00 -04:00
cahrens
ce4fb08bdf Style cleanup. 2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Ned Batchelder
3a5f718a32 fix simple things because, damn 2013-09-04 11:10:05 -04:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
Giulio Gratta
464141c72a changing http:// to // on intro video urls to prevent browsers from blocking video embeds 2013-08-09 14:13:41 -07:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
David Baumgold
437e658f98 pylint fixes 2013-07-09 19:16:44 -04:00
Don Mitchell
a2524c517f Force locations to be Location objects earlier 2013-07-01 12:33:08 -04:00
Ned Batchelder
645d847bb1 Remove unused imports from cms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Ned Batchelder
df6d3f9b2f Fix strings that should be raw. 2013-06-19 16:56:34 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
Don Mitchell
909fe134f9 Added date_util tests back in and handle null time obj. 2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
cahrens
8705ff8805 Remove system_metadata_fields. 2013-04-29 16:41:07 -04:00
Chris Dodge
6d6b3a59fe violation fixes 2013-04-12 15:27:36 -04:00
Vik Paruchuri
65c2fd5f0c Fix some post-merge errors 2013-03-29 13:22:13 -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
cahrens
5c78218b13 Don't need to convert to milliseconds. 2013-03-27 14:52:27 -04:00
cahrens
22537ffd3b Don't need to convert to milliseconds. 2013-03-27 14:51:39 -04:00
cahrens
227a5e8266 Delete converters, move unit tests to test_fields, add new additional test cases. 2013-03-27 12:56:06 -04:00
Don Mitchell
884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse 
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
 2013-03-22 16:56:31 -04:00
Don Mitchell
8370124e2b Make to and from json for dates use iso format esp for timezone. 2013-03-22 16:16:32 -04:00
cahrens
dc89a4b3d5 Beginning of Selenium test, updates to work with master. 2013-03-18 21:25:44 -04:00
Calen Pennington
fd3ba7db2a Don't make cms.djangoapps a python module 2013-03-15 10:50:46 -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
Don Mitchell
6922152165 Merge pull request #1653 from MITx/feature/studio/advanced-settings-revamp-merge 
Advanced Settings changes.
 2013-03-12 09:13:16 -07:00
Calen Pennington
2a96c45677 Make default value for format setting None, and force lms and cms to be explicit about a string default 2013-03-12 10:16:14 -04:00
cahrens
84f2137935 Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp 2013-03-11 16:57:07 -04:00
cahrens
7e8fcb85ff Updated Selenium test, deleted dead code related to Advanced Settings. 2013-03-11 16:56:24 -04:00
Chris Dodge
4ec3683c3c clean up some pylint violations 2013-03-11 14:57:04 -04:00
Calen Pennington
7e1349775c Don't write data to metadata when updating course grading 2013-03-11 13:53:59 -04:00
Calen Pennington
e3f7e6024f Only display settings in the cms advanced settings page 2013-03-08 15:22:49 -05:00
Calen Pennington
cec3475c9d Remove references to .definition and .metadata in modules 2013-03-06 18:07:56 -05:00
Calen Pennington
b7680f3157 Fix tests except for conditional module and open ended grading 2013-03-05 15:04:59 -05: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
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
 2013-02-19 13:27:35 -05:00
Calen Pennington
2bc3000156 Fix tests 2013-02-15 15:44:11 -05:00