Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,547 Commits 1 Branch 0 Tags
4efe5789ed4081b4e73d716d513b02c4e3da041b
Commit Graph

8547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chrisndodge
4efe5789ed Merge pull request #1269 from MITx/feature/cdodge/cms-master-merge3 
Feature/cdodge/cms master merge3
 2013-01-11 12:23:29 -08:00
Chris Dodge
9479ef3c84 fix up call signatures for get_parent_locations() 2013-01-11 14:29:53 -05:00
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -05:00
Jay Zoldak
d0c4e2e916 Merge pull request #1267 from MITx/bug/btalbot/cms-sectiontoggling-test 
studio - changed expectation of lettuce test for course overview toggle
 2013-01-11 09:33:15 -08:00
Brian Talbot
e7e26a471c studio - changed expectation of lettuce test for course overview section toggling 2013-01-11 12:03:17 -05:00
chrisndodge
445a923ab8 Merge pull request #1266 from MITx/fix/cdodge/preview-failing 
need to add the depth parameter to the DraftMongoStore   implementation ...
 2013-01-11 08:59:24 -08:00
Chris Dodge
476e6c7b3b need to add the depth parameter to the DraftMongoStore implementation of get_instance 2013-01-11 11:57:41 -05:00
chrisndodge
0919c185f6 Merge pull request #1265 from MITx/bug/dhm/jan13 
Handle metadata from save being empty
 2013-01-11 07:55:51 -08:00
Don Mitchell
c05d887904 Handle metadata from save being empty 2013-01-11 10:39:57 -05:00
chrisndodge
5368a9ad3e Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf 
Decrease the number of queries needed for LMS courseware
 2013-01-11 07:23:00 -08:00
Christina Roberts
4eca8254ae Merge pull request #1264 from MITx/feature/cas/speed-editor 
Cheat sheet for heading and explanation.
 2013-01-11 06:53:26 -08:00
Don Mitchell
26e55f34a4 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-11 09:39:25 -05:00
Christina Roberts
5e28e59817 Merge pull request #1262 from MITx/feature/cas/speed-editor 
explanation markdown
 2013-01-11 06:37:26 -08:00
Don Mitchell
d53ca05d6c Placeholder images for cheat sheet 2013-01-11 09:37:08 -05:00
Don Mitchell
e095a139b9 Cheat sheet updated for header and explanation. Video removed. 2013-01-11 09:36:29 -05:00
Don Mitchell
495814c01a Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-10 17:00:13 -05:00
Victor Shnayder
e97469aee6 Merge pull request #1236 from MITx/diana/peer-grading-views 
Peer Grading Interface
 2013-01-10 13:59:46 -08:00
Don Mitchell
5205ada498 Merge pull request #1261 from MITx/fix/zoldak/studio-toggle-bdd-tests 
Add BDD lettuce tests for studio overview toggle section feature.
 2013-01-10 13:52:55 -08:00
Diana Huang
5bdf91e812 Merge branch 'diana/peer-grading-improvements' into diana/peer-grading-views 2013-01-10 16:50:18 -05:00
Diana Huang
7fcfe0359d Merge branch 'master' into diana/peer-grading-views 2013-01-10 16:47:50 -05:00
Diana Huang
d0e00af60e Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements 2013-01-10 16:45:40 -05:00
Diana Huang
81bb2dc979 Better and clearer comments along with some fixes 
for code review issues
 2013-01-10 16:45:19 -05:00
David Ormsbee
232393b4f1 Merge pull request #1259 from MITx/feature/rocha/add-is_new-flag-to-courses 
Add property to course module to check if a course is new
 2013-01-10 13:40:48 -08:00
Don Mitchell
c289575b49 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-10 16:40:32 -05:00
Don Mitchell
fa2a243068 Explanation markup 2013-01-10 16:40:05 -05:00
Jay Zoldak
64e8f9c0cd Add BDD lettuce tests for studio overview toggle section feature. 2013-01-10 16:00:40 -05:00
Carlos Andrés Rocha
8f21d7a738 Add property to course module to check if a course is new 
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.

Also adds a property to check how many days are left until the course starts.
 2013-01-10 15:57:29 -05:00
Diana Huang
ef6d77b116 Clean up names and refactor out some common logic 2013-01-10 15:33:17 -05:00
Diana Huang
084a3c33c8 Update comments and remove some unnecessary code 2013-01-10 15:20:46 -05:00
Diana Huang
0bfb1feed4 Log better exceptions 2013-01-10 15:06:16 -05:00
Diana Huang
4909b84966 Clean up code and make the arguments for get and post more logical. 2013-01-10 14:51:32 -05:00
Don Mitchell
c74605abf0 Merge pull request #1258 from MITx/fix/cdodge/export-create-recursive-folders 
the parent directory might not already exist, so we have to call makedir...
 2013-01-10 11:46:21 -08:00
Chris Dodge
dc8f23d6ae the parent directory might not already exist, so we have to call makedir with recursive=true to auto-create any parent folders 2013-01-10 14:41:19 -05:00
Calen Pennington
cb3b17d44c Catch ItemNotFound errors at the top of get_module, rather than in get_module_for_descriptor, to maintain previous LMS behavior 2013-01-10 14:30:12 -05:00
cahrens
708736c42d Unit tests around the save method (xml and markdown). 2013-01-10 14:27:50 -05:00
Diana Huang
3a29d260ae Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements 2013-01-10 14:12:06 -05:00
chrisndodge
010a1f2735 Merge pull request #1257 from MITx/feature/cas/speed-editor 
Feature/cas/speed editor
 2013-01-10 10:58:33 -08:00
Calen Pennington
0726294c35 Use get_child_descriptors for grades.py 2013-01-10 13:55:46 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware 
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
 2013-01-10 13:55:46 -05:00
cahrens
993d59b230 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-10 13:50:57 -05:00
cahrens
58837066b0 A couple renames. 2013-01-10 13:50:21 -05:00
Don Mitchell
70e5344949 Merge pull request #1256 from MITx/fix/cdodge/import-ordering-error 
make sure we commit the course module first when importing. There's a sn...
 2013-01-10 10:40:30 -08:00
Christina Roberts
a7887721af Merge pull request #1255 from MITx/bug/btalbot/unit-editing 
Moving Static Component View Under Modal While Editing
 2013-01-10 10:35:31 -08:00
Chris Dodge
76059b52e7 make sure we commit the course module first when importing. There's a sneaky little ordering dependency where we can't save a static tabe until the course module has been saved. This is because - when saving a static tab - we have to scribble on the course module's metadata to point to it. 2013-01-10 13:24:40 -05:00
Brian Talbot
4128f37a1f studio - moving a component's static view visually below modal while editing 2013-01-10 13:18:26 -05:00
Diana Huang
19bc657487 Use correct version of the grader id. 2013-01-10 12:44:54 -05:00
Christina Roberts
e5d73107bd Merge pull request #1254 from MITx/bug/dhm/jan13 
update timepicker to fix minutes bug
 2013-01-10 09:25:38 -08:00
Christina Roberts
b3af587ba0 Merge pull request #1247 from MITx/feature/btalbot/cms-sectiontoggling 
Course Overview Section Collapse/Expand Toggling
 2013-01-10 09:04:26 -08:00
cahrens
bcafc5fdfb Bug fix for modal cover not going way when click outside of edit (#106). 2013-01-10 11:07:11 -05:00
Don Mitchell
04582f4e7c Update timepicker b/c it wasn't handling minutes from 01-09 and they'd 
fixed it
 2013-01-10 11:05:14 -05:00