Jay Zoldak
34a4b35e66
Fix lettuce acceptance tests to reflect the new soft landing page changes.
2013-02-15 14:07:46 -05:00
Alexander Kryklia
059b9f66e3
poll and conditional finished
2013-02-15 18:48:39 +02:00
David Ormsbee
8f17e6ae9e
First pass at implementing problem history.
2013-02-15 01:30:14 -05:00
Victor Shnayder
cc7a97082a
Merge pull request #1468 from MITx/feature/ichuang/fix-module-staff-access-v2
...
fix module staff accesss - by has_access, not by user.is_staff
2013-02-14 12:08:56 -08:00
Victor Shnayder
4f8757600a
merge
2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Victor Shnayder
21dab27ed6
fix logger name in module_render
2013-02-14 12:45:01 -05:00
Brian Wilson
f0258b8dd0
first pass at pdfbook
2013-02-13 18:01:44 -05:00
Calen Pennington
927da34477
Fix data_dirs for /static link replacement
2013-02-13 16:15:22 -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
Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
Vik Paruchuri
ba650202b4
Add in logic to pass settings to peer grading xmodule
2013-02-11 18:09:57 -05:00
Vik Paruchuri
01e8fe8d08
Pass S3 interface in module_render
2013-02-11 17:54:37 -05:00
Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05:00
David Ormsbee
5d894fdf03
Typo fix
2013-02-11 10:24:07 -05:00
David Ormsbee
04deb30fb6
Factor out the access group generation so we can check staff/instructor status without DB lookup.
2013-02-11 10:17:57 -05:00
David Ormsbee
00b3717829
Use prefetch on user to load groups and prevent extra DB lookups.
2013-02-11 10:16:57 -05:00
Brian Wilson
f51876da6a
cosmetic changes
2013-02-08 13:42:54 -05:00
ichuang
04cc257bdd
fix module staff accesss - by has_access, not by user.is_staff
2013-02-08 10:46:17 -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
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
Brian Wilson
1b465d1beb
implement testcenter_login
2013-02-05 18:01:55 -05:00
Calen Pennington
4d8165b2b6
Remove bad import of replace_urls
2013-02-05 11:06:46 -05:00
Calen Pennington
401f564e6a
Fix data directory passed to replace_static_urls
2013-02-05 11:06:46 -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
Calen Pennington
b05ead864f
Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic""
...
This reverts commit c4f56620df
2013-02-05 11:06:45 -05:00
Brian Wilson
f8b7d5fad6
have timer redirect when it expires
2013-02-04 15:13:14 -05:00
Brian Wilson
1685f302ab
add TimerModule to courseware
2013-02-04 02:22:24 -05:00
ichuang
19051e40d2
use ajax for doing conditional_module
2013-02-03 18:53:51 -05:00
Brian Wilson
9d98b7055d
add course navigation back into timed exam. Add initial timer styling.
2013-02-01 17:52:14 -05:00
Deena Wang
1a6fc1b505
Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing
...
Conflicts:
cms/djangoapps/contentstore/tests/test_views.py
2013-02-01 16:05:44 -05:00
Ned Batchelder
9d34767e6a
Fix the remaining module storage tests.
2013-02-01 15:45:43 -05:00
Deena Wang
25aca5866d
Merge branch 'master' into feature/deena/testing
...
Conflicts:
lms/djangoapps/courseware/tests/test_access.py
2013-02-01 10:19:40 -05:00
Brian Wilson
07638440ac
rename testcenter_exam to timed_exam, and read duration from metadata (policy.json)
2013-01-31 18:33:22 -05:00
Vik Paruchuri
b22bad7fa1
Add in some removed imports (fix tests)
2013-01-31 17:11:44 -05:00
Vik Paruchuri
01cdc6e7f8
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
...
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
2013-01-31 16:50:10 -05:00
Brian Wilson
9b3d7efb3f
add first pass at testcenter exam
2013-01-30 18:14:53 -05:00
Calen Pennington
c4f56620df
Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"
...
This reverts commit ab437b94637a8e87c789
2013-01-30 16:49:49 -05:00
Victor Shnayder
f2944334ab
Merge pull request #1387 from MITx/feature/zoldak/courseware-unit-tests
...
Add unit tests for lms courseware access
2013-01-30 12:51:50 -08:00
Calen Pennington
ab437b9463
Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic
...
Don't run collectstatic on course content
2013-01-30 12:07:47 -08:00
Jay Zoldak
91b8a95ed7
Add unit tests for lms courseware access
2013-01-30 15:03:43 -05:00
chrisndodge
67775fbfa9
Merge pull request #1377 from MITx/feature/christina/misc
...
Bug fixes for problem progress not updating.
2013-01-30 08:24:38 -08:00
Christina Roberts
fd4b3f9489
Merge pull request #1332 from MITx/fix/cdodge/unit-test-of-draft-store
...
add unit test to test DraftModuleStore.get_items() fix
2013-01-30 06:49:53 -08:00
Chris Dodge
dbf15fc2ac
add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id
2013-01-30 09:46:38 -05:00
