Commit Graph

12002 Commits

Author SHA1 Message Date
Calen Pennington
4040f9749d Correctly parse timetuple into datetime 2013-01-02 15:08:09 -05:00
Calen Pennington
7f39dd974b Minor whitespace cleanup 2013-01-02 15:07:56 -05:00
Calen Pennington
4bec871b0f Don't return BadRequest classes, return instances 2013-01-02 15:07:12 -05:00
Calen Pennington
8e0d218c7d Stop using .definition and .metadata directly 2013-01-02 15:06:43 -05:00
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
Calen Pennington
60fa8619cb Fixing tests 2013-01-02 10:37:49 -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
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
85e109da57 Allow field scope of None 2013-01-02 09:05:49 -05:00
Calen Pennington
344cb133aa Make import/export tests pass 2013-01-02 09:05:49 -05:00
Calen Pennington
6a612a6e02 Trim down list of equality attributes for descriptors 2013-01-02 09:05:49 -05:00
Calen Pennington
2509308ce9 Remove reference to shared_state_key 2013-01-02 09:05:48 -05:00
Calen Pennington
265a2e7630 Give children the None scope 2013-01-02 09:05:48 -05:00
Calen Pennington
fa75245e8a WIP: Start cleaning up CMS to work with new field format 2013-01-02 09:05:48 -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
Calen Pennington
16d5a769d2 Add a fasttest rake command that runs both fasttest_cms and fasttest_lms 2012-12-28 14:56:43 -05:00
Calen Pennington
6ece7fd541 Fieldify the video module 2012-12-28 14:56:43 -05:00
Calen Pennington
84cb0ce99b Move inheritance logic out into a separate file in the modulestore 2012-12-28 14:56:42 -05:00
Calen Pennington
7f8b79694c Grade problems that have ungraded student modules 2012-12-28 14:55:32 -05:00
Calen Pennington
48a1e09133 Pass in state to LCP on reset 2012-12-28 14:55:32 -05:00
Calen Pennington
c7069be2a4 Centralize logic for standardizing rerandomize values 2012-12-28 14:55:32 -05:00
Calen Pennington
e4c06fab4a Cleaning up ABTest properties 2012-12-28 14:55:32 -05:00
Calen Pennington
9bd42278e9 Don't hide the logs in tests 2012-12-28 14:55:32 -05:00
Calen Pennington
4b6ec85dcb Minor cleanups 2012-12-28 14:55:32 -05:00
Calen Pennington
db55001bf6 Use named scope for student_preferences in abtests 2012-12-28 14:55:32 -05:00