Calen Pennington
6b64b4214f
Make relative imports explicitly relative
2013-03-15 11:23:22 -04:00
Calen Pennington
f1c66e9178
Make common/djangoapps not a python module either
2013-03-15 11:16:15 -04:00
Calen Pennington
531eb80eb2
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-13 12:18:04 -04:00
Jay Zoldak
f9f0bd0deb
Update course factory to reflect XBlock changes
2013-03-12 14:05:12 -04:00
Victor Shnayder
b06615298f
Add logging to debug strange cohort behavior on prod.
...
Strange behavior:
- There are 20 cohorts that users should be randomly assigned
into in HeroesX
- Almost all, but not all (e.g. ~3300 / 3400) users end up in the
same group.
- testing manually locally and on prod in a django shell shows
nothing wrong
2013-03-11 15:24:14 -07:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
Calen Pennington
8ae336792a
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
2013-03-08 12:00:10 -05:00
Calen Pennington
d9b68e2de2
Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics
...
Add datadog metrics capture around heartbeat timing
2013-03-08 08:59:44 -08:00
Jay Zoldak
1f30baabfd
Change default browser for lettuce back to chrome.
2013-03-08 11:15:14 -05:00
Jay Zoldak
21e7bc5128
More robust handling for finding and clicking on objects by css.
...
Tag tests not working under PhantomJS to skip for now.
2013-03-08 11:15:14 -05:00
Calen Pennington
cd802d8e14
Add datadog metrics capture around heartbeat timing
2013-03-08 10:36:59 -05:00
Victor Shnayder
84f05f9f61
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-03-08 00:40:18 -05:00
Chris Dodge
c23c5cc3d9
add comments
2013-03-07 16:12:21 -05:00
Chris Dodge
891bddcdf9
need to support link references to static content that is in the code base (e.g. module's .js/.css)
2013-03-07 14:28:09 -05:00
Calen Pennington
cec3475c9d
Remove references to .definition and .metadata in modules
2013-03-06 18:07:56 -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
David Ormsbee
a00f11c1ff
Tell user that spaces aren't allowed in usernames (requested by Teppo).
2013-03-04 11:17:29 -05:00
Ned Batchelder
7c8a90229e
Use 'is None' and 'is not None'
2013-03-04 10:57:25 -05:00
David Ormsbee
11f864f489
Merge pull request #1530 from MITx/feature/cale/limit-login-lifetime
...
Limit remembered logins to 7 days, so that old cookies will eventually expire
2013-03-01 11:37:46 -08:00
Carlos Andrés Rocha
2ca303c95d
Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
...
Feature/cas/manual policy merged
2013-02-27 09:02:07 -08:00
David Ormsbee
f519c4f571
Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui
...
Feature/victor/revert revert of forums ui
2013-02-25 09:03:33 -08:00
Victor Shnayder
01a38c29be
Add auto-cohorting functionality.
...
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
2013-02-24 18:48:01 -05:00
Jay Zoldak
af2690fcaf
Update lettuce test framework to use a course factory instead of the studio UI for creating courses
2013-02-22 12:36:27 -05:00
Jay Zoldak
e337292b5f
Fix existing advanced settings lettuce tests.
2013-02-21 18:20:42 -05:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
Ned Batchelder
c3b571bf9b
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
2013-02-21 11:38:45 -05:00
Calen Pennington
3d36736cf3
Limit remembered logins to 7 days, so that old cookies will eventually expire
2013-02-21 09:05:19 -05:00
cahrens
dd959d1123
Longer warning got merged out.
2013-02-20 15:01:41 -05:00
Jay Zoldak
05f32f4bc9
Update tests for the advanced policy settings feature.
...
Includes adding a method for css_click_at.
2013-02-20 14:30:39 -05:00
Jay Zoldak
7495bd0ae4
Move terrain module from lms to common.
2013-02-20 09:52:32 -05:00
Jay Zoldak
9096914782
Move terrain module from lms to common.
2013-02-19 16:46:32 -05:00
Calen Pennington
f0f7e0dc1c
Fix more tests
2013-02-13 14:22:08 -05:00
Calen Pennington
bd822b9d2f
Fix tests post-merge
2013-02-13 14:13:22 -05:00
Calen Pennington
793bbfd351
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
2013-02-13 14:04:21 -05:00
Ned Batchelder
78d3d20069
When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.
...
Conflicts:
common/djangoapps/util/converters.py
2013-02-12 11:25:14 -05:00
Calen Pennington
23bb87e0bb
Merge pull request #1486 from MITx/feature/ned/clean_up_tests
...
We no longer need override_settings, Django has a better one.
2013-02-12 07:22:27 -08:00
Victor Shnayder
3ccb33c8b3
Simplify, make it actually work.
...
- regexp was too complicated, didn't work
2013-02-11 17:50:13 -05:00
Victor Shnayder
2dcdeff4b6
Make replace_static_urls leave alone urls that have '?raw' at the end
...
- needed for GWT'ed modules that rely on the filename to find dependencies
2013-02-11 17:07:15 -05:00
Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05:00
Your Name
7a1aed8945
Merge remote-tracking branch 'origin/master' into feature/victor/revert-revert-of-forums-ui
2013-02-11 13:55:47 -05:00
Brian Wilson
2a1c89bec5
change missingExamSeriesCode to missingPartnerID
2013-02-09 02:24:51 -05:00
Victor Shnayder
6d9a9ec46f
Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"
...
This reverts commit e4819a1b55b6ec41cae0
2013-02-08 15:00:25 -05:00
Brian Wilson
f51876da6a
cosmetic changes
2013-02-08 13:42:54 -05:00
Brian Wilson
ab6f383be1
support for Pearson test user
2013-02-08 03:05:28 -05:00
Brian Wilson
f1198b5f5f
for starting pearson exam, just call jump_to() instead of reverse(jump_to...)
2013-02-08 02:15:45 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314
minor cleanup
2013-02-07 16:12:02 -05:00
Brian Wilson
cc11dc2aa3
switch to using timelimit module for Pearson test
2013-02-07 15:57:43 -05: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
2b637fe511
Fix loads of local static files when running in dev mode
2013-02-07 10:13:53 -05:00
