Jay Zoldak
f2fd90bc61
Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests
...
Fix/cale/lms jasmine tests
2013-05-01 08:23:41 -07:00
Ned Batchelder
5b82ffd2ad
A little documentation.
2013-04-30 16:11:22 -04:00
Ned Batchelder
091ca9c3f0
Add a private-requirements.txt for personal changes to how things are installed. Good for installing libs as working dirs.
2013-04-30 16:11:22 -04:00
Calen Pennington
76599863e6
Compile all coffee and sass before running jasmine tests
2013-04-30 14:09:58 -04:00
Steve Strassmann
39dd251b02
add "rake test_i18n" to rakefile; tests pass
2013-04-29 15:30:18 -04:00
Steve Strassmann
c00d71d422
integrate dummy string tools; added rake tasks and unit tests
2013-04-29 11:32:22 -04:00
Steve Strassmann
2e81fc5152
sync with master
2013-04-29 09:55:12 -04:00
Calen Pennington
b4e9de67e0
Add docs to the prereqs rake commands
2013-04-29 07:32:16 -04:00
Calen Pennington
a2aacce244
Fail hard if one of the asset compilation steps fails
2013-04-29 07:32:16 -04:00
Calen Pennington
fb28384de7
Use local install of coffee
2013-04-29 07:31:48 -04:00
Steve Strassmann
3fd004e2fe
rake tasks
2013-04-26 16:54:23 -04:00
Calen Pennington
1371fe0308
Make sure to run :predjango before gather_assets so that the xmodule_assets command is set up
2013-04-24 15:30:16 -04:00
Calen Pennington
9d94adbd1f
Merge pull request #1871 from MITx/feature/cale/fast-dev-server
...
Speed up local development
2013-04-24 12:12:05 -07:00
Calen Pennington
4d55f87ab1
Add comments on duplicate calls to compile_assets
2013-04-24 12:33:44 -04:00
Calen Pennington
fcf77c5ce6
Run pylint in fewer larger batches
2013-04-22 08:03:23 -04:00
Calen Pennington
24f97d29db
Add sass sourcemaps back into the debug build
2013-04-22 08:02:09 -04:00
Calen Pennington
ec2532ac2e
Before starting the server, forcibly rebuild assets before starting to watch them
2013-04-18 15:45:52 -04:00
Calen Pennington
729daf5cbf
Move xmodule asset gathering out of server startup
...
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Calen Pennington
3031c1da38
Fix up call to spawn
2013-04-18 07:19:32 -04:00
Calen Pennington
6a36d9dba8
Use the new gather_assets target before running tests
2013-04-18 07:19:32 -04:00
Calen Pennington
f80353121c
Don't clean pyc file and install xmodule before all arbitrary rake commands
2013-04-18 07:19:32 -04:00
Calen Pennington
afb60f790e
Change the name of the asset gathering task
2013-04-18 07:19:32 -04:00
Calen Pennington
589267599f
Run coffee and sass in watch mode when running lms or cms, and oneshot before running collectstatic
2013-04-18 07:19:32 -04:00
Calen Pennington
291e772ce0
Clean up cruft from rakefile
2013-04-18 07:18:36 -04:00
Calen Pennington
b3c470ece4
Randomize ports used by jasmine tests
...
This prevents multiple tests running in parallel from stomping on each
other.
2013-04-17 10:57:03 -04:00
Calen Pennington
f252c62f31
Enable test colors in nosetests
...
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
2013-04-17 09:58:52 -04:00
Vasyl Nakvasiuk
07b3db97a2
remove test rake task
2013-03-19 14:15:52 +02:00
Vasyl Nakvasiuk
9e7258d887
fix rakefile, fix docs
2013-03-19 12:38:08 +02:00
Vasyl Nakvasiuk
911c384527
remove old xml docs, add rake buildpubdocs, showpubdocs, pubdoc
2013-03-18 15:53:07 +02:00
Calen Pennington
a1c375b499
Run pylint on lms/*.py and cms/*.py
2013-03-13 13:30:49 -04:00
Calen Pennington
47ebd2b661
Set pythonpath when running pylint via rake to avoid import errors
2013-03-13 13:20:11 -04:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
Chris Dodge
6bacbafb6f
move call to update_templates on service startup into a django-admin command
2013-03-04 08:06:58 -05:00
Chris Dodge
816b0edfb0
add another command line argument to allow users to only simulate a delete (i.e. show what items would be deleted). This is a handy sanity checker.
2013-02-25 16:00:35 -05:00
Alexander Kryklia
059b9f66e3
poll and conditional finished
2013-02-15 18:48:39 +02:00
Calen Pennington
4f555f6480
Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model
...
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/module_info_model.py
cms/djangoapps/contentstore/tests/factories.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_details.py
cms/djangoapps/models/settings/course_grading.py
cms/templates/edit_subsection.html
common/djangoapps/mitxmako/shortcuts.py
common/djangoapps/static_replace.py
common/djangoapps/util/converters.py
common/djangoapps/xmodule_modifiers.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/abtest_module.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/discussion_module.py
common/lib/xmodule/xmodule/error_module.py
common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/js/src/video/display.coffee
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
common/lib/xmodule/xmodule/raw_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_export.py
common/lib/xmodule/xmodule/tests/test_import.py
common/lib/xmodule/xmodule/video_module.py
common/lib/xmodule/xmodule/x_module.py
common/lib/xmodule/xmodule/xml_module.py
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/djangoapps/django_comment_client/utils.py
lms/templates/staff_problem_info.html
lms/templates/video.html
rakefile
2013-02-07 15:12:30 -05:00
Calen Pennington
7fc4081495
Make pylint work on bare .py files from rake
2013-02-06 11:10:54 -05:00
Calen Pennington
0b650122fb
Config changes to make pep8 autofixes easier
2013-02-06 11:10:54 -05:00
Ned Batchelder
890f02a232
When installing the local requirements, don't upgrade dependencies. Makes things faster.
2013-01-25 12:26:17 -05:00
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
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
8ba4163557
WIP. Data loads, but not all of it
2012-12-28 14:39:13 -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
