Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

10188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
2a1e102fca studio - resolving merge conflict with cms/templates/unit.html 2013-01-09 08:56:58 -05:00
Brian Talbot
f60a9d8d35 studio - problem speed editor: tweaking presentation of problem sub menu further 2013-01-09 08:54:40 -05: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
Don Mitchell
83b7997d12 Added unit tests and generalized a catch 2013-01-08 16:43:42 -05:00
David Ormsbee
ecb3dd6134 Merge pull request #1239 from MITx/bugfix/dave/forum_missing_vertical 
Fix parent lookups when the same named tag exists in multiple courses
 2013-01-08 13:38:23 -08:00
David Ormsbee
1122cdb286 Added more comments in response to code review. 2013-01-08 16:37:31 -05:00
Diana Huang
f0f25296b2 Update documentation 2013-01-08 15:54:49 -05:00
Brian Talbot
75447eb80d studio - problem speed editor: revised html and DOM for problem sub menu 2013-01-08 15:43:02 -05:00
cahrens
c7feee5b67 Delete speed-editor.js and cruft from unit.html. 2013-01-08 15:39:45 -05:00
Don Mitchell
1708dc4080 Use html rather than xml parsing for course updates 2013-01-08 15:13:37 -05:00
cahrens
4ac15daf44 Fix formatting. 2013-01-08 15:04:48 -05:00
cahrens
94696786c0 Merge in Don's change. 2013-01-08 14:57:15 -05:00
cahrens
f616aecd81 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 
Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee
 2013-01-08 14:56:59 -05:00
Jay Zoldak
f056f0624d Set up the framework for running lettuce tests against studio 2013-01-08 14:44:45 -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
ae4e7815a9 CapaDescriptor new unit tests 2013-01-08 13:16:38 -05:00
Brian Talbot
329982a665 pearson registration - fixed layout issue with submission errors 2013-01-08 11:48:07 -05:00
Brian Talbot
bbe0120d5c pearson registration - changed accepted classes, content, and styling to use the term process instead 2013-01-08 11:41:01 -05:00
Brian Talbot
352f284624 pearson registration - revised UI states for reg form, simplified markup for form fields, synched button styles/text b/t registration form and dashboard 2013-01-08 11:37:26 -05:00
chrisndodge
7377f4bda3 Merge pull request #1238 from MITx/fix/cdodge/turn-of-module-wrappers 
make sure we turn off module wrappers for the 'ancillary' course content
 2013-01-08 08:25:53 -08:00
Don Mitchell
6e2b4a07d8 Added is_empty to model presented to unit.html 2013-01-08 11:18:57 -05:00
Chris Dodge
99750a6812 make sure we turn off module wrappers for the 'ancillary' course content 2013-01-08 11:18:41 -05:00
Don Mitchell
76f2ef6f7c Empty template now recognized as allowing markdown editing 
Save saves markdown and updates the xml
 2013-01-08 10:53:45 -05:00
Diana Huang
19401f29d9 Minor javascript updates 2013-01-08 10:22:07 -05:00
Brian Talbot
b41f68c801 pearson registration - changing registration status states to progress-based states UI - wip 2013-01-07 17:14:11 -05:00
Don Mitchell
ca32a8b0c0 Merge pull request #1237 from MITx/fix/cdodge/return-bad-request 
be sure to return an instance of the class
 2013-01-07 13:49:11 -08: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
Chris Dodge
c7d81cc425 be sure to return an instance of the class 2013-01-07 16:28:30 -05:00
Diana Huang
3f254fc3c7 Merge branch 'master' into diana/peer-grading-views 2013-01-07 15:57:39 -05:00
Diana Huang
02247172a2 Fix some interstitial page CSS 2013-01-07 15:55:14 -05:00
Diana Huang
bbc5cd50bc Add in default value for MOCK_PEER_GRADING 2013-01-07 15:49:48 -05:00
Diana Huang
b7473f8017 Make mock service return useful data 2013-01-07 15:40:01 -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
Victor Shnayder
1db70050ff Merge pull request #1235 from MITx/fix/zoldak/clarify-doc 
Clarify the syntax of the rake fasttest command
 2013-01-07 12:29:11 -08:00
Jay Zoldak
d3fd6ac151 Clarify the syntax of the rake fasttest command 2013-01-07 15:23:08 -05:00
Brian Talbot
2ec11e5b92 pearson registration - refined error output and accommodation field display toggling 2013-01-07 15:15:50 -05:00
Diana Huang
e1ec4eec71 Get tests to pass by creating a mock peer grading service 2013-01-07 14:46:32 -05:00
Victor Shnayder
e428e9cb2a Merge pull request #1234 from MITx/fix/zoldak/clarify-doc 
Clarify that you need to start up the mongo daemon
 2013-01-07 11:19:27 -08:00
Jay Zoldak
0c6e8c4820 Clarify that you need to start up the mongo daemon 2013-01-07 14:08:18 -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
82b48dd20b put back in .gitmodules which got accidentally deleted 2013-01-07 12:43:18 -05: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