Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,586 Commits 1 Branch 0 Tags
9f19eafcf07cdee659a0ccbcf14953a736660421
Commit Graph

144 Commits

Author SHA1 Message Date
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-17 05:55:22 -08:00
cahrens
9818664bb1 storing work 2013-01-15 16:04:34 -05:00
Chris Dodge
39769ea997 allow for optional 'COURSE_DIR' parameter for the import rake target so that we can import only a single course 2013-01-14 22:51:56 -05:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -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
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
Chris Dodge
b40a8a3e9e implement course clone and delete functionality from the command line 2012-12-20 13:55:15 -05:00
Chris Dodge
95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from 2012-12-12 10:57:06 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
Calen Pennington
2145ff6d1f Provide more info when django has issues when running from rake, and don't install dependencies of common/lib/libraries before every run of a django command 2012-11-26 11:25:46 -05:00
Calen Pennington
4e3da342d7 Merge pull request #1048 from MITx/feature/cdodge/xlint 
Feature/cdodge/xlint
 2012-11-26 08:11:34 -08:00
Victor Shnayder
03dd7b375a get rid of submodule init--not needed post-askbot 2012-11-17 15:59:12 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08:00
Jay Zoldak
718ce4db28 Get Problem constructor working again, and copy the helper file from lms. 2012-11-16 13:02:38 -05:00
Jay Zoldak
bf6a147c85 Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc. 2012-11-15 15:43:39 -05:00
Calen Pennington
93cc17cf3b Starting to generate jasmine tests for common/lib 2012-11-14 15:03:55 -05:00
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -05:00
Chris Dodge
da3c3e5f20 initial xlint implementation. Accumulate all import errors during XmlModuleStore importing. Also do checks post XmlModuleStore import and assert that the structure (course->chapter->sequential->vertical) is present in the courses. 2012-11-09 13:54:12 -05:00
Chris Dodge
981f5cee45 initial buildout of a 'xlint' test to verify legacy coursewar 2012-11-08 16:07:17 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -05:00
Calen Pennington
e50a442d88 Only try to generate html and xml coverage reports if the source .cover file exists 2012-11-08 12:06:05 -05:00
Calen Pennington
686cab4545 Build all available coverage xml and html, even if some is missing 2012-11-08 11:32:27 -05:00
Ned Batchelder
28bb4724e7 Put the coverage data files in the reports dir, where they will be treated like the disposable things they are. 2012-11-08 11:20:23 -05:00
Ned Batchelder
d3e2e739a7 Add the .coverage files to the clobber task. 2012-11-08 11:20:23 -05:00
Calen Pennington
83e2b362e4 Make reports directory build work correctly 2012-11-08 11:20:23 -05:00
Calen Pennington
0cf46f7636 Namespace the coverage html and xml report generation tasks 2012-11-08 11:20:23 -05:00
Calen Pennington
1968a1dde5 Remove attempt to use virtualenv python when running django-admin commands 2012-11-08 11:20:22 -05:00
Calen Pennington
899132a9bb Force django to run using the python from the virtualenv 2012-11-08 11:20:22 -05:00
Ned Batchelder
3dc23eb131 Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'. 2012-11-08 11:20:22 -05:00
Calen Pennington
c3f0d31cc9 Split out requirements that come from the local mitx repo and those that come from github, and upgrade the local requirements before running tests 2012-11-08 11:20:16 -05:00
Ned Batchelder
90e3386751 WIP for quieter tests with coverage. 2012-11-08 11:19:33 -05:00
Ned Batchelder
7eb196df38 Run coverage directly instead of as a plugin. Also quiet the install and clean steps of tests. 2012-11-08 11:19:33 -05:00
Ned Batchelder
7033faf18c Don't show stdout from collectstatic during tests. 2012-11-08 11:19:32 -05:00
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests 
Feature/cale/js tests
 2012-11-08 06:44:49 -08:00
Александр
b8dc44c6ca commands for viewing and compiling docs 2012-11-02 17:17:12 +02:00
Calen Pennington
255720abd7 Clean old javascript tests from CAS 2012-10-31 13:21:36 -04:00
Calen Pennington
8d4ee3b05e Add more documentation of development tasks 2012-10-31 10:37:21 -04:00
Calen Pennington
0674d4e74b Only allow django-admin to run in reload mode when browsing jasmine tests, and only kill the whole process group in that case (so as to know kill jenkins) 2012-10-30 16:16:09 -04:00
Calen Pennington
cd9fbaeb02 Add timeout so that jasmine tests eventually fail if the server doesn't start 2012-10-30 15:51:21 -04:00
Calen Pennington
6d5a1264b9 Move jasmine tests to their own environment 2012-10-30 10:58:38 -04:00
Calen Pennington
684b98505d Make rake commands to run jasmine tests in browser and via phantomjs 2012-10-30 10:41:02 -04:00
Victor Shnayder
4bf9323eed More test speedups: 
- Add tasks to test lib without coverage
- Add a coverage flag to test.py (set to True, for manual tweaking for now)
 2012-10-15 02:23:00 -04:00
John Jarvis
bd45dbd8d4 Adding django-admin/rake command to set the staff bit 2012-10-10 09:46:30 -04:00
Calen Pennington
d8e742b9ee Re-install both xmodule and capa before running local dev server 2012-09-28 10:33:22 -04:00
Calen Pennington
0a55e1eae1 Add sub-environments for the lms that is running alongside the lms for debugging 2012-09-17 13:51:33 -04:00
Calen Pennington
317e2c345e Add autodeploy properties task to rakefile 2012-09-10 11:37:02 -04:00
Calen Pennington
5b7ae1a99b Add more excludes to rakefile 2012-08-22 15:14:25 -04:00
Calen Pennington
445ce72b53 Leave management of services and package installation to puppet 2012-08-17 14:59:11 -04:00
David Ormsbee
689c761bbc Remove comment in Rakefile I was just testing. 2012-08-10 17:07:03 -04:00