Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 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
Calen Pennington
eb1ab3ea7d Add tests of xmodule.model and xmodule.runtime, and fix some exposed bugs 2012-12-28 14:48:47 -05:00
Calen Pennington
01411ae66e WIP: Trying to get tests working 2012-12-28 14:48:47 -05:00
Calen Pennington
7e224f5847 Convert a bunch more references from metadata to fields 2012-12-28 14:45:46 -05:00
Calen Pennington
57b3ceba27 Add a field type that treats a string as an int 2012-12-28 14:45:46 -05:00
Calen Pennington
45544396a8 Make computed defaults work, even in namespaces 2012-12-28 14:45:46 -05:00
Calen Pennington
25754b50ff WIP. Trying to fix inheritance 2012-12-28 14:45:46 -05:00
Calen Pennington
c5e3380b71 WIP: Save student state via StudentModule. Inheritance doesn't work 2012-12-28 14:45:46 -05:00
Calen Pennington
cbfc7b201a WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms 2012-12-28 14:44:31 -05:00
Calen Pennington
8ba4163557 WIP. Data loads, but not all of it 2012-12-28 14:39:13 -05:00
chrisndodge
3d6cbf4709 Merge pull request #1214 from MITx/fix/cdodge/handout-links 
add a comment. Namely we just want to trigger another build.
 2012-12-28 11:28:18 -08:00
Chris Dodge
f343052711 add a comment. Namely we just want to trigger another build. 2012-12-28 14:26:52 -05:00
chrisndodge
4834ed3574 Merge pull request #1213 from MITx/fix/cdodge/handout-links 
add forgotten new file
 2012-12-28 10:53:39 -08:00
Chris Dodge
725805f1cf add forgotten new file 2012-12-28 13:52:49 -05:00
Diana Huang
d23eb93fbb add new peer grading service with some rudimentary logic 2012-12-28 13:35:35 -05:00
Diana Huang
125945de90 Refactor get and post logic into new GradingService 2012-12-28 13:34:07 -05:00
Don Mitchell
cba888c615 Merge pull request #1212 from MITx/fix/cdodge/handout-links 
Fix/cdodge/handout links
 2012-12-28 09:43:58 -08:00
Chris Dodge
6d20292ae8 add unit test to make sure rewriting is occuring when querying the handouts 2012-12-28 12:21:14 -05:00
Chris Dodge
7a4d89b1ad add in static asset link rewriting to the Course Handout section 2012-12-28 11:34:45 -05:00
Diana Huang
ecf04b3e49 Refactor existing grading logic into a new app. 2012-12-28 11:29:29 -05:00
Don Mitchell
bd8661a8b5 Merge pull request #1211 from MITx/feature/cdodge/export 
Feature/cdodge/export
 2012-12-27 13:38:28 -08:00
Chris Dodge
507a1dc073 remove unused white space and imports 2012-12-27 16:33:10 -05:00
Don Mitchell
a0fa8c98bc Merge pull request #1210 from MITx/fix/cdodge/wiki-slug-setting 
append some character, in this case a '_', if the course number is reall...
 2012-12-27 13:20:40 -08:00
Chris Dodge
c0f12e69f7 fixes on the export. There's some attributes not being handled correctly 2012-12-27 16:15:52 -05:00
Chris Dodge
239b118abe add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup. 2012-12-27 15:31:12 -05:00
Chris Dodge
8e5fc2917a Merge branch 'feature/btalbot/cms-export' into feature/cdodge/export 2012-12-27 14:43:36 -05:00
Chris Dodge
3fa425c5d0 add unit test for import->export->import simple flow 2012-12-27 14:40:38 -05:00
Chris Dodge
625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export 
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
 2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da Merge pull request #1208 from MITx/feature/cdodge/clone-course 
fix up some thumbnail issues. Also we need to manage the user permission...
 2012-12-27 09:26:51 -08:00
Chris Dodge
6951865229 add unit tests for course cloning and deleting 2012-12-27 12:20:45 -05:00
chrisndodge
a2d283d9e9 Merge pull request #1209 from MITx/bug/dhm/dec12 
Got settings details unit tests to invoke the view handlers
 2012-12-27 08:34:58 -08:00
Chris Dodge
9dff39dd6d start adding clone unit test 2012-12-27 11:25:04 -05:00
Don Mitchell
03e79cc819 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-27 11:22:29 -05:00
Don Mitchell
da343fd1d7 Finally! Details unit tests work and pass. Grading ones are fairly far 
along.
 2012-12-27 11:22:15 -05:00
Diana Huang
f8a528f327 Merge branch 'master' into feature/diana/rubric-input 2012-12-27 10:47:15 -05:00
Chris Dodge
fe408be1cc message edit 2012-12-27 10:32:07 -05:00
Chris Dodge
7088821233 fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message 2012-12-27 10:30:26 -05:00
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
chrisndodge
9f04f19a1c Merge pull request #1205 from MITx/bug/dhm/dec12 
Bug/dhm/dec12
 2012-12-27 07:03:34 -08:00
Don Mitchell
83bc9d7bf8 Grader unit tests (partial) 2012-12-26 15:48:37 -05:00
Don Mitchell
8d9a221945 Delete not-yet-implemented file 2012-12-26 13:50:01 -05:00
Don Mitchell
88b2457c13 Bug 98: no unit tests b/c it's just text in hmtl 2012-12-26 11:47:42 -05:00
Don Mitchell
a35c1386f2 Bug 99: don't show date as 'Unset' but leave out altogether if not set 
plus commented out failing unit tests until I can get someone to help
debug them.
 2012-12-26 11:30:31 -05:00
Don Mitchell
58abb10c2d Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12 2012-12-26 10:31:10 -05:00
Don Mitchell
ff490599fa Debugging unit tests 2012-12-26 10:29:35 -05:00
Brian Talbot
c9e5c47b30 removed progress bar UI from export UI 2012-12-26 09:19:08 -05:00
Brian Talbot
ed3f3b02d6 studio - course export UI alpha - roughing in states/views 2012-12-26 09:10:05 -05:00
David Ormsbee
e4dff3f788 Merge pull request #1201 from MITx/feature/rocha/change-courses-layout 
Fix broken display of courses in university profile
 2012-12-21 13:40:08 -08:00
Carlos Andrés Rocha
1ac41787a7 Fix broken display of courses in university profile 2012-12-21 16:38:17 -05:00
David Ormsbee
bcb5eda222 Merge pull request #1190 from MITx/fix/alex/opendocs_linux 
Fix/alex/opendocs linux
 2012-12-21 12:24:04 -08:00
David Ormsbee
8532d79ea5 Merge pull request #1198 from MITx/feature/ichuang/update-tracking-log-sql-schema 
update schema for tracking sql logs - larger fields; add hostname
 2012-12-21 12:23:45 -08:00