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

15584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Andrés Rocha
80d809a86a Add location note to jobs page 
LMS Lighthouse [#190]
 2013-03-14 06:52:28 -07:00
Carlos Andrés Rocha
b4d83a5f44 Add 2.01x announcement to news feed 
LMS Lighthouse [#259]
 2013-03-14 06:49:07 -07:00
Carlos Andrés Rocha
15d8727fce Fix ids in feed.rss 2013-03-14 06:38:55 -07:00
cahrens
564374048e A little cleanup. 2013-03-14 09:35:26 -04:00
cahrens
065e850449 Merge with Brian's changes. 2013-03-14 09:32:54 -04:00
cahrens
e0207432ca Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1 Saving work. 2013-03-14 09:22:58 -04:00
Peter Baratta
bac9f1f571 Merge branch 'master' into peter/symbolic 2013-03-14 06:31:17 -06:00
Peter Baratta
75b561267c Script feature fix 2013-03-14 06:29:51 -06:00
David Ormsbee
753cc9ec2a Merge pull request #1666 from MITx/feature/kevin/pinning 
Feature/kevin/pinning
 2013-03-13 18:05:24 -07:00
Kevin Chugh
8d766c4b51 fix conflict 2013-03-13 21:01:37 -04:00
Calen Pennington
3211221f98 Merge pull request #1664 from MITx/feature/cdodge/cache-metadata-inheritence-in-django-cache 
use django caching to hold computed metadata inheritence. Also invalidat...
 2013-03-13 17:13:02 -07:00
Your Name
7f877344d6 added comment to explain sorting 2013-03-13 19:47:19 -04:00
Your Name
896ee094c6 added comment to explain sorting 2013-03-13 19:44:41 -04:00
jkarni
55a9bba166 Merge pull request #1663 from MITx/jmclaus/genex-problem5-fix 
Problem 5 grades correctly. Also added missing images for dialog box.
 2013-03-13 16:29:03 -07:00
Brian Talbot
1fce77d8b2 Merge branch 'master' into feature/btalbot/studio-checklists 2013-03-13 19:19:38 -04:00
Brian Talbot
7b74d972a1 studio - checklists: defaulting checklist visual progress to 0% 2013-03-13 19:18:47 -04:00
Brian Talbot
16f6744aef studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states 2013-03-13 19:13:26 -04:00
Your Name
97eb7eb58b remove whitespace 2013-03-13 19:07:46 -04:00
Your Name
6ee14ec34a candidate without inline 2013-03-13 18:51:40 -04:00
Your Name
fc907fe055 candidate without inline 2013-03-13 18:50:00 -04:00
Your Name
117be695cb candidate without inline 2013-03-13 18:40:10 -04:00
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