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
John Jarvis
fd36c555a6
Renaming login url for modal-less login
2013-02-19 19:36:32 -05:00
John Jarvis
4596fa417f
Changing login and signin view names
2013-02-19 17:31:22 -05:00
Jay Zoldak
9096914782
Move terrain module from lms to common.
2013-02-19 16:46:32 -05:00
John Jarvis
dabcb51746
resolving merge conflicts
2013-02-19 12:43:06 -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
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Victor Shnayder
92eb88d464
Merge pull request #1444 from MITx/feature/cale/dev-staticfiles
...
Make local dev work by trying checking staticfiles_storage for both the ...
2013-02-06 14:02:04 -08:00
Brian Wilson
bfc4527590
Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.
2013-02-06 15:23:11 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Calen Pennington
2302b40022
Fix static_replace tests
2013-02-06 10:33:36 -05:00
Calen Pennington
96eb16cd72
Make local dev work by trying checking staticfiles_storage for both the course_prefixed and non-course_prefixed urls
2013-02-06 10:08:20 -05:00
Brian Wilson
1b465d1beb
implement testcenter_login
2013-02-05 18:01:55 -05:00
Christina Roberts
0d8cfb9baa
Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404
...
change from throwing a Http404 exception, which I believe will try to re...
2013-02-05 13:36:28 -08:00
Chris Dodge
3fa1fe0cd6
change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.
2013-02-05 16:26:07 -05:00
Diana Huang
120aa3cd3b
Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule
...
Feature/vik/peer grading xmodule
2013-02-05 12:55:48 -08:00
Calen Pennington
0350d15e29
Make static_replace fall back to data_directory prefix, if it doesn't find the file anywhere else
2013-02-05 11:06:46 -05:00
Calen Pennington
90107fa88f
Import cache function correctly
2013-02-05 11:06:46 -05:00
Calen Pennington
10f8dbfa46
Handle options passed to clear_collectstatic_cache
2013-02-05 11:06:46 -05:00
