Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1258 Commits

Author SHA1 Message Date
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
Chris Dodge
b482e2ac21 add performance optimizations (efficiently get all course content) 2013-03-04 12:51:21 -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
821e2d06e9 Merge pull request #1466 from MITx/feature/ichuang/fix-idashboard-error-message 
Fix error message provided by Instructor dashboard datadump - make it more useful
 2013-02-19 11:08:21 -08: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
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
ichuang
ad0d304e67 fix instructor dashboard datadump error message to be useful 2013-02-08 09:21:36 -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
ichuang
bf17341fdb add select_related("profile") 2013-02-06 23:16:44 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
John Hess
6b8edde601 removed un-enroll all button for fear of disaster 2013-02-04 19:13:01 -05:00
ichuang
ddc8bf2b42 add instructor dashboard feature to download profile & problem state 2013-02-04 04:47:27 +00:00
Victor Shnayder
c1f7b109d8 Fix missing import 2013-01-27 10:19:36 -05:00
Victor Shnayder
00dd3ad9f8 Fix some of the test bugs. Still more to fix. 2013-01-25 15:40:13 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
64f820828e whitespace 2013-01-24 15:12:53 -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
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00
Chris Dodge
550e805b74 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
 2013-01-18 15:44:41 -05:00
ichuang
6d73a399b1 fix bug in instructor dashboard groups code 2013-01-18 14:04:01 -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
John Hess
f7f563db9b Use reverse() to lookup student progress page, use index to lookup module_state_key 2013-01-16 16:44:25 -05: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
b188c8e722 fix bug in string splitting. 2013-01-15 18:19:54 -05:00
Victor Shnayder
9c7f2cf604 WIP -- do not merge 2013-01-15 14:44:09 -05:00
John Hess
9a81c56254 Tracking progess page lookups on instructor dashboard 2013-01-15 13:51:24 -05:00
John Hess
9ef1a4ded5 Tracking problem resets, clearer msgs 2013-01-15 13:51:24 -05: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
Victor Shnayder
570df1c9e6 Fix bugs, refactor, support lists of users 2013-01-15 11:44:27 -05:00
Victor Shnayder
3f654af7cd Refactor common code, fix view a bit 
remaining:
 * support putting multiple names / emails in the big box we now have
 2013-01-15 11:44:27 -05:00
Victor Shnayder
1a5fc065ad Add beta test group management view to instructor dashboard 
* still needs to support uploading a list
* also want to clean up and refactor the code a bit
 2013-01-15 11:44:26 -05:00
jmvt
d230c1b03c Added example of geographic student distribution over world map. 2013-01-11 17:14:29 -05:00
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -05:00
ichuang
4f869ad382 remove spurious comment 2013-01-11 00:10:52 -05:00
ichuang
b7ad39a0b9 instructor dashboard shouldn't import .grading anymore 2013-01-11 00:09:46 -05:00
ichuang
37f848949d only is_staff users can add/edit/delete course instructors 2013-01-10 23:32:49 -05:00
ichuang
5cc88ec1ad example course_id for compute_grades management command 2013-01-10 23:32:48 -05:00
ichuang
e5c958082b list/add/delete instructors on instructor dashboard 2013-01-10 23:32:48 -05:00
ichuang
04d6f08c0c add offline grade computation & DB table for this 2013-01-10 23:32:48 -05:00
ichuang
82e31d533b Hookup CourseEnrollmentAllowed to lms/djangoapps/courseware/access.py 2013-01-10 23:31:46 -05:00
ichuang
97fb054449 add export grades to remote gradebook to instructor dashboard 2013-01-10 23:31:46 -05:00
ichuang
200493a54f instructor dashboard upgrade - add enrollment management 2013-01-10 23:31:45 -05:00
Diana Huang
2293a37f7d Move over old Staff Grading tests to new app. 2013-01-07 09:17:09 -05:00
Chris Dodge
0743adb1cd update grade download csv content 2013-01-03 12:58:59 -05:00