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

1660 Commits

Author SHA1 Message Date
Brian Talbot
cdcdfd49e0 studio - alerts: resolving local master merge conflcits 2013-03-18 10:58:16 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
fd3ba7db2a Don't make cms.djangoapps a python module 2013-03-15 10:50:46 -04:00
Chris Dodge
d2f216615f move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled 2013-03-14 13:57:48 -04:00
Chris Dodge
413aeed1b3 use django caching to hold computed metadata inheritence. Also invalidate the cache entries on writes (insert, updates) 2013-03-13 15:33:15 -04:00
Calen Pennington
531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-13 12:18:04 -04:00
Brian Talbot
36746fb729 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-12 16:05:54 -04:00
Chris Dodge
e5ee0a77ed hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection 2013-03-12 15:24:10 -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
cahrens
eea5900591 Add in Mark's copy changes. 2013-03-12 11:15:50 -04:00
Calen Pennington
f6b4d3aa46 Make the markdown attribute default to None, to distinguish it from the empty string 2013-03-12 10:50:14 -04:00
Calen Pennington
1411fadd28 Fix access to children via definition 2013-03-12 10:41:10 -04: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
bdf1b1b097 Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp-merge 2013-03-12 09:38:34 -04:00
cahrens
99f55266f5 Do not need to pass blacklist keys to client. 2013-03-12 09:27:46 -04:00
Calen Pennington
2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
 2013-03-12 07:23:28 -04:00
Chris Dodge
bf0e5a2701 do a bunch of pylint improvements 2013-03-11 21:14:24 -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
Calen Pennington
4cea094f70 Be a little more liberal with what count's as not having a due date in a section 2013-03-11 15:29:58 -04:00
Don Mitchell
d85f7ac9be Merge pull request #1645 from MITx/feature/cdodge/pylint-cleanup 
Feature/cdodge/pylint cleanup
 2013-03-11 12:10:05 -07:00
Chris Dodge
4ec3683c3c clean up some pylint violations 2013-03-11 14:57:04 -04:00
Chris Dodge
26f4424581 clean up some pylint violations 2013-03-11 14:55:37 -04:00
Chris Dodge
78c8358957 clean up pyling violations from views.py 2013-03-11 14:51:44 -04:00
Calen Pennington
07059d0dfc Iterate over metadata items when setting module info 2013-03-11 14:32:56 -04:00
cahrens
40af08aa2d Saving tests in progress 2013-03-11 14:01:45 -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
c1dbd98526 Fix bad reference to item_location 2013-03-11 13:07:28 -04:00
Brian Talbot
82a00104c2 studio - settings: revised markup and styling around disabled/readonly fields 2013-03-11 12:24:43 -04:00
Brian Talbot
603d11577f studio - settings: matched up styling/treatment of disabled input fields in schedule/details settings view to new advanced settings UI 2013-03-11 11:40:36 -04:00
Brian Talbot
72a7ec9e07 studio - advanced settings: removed new/delete controls from advanced policies and makde key fields readonly/disabled since we're now showing all policy metadata 2013-03-11 11:31:48 -04:00
Calen Pennington
95f8f811c5 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
 2013-03-11 10:49:29 -04:00
Calen Pennington
9c85d920ee Fixing tests created on master 2013-03-11 10:48:06 -04:00
Chris Dodge
d38b37f0b4 delete_item should update the parent's list of children to reflect the delete operation. Also added unit test 2013-03-11 10:47:22 -04:00
Calen Pennington
6395745c2b Clean up serialization on some fields 2013-03-08 21:17:19 -05:00
cahrens
a68cdd35d8 Add advanced_modules course setting back in. 2013-03-08 16:07:59 -05:00
Calen Pennington
e3f7e6024f Only display settings in the cms advanced settings page 2013-03-08 15:22:49 -05:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
cahrens
f5dd5d35e9 Need to trigger invalid instead of error, after changes for new version of Backbone. 2013-03-08 14:51:29 -05:00
Jay Zoldak
c5a9ec5e86 Speed up the lettuce test for no policy settings. 2013-03-08 13:34:28 -05:00
Jay Zoldak
3c3f6c3cbe Revert lettuce css_find function to not fail if it does not find the element. 2013-03-08 13:34:28 -05:00
Calen Pennington
8ae336792a Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-08 12:00:10 -05:00
Calen Pennington
d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics 
Add datadog metrics capture around heartbeat timing
 2013-03-08 08:59:44 -08:00
Jay Zoldak
55eefd0ef6 Fix test that sets release date to work on all platforms 2013-03-08 11:15:15 -05:00
Jay Zoldak
24d088933e Fix intermittent lettuce test failure on ubuntu. 2013-03-08 11:15:15 -05:00
Jay Zoldak
21e7bc5128 More robust handling for finding and clicking on objects by css. 
Tag tests not working under PhantomJS to skip for now.
 2013-03-08 11:15:14 -05:00
Jay Zoldak
b66d0cf5da Fix signup test on ubuntu 2013-03-08 11:15:14 -05:00
Jay Zoldak
ad5d2a9624 Update update_templates reference 2013-03-08 11:15:14 -05:00
Jay Zoldak
e84fa63826 Catch WebDriverException 2013-03-08 11:15:14 -05:00
Jay Zoldak
21c15d8f1f Click in the upper left of an element instead of the middle. 2013-03-08 11:15:14 -05:00