Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,756 Commits 1 Branch 0 Tags
3ce01882bb50ca06c6270bc05fa92bb8a67dca44
Commit Graph

160 Commits

Author SHA1 Message Date
Calen Pennington
fb8352e2cc Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-15 10:33:54 -04:00
David Ormsbee
e135a4052b Better error checking with Analytics are unavailable. 2013-03-13 15:16:36 -04:00
David Ormsbee
cc82ffe10a Give a more comprehensive grade distribution of problems analytic 2013-03-10 00:48:46 -05:00
David Ormsbee
3bb3cf3ca3 Consolidate some of the analytic fetching logic in the instructor dashboard. 2013-03-09 18:52:20 -05:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Calen Pennington
d8b99e1e8e Make remote_gradebook use the new field instead of metadata 2013-03-08 13:21:58 -05:00
David Ormsbee
c43d4b3469 re-added Students with correct answers to analytics dashboard 2013-03-07 23:39:10 -05:00
David Ormsbee
c144795588 Re-enable a couple of analytics on the dashboard to test layout 2013-03-07 10:01:56 -05:00
David Ormsbee
d0bff1ed3c Merge branch 'master' into jmpm-analytics 
Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
 2013-03-06 17:09:09 -05:00
Calen Pennington
8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:15:07 -05:00
Victor Shnayder
d7484c5e10 Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all 
removed un-enroll all button for fear of disaster
 2013-03-05 10:18:30 -08: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
42a944bb86 Merge pull request #1593 from MITx/hack/dave/submission_history 
It's not UTC time, it's whatever the local settings are set to
 2013-03-04 12:20:41 -08:00
David Ormsbee
01a1bf6b6f It's not UTC time, it's whatever the local settings are set to (New York in prod) 2013-03-04 15:19:24 -05:00
David Ormsbee
b0afbba58d Merge pull request #1516 from MITx/hack/dave/submission_history 
Record and report submission history for a problem
 2013-03-04 11:39:54 -08:00
David Ormsbee
88a30cb733 Fixes in response to Victor's comments. 2013-03-04 13:21:19 -05:00
Ned Batchelder
7c8a90229e Use 'is None' and 'is not None' 2013-03-04 10:57:25 -05:00
David Ormsbee
c7920f09ad Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features. 2013-02-27 11:42:06 -05:00
David Ormsbee
8f17e6ae9e First pass at implementing problem history. 2013-02-15 01:30:14 -05:00
Valera Rozuvan
d55b818bb2 Updated YouTube JS API file to the new one. 2013-02-14 11:25:36 +02: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
Brian Wilson
290368ef0d merge out from master 2013-02-07 17:40:54 -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 Talbot
6d4cb558d3 lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav 2013-02-07 12:35:52 -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
Brian Wilson
aae5c7ca23 remove unneeded files 2013-02-06 15:25:25 -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
ichuang
0936f448fc add disable_progress_graph key to course metadata 2013-02-06 03:45:10 +00:00
John Hess
6b8edde601 removed un-enroll all button for fear of disaster 2013-02-04 19:13:01 -05:00
jmvt
d6984cced8 Updated code to handle new analytics result format. 2013-02-04 16:08:37 -05:00
Brian Wilson
f8b7d5fad6 have timer redirect when it expires 2013-02-04 15:13:14 -05:00
ichuang
ddc8bf2b42 add instructor dashboard feature to download profile & problem state 2013-02-04 04:47:27 +00:00
Brian Wilson
9d98b7055d add course navigation back into timed exam. Add initial timer styling. 2013-02-01 17:52:14 -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
Brian Wilson
9b3d7efb3f add first pass at testcenter exam 2013-01-30 18:14:53 -05:00
Victor Shnayder
5fa8cf5a78 Only show cohort config for cohorted courses 2013-01-24 15:14:34 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts 
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
 2013-01-24 15:12:53 -05:00
Calen Pennington
993c24b72b WIP: Model data caching work 2013-01-23 14:51:07 -05:00
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00
jmvt
4f005044d6 Added time of query display. 2013-01-23 10:17:17 -05:00
jmvt
bc268aa791 Merged to lastest master. 2013-01-17 17:39:12 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
David Ormsbee
fd20496a60 Merge pull request #1280 from MITx/feature/jth/attempts_reset 
Added 2 new instructor tools
 2013-01-16 13:48:26 -08:00
jmvt
a9d3736cfb Replace all calls to analytics service to use the get methods (pulls from mongodb). Added error handling. 2013-01-16 15:09:54 -05:00
Victor Shnayder
9519087d84 Merge pull request #1271 from MITx/feature/victor/beta-testers 
Feature/victor/beta testers
 2013-01-16 06:50:57 -08:00
Victor Shnayder
9c7f2cf604 WIP -- do not merge 2013-01-15 14:44:09 -05:00
VikParuchuri
e2f8ce9de6 Merge pull request #1276 from MITx/feature/vik/add-peer-grading-notifications 
Feature/vik/add peer grading notifications
 2013-01-15 11:40:59 -08:00
John Hess
d025ca248f Added instructor tools for resetting attempts on a single student's problem to 0 and for getting student's progress page 2013-01-15 13:51:24 -05:00