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
Diana Huang
8737009679 Merge branch 'master' into diana/peer-grading-views 2013-01-02 15:04:18 -05:00
chrisndodge
edd9b2bc7b Merge pull request #1220 from MITx/fix/cdodge/handout-links 
trigger another build
 2013-01-02 12:02:24 -08:00
Diana Huang
37f261f906 Move peer grading so that there are the individual problem pages 
and the problem list page
 2013-01-02 15:01:59 -05:00
Chris Dodge
b5ccb4b8fc trigger another build 2013-01-02 15:01:21 -05:00
chrisndodge
fa0fd4b50b Merge pull request #1219 from MITx/fix/cdodge/handout-links 
another comment commit just to trigger a new build
 2013-01-02 11:29:56 -08:00
Chris Dodge
d008cb9f3c another comment commit just to trigger a new build 2013-01-02 14:25:35 -05:00
Don Mitchell
94f396b988 Merge pull request #1218 from MITx/bug/btalbot/editview-images 
studio - resolved overflowing images in unit editing
 2013-01-02 10:19:36 -08:00
Brian Talbot
a5aafc42ad studio - resolved unit editing bug where larger images would overflow out of editing visual area 2013-01-02 12:58:59 -05:00
Jay Zoldak
56d17d8a8a Improve some comments and names in the acceptance test framework 2013-01-02 10:44:21 -05:00
Jay Zoldak
d5111b9ed9 Get lettuce tests running against test database 2013-01-02 10:44:21 -05:00
Jay Zoldak
ccc8b599f1 Fixed tests to work OK so far. 2013-01-02 10:44:21 -05:00
Jay Zoldak
7e5a67badf Add new partner universities and remove cs50 from smart accordion testing 2013-01-02 10:44:20 -05:00
Jay Zoldak
7f6d55ad86 Create acceptance tests for open ended grading. 2013-01-02 10:44:20 -05:00
Jay Zoldak
6df565e468 Interim work on open-ended grading acceptance testing POC 2013-01-02 10:44:20 -05:00
Jay Zoldak
d65985b445 Use beautiful soup to massage the HTML for easier comparison. 
Strip off the data-id tag for HTML diff of courseware

Strip data-id attributes so they are not compared in the HTML
 2013-01-02 10:44:20 -05:00
Jay Zoldak
8934f54d6f Save the HTML to a file for each section and comment out debug msgs 2013-01-02 10:44:20 -05:00
Jay Zoldak
5cad5d5fba Add scenarios for all Fall 2012 courses to smart accordion feature. 2013-01-02 10:44:20 -05:00
Jay Zoldak
20cc930312 Bring over acceptance test changes from cms master branch. 2013-01-02 10:44:20 -05:00
Jay Zoldak
af4f1668d7 Stub out the video and capture the html files of the high level tabs for diff comparison 
Conflicts:
	lms/templates/video.html
 2013-01-02 10:44:20 -05:00
Jay Zoldak
10275e9709 Add item checking within courseware tabs 2013-01-02 10:44:19 -05:00
Jay Zoldak
a40ea202d2 Cleanup of imports in courseware tests 2013-01-02 10:44:19 -05:00
Jay Zoldak
0a77dd4431 Smart accordion walkthrough working for cms-master branch 
Conflicts:
	lms/envs/cms/acceptance.py
 2013-01-02 10:44:19 -05:00
Jay Zoldak
668bc81d7f New branch for clean lms acceptance tests 2013-01-02 10:44:19 -05:00
David Ormsbee
8bf393fbba Merge pull request #1182 from MITx/bridger/feature/ungraded_course 
Visual changes for ungraded courses
 2013-01-02 07:19:34 -08:00
Diana Huang
deffa188ff Fix some minor problems and add new key for peer grading. 2013-01-02 09:43:21 -05:00
chrisndodge
a25021b613 Merge pull request #1215 from MITx/fix/cdodge/handout-links 
basically force another build by adding a comment
 2012-12-28 13:49:08 -08:00
Chris Dodge
cf3df23094 basically force another build by adding a comment 2012-12-28 16:48:02 -05:00
Diana Huang
652a8eb440 New peer grading view on the lms side 2012-12-28 15:48:06 -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