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
Sarina Canelake
9dc48c00b4 Merge pull request #3779 from edx/sarina/fix-grades-management-commands 
Sarina/fix grades management commands
 2014-05-20 11:35:54 -04:00
Don Mitchell
e2332d1922 Fix old dashboard list cohorts 2014-05-20 10:37:03 -04:00
Sarina Canelake
189f53bc71 Fix grades management commands 2014-05-19 16:11:45 -04:00
Calen Pennington
d4280e8529 Fix merge conflicts 2014-05-16 14:10:50 -04:00
Calen Pennington
18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
 2014-05-16 14:01:20 -04:00
David Adams
9bc7a518ee Fixes issue with metrics tab click handlers 
Click handlers were not getting attached to DOM elements in some cases on slow running machines.
  Added logic to attach handlers when elements are ready.

Added 2 buttons on metrics tab:
  Download Subsection Data for downloading to csv.
  Download Problem Data for downloading to csv.
 2014-05-15 11:45:59 -07:00
Calen Pennington
daf35bed8f Fix instructor csv download 2014-05-15 10:30:36 -04:00
Calen Pennington
ddf1874ca4 Fix merge conflicts 2014-05-14 15:59:25 -04:00
Calen Pennington
661f37ecd6 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/legacy.py
 2014-05-14 15:57:38 -04:00
Calen Pennington
44b15619e9 Fix spoc_gradebook 2014-05-14 15:23:58 -04:00
Calen Pennington
6ca0a7a1d6 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-14 10:00:25 -04:00
Stephen Sanchez
5cc41a6c9b Changing Student Anon ID Dump to return Course Specific IDs. 2014-05-14 09:56:36 -04:00
Calen Pennington
5c345b3b00 Fix more broken tests after merge from master 2014-05-13 16:21:18 -04:00
Calen Pennington
6c546fbf1f Fix merge conflicts 2014-05-13 15:31:40 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
 2014-05-13 15:30:56 -04:00
Will Daly
c6a02870e1 Update instructor dash to support ora2 submissions API with opaque keys 2014-05-13 13:28:55 -04:00
Calen Pennington
6fcf65ef62 Fix staff debug view 2014-05-13 11:58:56 -04:00
Calen Pennington
a4df0e1515 Fix failing tests 2014-05-12 14:45:38 -04:00
Calen Pennington
94c8d86a42 Fix failing tests from merge with master 2014-05-12 11:34:39 -04:00
Sarina Canelake
b7a0de7f3b Change URL patterns for instructor dashboard 
Fix acceptance and unit tests

LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
09442ef4ac Port spoc gradebook to new instructor dash 
LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash 
LMS-1296
 2014-05-12 10:18:27 -04:00
Calen Pennington
c72b0bb293 Resolve merge conflicts relative to master 2014-05-09 15:31:20 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Don Mitchell
bd4595fad2 Fix missing field access 2014-05-09 11:19:54 -04:00
Don Mitchell
7be81341d7 Revert StudentModule.module_state_key to field rather than computed property 2014-05-09 10:41:12 -04:00
Calen Pennington
cd746bf8e5 Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit adds the non-courseware lms/djangoapps and lms/lib.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-08 12:09:23 -04:00
Usman Khalid
8ee682d44b Fixed and added more tests for bulk email. 
LMS-2565
 2014-05-05 16:58:10 +05:00
Usman Khalid
c955fd0bce When sending bulk email check if course is authorized. 
Also the idash_mode property is stored seperately for each course.

LMS-2565
 2014-05-02 20:09:25 +05:00
Sarina Canelake
d408f174e3 Wording for batch beta email add with autoenroll (LMS-2551) 2014-04-18 10:13:19 -04:00
Sarina Canelake
1622216b58 Merge pull request #3084 from edx/sarina/improve-bulk-beta-add 
Improve the batch beta tester add feature
 2014-04-16 14:07:51 -04:00
Sarina Canelake
bddae213f6 Accept usernames in Batch Enrollment widget 
Respond to pull request comments
 2014-04-16 10:46:54 -04:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Sarina Canelake
ede21224a8 Add "Auto Enroll" option for bulk beta add 2014-04-16 09:20:23 -04:00
Sarina Canelake
4f38b69eba Allow batch beta enrollment by username 2014-04-16 09:20:23 -04:00
David Adams
28bf623490 Merge pull request #3240 from edx/dcadams/enhanced_metric_reporting 
This makes the metrics tab "bars" clickable.
 2014-04-14 09:42:33 -07:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
David Adams
0f37ee6924 This makes the metrics tab "bars" clickable. 
Clicking on any of the bars displays a list of students for that
  particular action (either opened the subsection or attempted the
  problem).
  Students are listed for the sub-sections.
  Students, grade and percent are listed for the problems.
  The on-screen list displays only the first 250 students with
  an overflow message if there are more students than that.
  The csv download lists all students.
 2014-04-11 13:56:49 -07:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Adam Palay
aefa456ed5 add failing tests 2014-04-02 16:07:46 -04:00
Adam Palay
7b2cbfc5c5 make beta dash compute module_state_key like legacy dash (LMS-2491) 2014-04-02 15:46:32 -04:00
Waheed Ahmed
375c206a2b Fixed lagacy dash numeric placeholders with named. 2014-03-31 12:06:31 +05:00
Carson Gee
9e58ef692d fix raw grade dump in standard instructor dashboard 
Added test and cleaned up code formatting
Review based changes
Converting class method and attributes to private
 2014-03-28 11:10:14 -04:00
Usman Khalid
76e592634a Some more str->unicode fixes in instructor and courseware apps. 
LMS-2429
 2014-03-26 18:57:02 +05:00
Sarina Canelake
2244ba5ef2 Merge pull request #3028 from edx/sarina/LMS-2262 
More helpful UX in beta membership widget
 2014-03-24 13:24:01 -04:00
Sarina Canelake
c2ede18de5 More helpful UX in beta membership widget 
LMS-2262
 2014-03-24 12:16:41 -04:00
Sarina Canelake
454da6fefc i18n Inst Dash enrolled students profile table 
LMS-2357
 2014-03-21 17:49:13 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio 
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
 2014-03-21 13:58:01 -04:00
Sarina Canelake
bbf4471d92 Merge pull request #2992 from edx/sarina/fix-beta-batch-enrollment 
Simple email checking for batch enrollment on inst dash
 2014-03-21 07:45:09 -04:00
Sarina Canelake
066d04f595 Simple email checking for batch enrollment on inst dash 
LMS-2244
 2014-03-20 15:58:19 -04:00