Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
c0efb0136e Merge branch 'master' into jmpm-analytics 2013-03-13 16:55:54 -04:00
David Ormsbee
8d4e0f8386 Add ANALYTICS_API_KEY to config files and dashboard analytics call 2013-03-13 16:55:40 -04:00
Your Name
08bc073fa5 updates 2013-03-13 16:40:04 -04:00
Calen Pennington
131e3120b9 Try to make psychometrics work with new storage model code 2013-03-13 16:35:50 -04:00
Chris Dodge
c67f1677fd remove imports of Mongo.py from modules. They shouldn't need them. Also, video captions shouldn't need special logic to compute the url rewrites as the main get_html() should do this. 2013-03-13 15:57:38 -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
Your Name
a2f9e4d565 almost there 2013-03-13 15:29:57 -04:00
David Ormsbee
33c2507abc Guard against connection errors to the Analytics service. 2013-03-13 15:27:33 -04:00
David Ormsbee
e135a4052b Better error checking with Analytics are unavailable. 2013-03-13 15:16:36 -04:00
Calen Pennington
a9c5a6388c Update to version of xblock that supports full inheritance of field attributes 2013-03-13 14:51:10 -04:00
Calen Pennington
1d1a2c8d62 Disable a few more unneeded pylint alarms 2013-03-13 14:33:58 -04:00
Brian Talbot
bf71f099d4 studio - checklists: finished static styling, initial checklist content import, and some basic JS 2013-03-13 14:09:18 -04:00
Calen Pennington
a1c375b499 Run pylint on lms/*.py and cms/*.py 2013-03-13 13:30:49 -04:00
Calen Pennington
47ebd2b661 Set pythonpath when running pylint via rake to avoid import errors 2013-03-13 13:20:11 -04:00
Your Name
7450128064 update coffeescript 2013-03-13 12:52:07 -04:00
Calen Pennington
324d286f9b Don't reference .metadata for data_dir 2013-03-13 12:47:05 -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
Calen Pennington
5379a9fd2b Make the id property available on both modules and descriptors, and make it a property, so that we aren't duplicating the location data 2013-03-13 11:56:53 -04:00
Calen Pennington
92e99d7a8b Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields 2013-03-13 11:35:50 -04:00
jmclaus
db282d891c Problem 5 grades correctly. Also added missing images 2013-03-13 16:27:56 +01:00
Brian Talbot
66a8735a58 studio - Checklists: initial design and front end proofing/firming up - WIP 2013-03-13 10:50:34 -04:00
Calen Pennington
f01c7f9469 Merge pull request #1649 from MITx/feature/jkarni/folditxblockupdate 
readding Julian Arni's update to definition
 2013-03-13 07:07:25 -07:00
Calen Pennington
cf4ea53d01 Small fixes to mongo metadata translations 2013-03-13 09:34:27 -04:00
Kevin Chugh
07534a7231 fix thread/thread id issue 2013-03-13 09:02:57 -04:00
Calen Pennington
7aa97d2999 Do metadata name translation in the mongo modulestore (because it isn't using from_json) 2013-03-13 07:42:14 -04:00
Calen Pennington
dc2dbb3412 Do metadata name translation in json import as well as xml import 2013-03-13 07:42:14 -04:00
Calen Pennington
8ace7eeb2d Translate metadata names that are coming in from the policy file as well as from xml attributes 2013-03-13 07:42:14 -04:00
Chris Dodge
e786ed2f51 re-add lost xml_importer.py code 2013-03-13 00:19:48 -04:00
Brian Talbot
1b5f040021 studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI 2013-03-12 21:57:40 -04:00
John Hess
0b2226b051 Merge pull request #1660 from MITx/hotfix/jkarni/folditorder 
Table order fix (again), changes a single character
 2013-03-12 16:17:08 -07:00
Your Name
8280c55992 pinning .1 2013-03-12 17:40:26 -04:00
Arthur Barrett
bf6ca1b0e7 use document to get scrollTop for firefox 2013-03-12 17:32:00 -04:00
Arthur Barrett
8f1e49ec88 Merge branch 'master' into feature/abarrett/annotation-styling-fixes 2013-03-12 16:56:31 -04:00
Diana Huang
faab0ac139 Merge pull request #1657 from MITx/fix/brian/regrade-partial 
add management command to regrade partial-credit problems affected by ge...
 2013-03-12 13:40:15 -07:00
Christina Roberts
349348fcd3 Merge pull request #1661 from MITx/fix/cdodge/dont-clobber-on-delete-draft 
hot fix for delete_item. The 'delete_all_versions' is useful in that it ...
 2013-03-12 13:21:42 -07:00
Calen Pennington
47420fe7c5 Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 16:18:48 -04:00
Ned Batchelder
b05b627c23 Reduce some more pylint noise 2013-03-12 16:10:37 -04:00
Brian Wilson
046e0fd75e Merge remote-tracking branch 'origin/master' into fix/brian/regrade-partial 2013-03-12 16:09:10 -04:00
Brian Talbot
36746fb729 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-12 16:05:54 -04:00
Brian Talbot
13a7e905f3 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-12 16:02:42 -04:00
Calen Pennington
174ba0039d Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 15:51:29 -04:00
Brian Wilson
47e708e713 fix pylint and pep8 warnings 2013-03-12 15:49:48 -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
Brian Talbot
d23679ea4e edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme 2013-03-12 15:04:00 -04:00
Brian Wilson
6aed059d5f Change date and remove filtering by grade. Add check for student_answers. 2013-03-12 14:55:27 -04:00
Ned Batchelder
bc854ef068 Merge branch 'master' of github.com:MITx/mitx 2013-03-12 14:34:54 -04:00
Ned Batchelder
70af75e852 Don't run pylint on migrations, and it's ok to have a global name 'log' 2013-03-12 14:34:39 -04:00
Julian Arni
830e08db1c Have definition_from_xml return (definition, children) 2013-03-12 14:34:34 -04:00
Jay Zoldak
0ee656316b Merge pull request #1659 from MITx/fix/vik/oe-pep8 
Fix/vik/oe pep8
 2013-03-12 11:34:26 -07:00
Vik Paruchuri
c40ab310c3 Blank line fixes 2013-03-12 14:24:42 -04:00