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
Brian Wilson
2a1c89bec5
change missingExamSeriesCode to missingPartnerID
2013-02-09 02:24:51 -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
Calen Pennington
ae5d3cbc57
Add admin command to flush the staticfiles cache
2013-02-05 11:06:46 -05:00
Calen Pennington
8592db92bf
Add more tests of static_replace
2013-02-05 11:06:46 -05:00
Calen Pennington
f1f2bd8fd2
Start adding tests for static replacement
2013-02-05 11:06:46 -05:00
Calen Pennington
ba7bd9022b
Replace the correct /course/ urls, rather than /courses/
2013-02-05 11:06:46 -05:00
Calen Pennington
0da1467a90
Pull out missing variable
2013-02-05 11:06:46 -05:00
Calen Pennington
88fc2e3756
Fix unbalanced paren in regex
2013-02-05 11:06:45 -05:00
Calen Pennington
04879a83d3
Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible
2013-02-05 11:06:45 -05:00
Vik Paruchuri
bf97a6a9a9
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
...
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00
Vik Paruchuri
c6c89e4216
Make peer grading xmodule work with notifications
2013-02-04 13:16:05 -05:00
Your Name
8fd32ed502
update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names
2013-02-01 13:01:54 -05:00
Your Name
da1660a043
fix get_cohorted_commentables
2013-01-31 17:34:37 -05:00
Your Name
3fa67c1425
allow moderators and students to select cohort on post creation
2013-01-31 17:05:15 -05:00
Your Name
1fc26de945
merge master
2013-01-30 15:19:43 -05:00
David Ormsbee
fecad2a3e1
Merge pull request #1382 from MITx/feature/brian/pearson-status
...
pearson_dump: prettify, add missing error, provide default filename
2013-01-30 09:55:45 -08:00
Brian Wilson
a6a58d0e2a
pearson_dump: prettify, add missing error, provide default filename
2013-01-30 12:15:12 -05:00
jarv
877f757f94
Merge pull request #1369 from MITx/feature/jarv/certificate-restriction
...
Feature/jarv/certificate restriction
2013-01-29 13:14:41 -08:00
David Ormsbee
0a1f5bc154
Merge pull request #1368 from MITx/feature/brian/pearson-status
...
add pearson_dump command.
2013-01-29 08:19:41 -08:00
Brian Wilson
15a11e9cb7
add validation of accommodation codes
2013-01-29 11:16:23 -05:00
Brian Wilson
69ff879e95
add more validation for countries
2013-01-29 10:41:41 -05:00
