Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
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
cahrens
708736c42d Unit tests around the save method (xml and markdown). 2013-01-10 14:27:50 -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
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
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
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
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
chrisndodge
ee9b9d0422 Merge pull request #1249 from MITx/feature/cas/speed-editor 
Feature/cas/speed editor
 2013-01-09 17:52:46 -08:00
Brian Wilson
468d703b57 Update CDD export to output only changed records. 2013-01-09 18:08:05 -05:00
Don Mitchell
7f836e77a7 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 16:28:36 -05:00
Don Mitchell
35e353e06b Oops, xxp was going to (x) xp :-( now ( ) xxp :-) 2013-01-09 16:28:25 -05:00
cahrens
2caa5a518f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 16:20:51 -05:00
cahrens
b3d168b6f2 Make editor names consistent. 2013-01-09 16:20:38 -05:00
Don Mitchell
603c6ce296 Get rid of extra space at beginning of markdown for templates 2013-01-09 16:17:58 -05:00
Don Mitchell
d0e06e1a35 With improved unit tests to test machavellian (sic) patterns 2013-01-09 16:03:09 -05:00
Chris Dodge
e11706ef07 change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores 2013-01-09 15:53:22 -05:00
Diana Huang
6bebb1b7a5 Merge branch 'master' into feature/diana/rubric-input 2013-01-09 15:45:22 -05:00
Don Mitchell
373c8eb2a7 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 15:36:28 -05:00
Don Mitchell
8245ebac83 On menu based markdown conversion, 
be picky about x as marker for correct requiring it to be first
non-whitespace char on line, followed by whitespace, followed eventually
but another non-whitespace char
 	strip trailing newline from selection.
 2013-01-09 15:36:16 -05:00
cahrens
914132f802 remove tiny mce link CSS 2013-01-09 15:10:41 -05:00
cahrens
1252181fe1 Code review cleanup. 2013-01-09 14:11:13 -05:00
Brian Wilson
cc8e8ba6c6 Pearson reg: relax validation of phone country codes. 2013-01-09 13:31:04 -05:00
Don Mitchell
144c6bca8b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 11:38:23 -05:00
Don Mitchell
fff9afdeb8 Minor cleanups 2013-01-09 11:38:01 -05:00
Brian Wilson
8ad9bc5949 Move Pearson URL to settings. Fix Register button. Other small changes. 2013-01-09 11:26:54 -05:00
cahrens
64387a4f0c Tom cruft to be deleted, problem editor CSS moved to correct location. 2013-01-09 11:06:18 -05:00
Chris Dodge
9b72d11473 add some comments to the change 2013-01-09 10:47:29 -05:00
Chris Dodge
fd600e5be2 add some simple in-mem caching for course TOC. This is a problem when running against Mongo since courses are created/disposed very frequently 2013-01-09 10:38:32 -05:00
cahrens
d53669fcb9 Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor 2013-01-09 09:41:35 -05:00
cahrens
b97955965a Warn user when going to XML Editor. Cleanup and comments. 2013-01-09 09:39:46 -05:00
Calen Pennington
5a95dd28b1 Merge pull request #1227 from MITx/feature/ichuang/fix-capa-contextualize-text-for-option-response-and-mc 
fix capa to add contextualize_text for optionresponse and multiplechoice
 2013-01-09 06:08:45 -08:00
Brian Wilson
a5cce4769e add accommodation listing, and revise error messages 2013-01-09 02:14:02 -05:00
Brian Wilson
25f08374ca hook up more registration status boxes 2013-01-08 17:42:15 -05:00
David Ormsbee
1122cdb286 Added more comments in response to code review. 2013-01-08 16:37:31 -05:00
cahrens
94696786c0 Merge in Don's change. 2013-01-08 14:57:15 -05:00
David Ormsbee
051339afb0 Tiny cleanup. 2013-01-08 13:54:44 -05:00
David Ormsbee
8952eda98d XML loaded courses should no longer be able to throw NoPathToItem. 
The parent trees are built on a per-course basis (so it'll throw ItemNotFoundError
if an item exists in a different course from the one you're asking after. NoPathToItem
can still happen with MongoDB backed courseware. They store things like the info page
as HTML snippets which are orphaned from other content.
 2013-01-08 13:45:13 -05:00
cahrens
bc10d080df Save work 2013-01-08 13:39:16 -05:00
David Ormsbee
fc0a7614bf Load courses in dir name order, keep separate ParentTracker per course. 2013-01-08 13:38:22 -05:00
Don Mitchell
735aa13496 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 16:48:57 -05:00
Don Mitchell
e46a76da98 xml conversion unit tests plus a fix to the conversion which they 
brought to light
 2013-01-07 16:48:42 -05:00
cahrens
5711a9af68 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 15:32:39 -05:00
cahrens
d7b05e485d Add insertion of problem types. 2013-01-07 15:32:11 -05:00
Don Mitchell
d8d4c37331 Yaml files now generate markdown in a readable and xml convertable 
format. The xml converter works.
 2013-01-07 13:57:21 -05:00
chrisndodge
791c00cd7b Merge pull request #1233 from MITx/feature/cdodge/cms-master-merge2 
Feature/cdodge/cms master merge2
 2013-01-07 09:57:33 -08:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Don Mitchell
9dad3ba90d Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 12:33:55 -05:00
Don Mitchell
c2f0ea49bd Hopefully fixed yamls for markdown 2013-01-07 12:32:54 -05:00
cahrens
75b9740932 Update for Don's change. 2013-01-07 12:08:34 -05:00
cahrens
e296d52c7d merge 2013-01-07 12:06:12 -05:00