David Ormsbee
75ff2bd6cb
Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules
...
Fix/cdodge/dangling discussion modules
2013-02-11 11:40:00 -08: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
Diana Huang
f3bb429915
Get and pass the new submission flagged information through
...
the controller to the backend.
2013-02-11 09:23:55 -05:00
Vik Paruchuri
46da4cf241
Add in a better notification icon
2013-02-09 10:15:11 -05:00
Victor Shnayder
0e06f5f587
Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into feature/victor/revert-revert-of-forums-ui
2013-02-08 15:01:30 -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
Your Name
21c06c741b
inline mustache working
2013-02-08 14:28:48 -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
ichuang
ad0d304e67
fix instructor dashboard datadump error message to be useful
2013-02-08 09:21:36 -05:00
Kevin Chugh
c6bece8620
more updates
2013-02-08 09:11:41 -05:00
Your Name
7dd252178c
cohort filter almost done
2013-02-07 18:14:46 -05:00
Your Name
3965f9129d
cohort filter almost done
2013-02-07 18:13:53 -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
David Ormsbee
1c07fae501
Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump
...
add instructor dashboard feature to download profile & problem state
2013-02-07 08:19:52 -08:00
Chris Dodge
faf7c64ea5
add try/catch and fallback to returning a path to the root of the course
2013-02-07 10:32:13 -05:00
ichuang
bf17341fdb
add select_related("profile")
2013-02-06 23:16:44 -05:00
Kevin Chugh
d047d826c7
update coffeescript to hide cohort choice if first commmentable is not cohorted
2013-02-06 22:00:03 -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
Victor Shnayder
884a7a61b9
Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 965e3b4c491a7d2a06a8
2013-02-06 20:27:01 -05:00
Kevin Chugh
1dd0ef274d
addressed somme comments in pull request and instructor fixes and blank group fix
2013-02-06 18:26:41 -05:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -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
Chris Dodge
114d800c6a
need to make path_to_location a dictionary since it needs to be keyed by the location
2013-02-06 15:17:47 -05:00
Chris Dodge
5a25d7fa6e
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-discussion-modules
...
Conflicts:
lms/djangoapps/django_comment_client/utils.py
2013-02-06 14:05:56 -05:00
Chris Dodge
6ed2737c36
make LMS forum subsystem more robust in case of orphaned discussion modules. Given our draft/non-draft duality, we don't currently have a means to always do proper housekeeping at this point in time. However, we have to stop the LMS Forums from blowing up when encoutering one of these.
2013-02-06 13:32:50 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Diana Huang
95d3957377
Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule
...
Patch peer grading tab to work
2013-02-06 06:07:18 -08:00
Kevin Chugh
c7a133470d
inline discussions working
2013-02-05 22:43:09 -05:00
David Ormsbee
a3a886bd0f
Revert "Add tests for django-comment-client models" (which actually had
...
a model change as well)
This reverts commit 053547453e
2013-02-05 18:51:16 -05:00
David Ormsbee
119b4206a4
Revert "Fix permissions bug and add test cases for django comment client permissions."
...
This reverts commit e745087455
2013-02-05 18:42:01 -05:00
Your Name
d5b70d7bfc
inline cohorting working
2013-02-05 18:38:06 -05:00
Brian Wilson
1b465d1beb
implement testcenter_login
2013-02-05 18:01:55 -05:00
Vik Paruchuri
0133c7c669
Patch peer grading tab to work
2013-02-05 16:32:40 -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
Vik Paruchuri
ce87e6f221
Skip two tests
2013-02-05 14:57:59 -05:00
Vik Paruchuri
8027cc7024
Fix some issues with tests
2013-02-05 14:35:44 -05:00
Vik Paruchuri
134f2f7af7
Fix tests, bugfix for problem url error
2013-02-05 14:21:08 -05:00
Vik Paruchuri
e13de7543f
Test fixes, err response fixes, address review comments
2013-02-05 14:12:11 -05:00
Vik Paruchuri
34dc6e6320
Fix some issues with peer grading service
2013-02-05 13:37:55 -05:00
David Ormsbee
74c112e5cc
Merge pull request #1373 from MITx/feature/zoldak/django-comment-client-tests
...
Add unit tests for django comment client
2013-02-05 10:37:18 -08:00
Vik Paruchuri
7984c4dfcb
Move over grading service to xmodule
2013-02-05 13:10:56 -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
