Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,867 Commits 1 Branch 0 Tags
ece43db41133bd3c4e6b2a4ca4fd16836cf264bd
Commit Graph

297 Commits

Author SHA1 Message Date
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Peter Pinch
fd8b757c90 Merge pull request #10250 from mitocw/feature/aq/add_pagination_gradebook 
Added pagination on grade book.
 2015-11-13 12:37:34 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Matt Drayer
31c5b94548 Merge pull request #10518 from edx/saleem-latif/SOL-1333 
SOL-1333: Add Cert Regenerate UI on Instructor Dash
 2015-11-10 12:20:07 -05:00
Amir Qayyum Khan
44b409ebff Added pagination on grade book. 2015-11-10 15:18:15 +05:00
Saleem Latif
094ed32176 Added ability to regenerate certificates from Instructor Dashboard 2015-11-10 15:14:55 +05:00
Sarina Canelake
2ae8ee2666 Merge pull request #10395 from mitocw/feature/skm/add_max_score#95 
Optionally add max and actual score for assignments to get_student_grade_summary_data output.
 2015-11-09 12:05:46 -05:00
Shawn Milochik
5d8830096a Added max score to output of get_student_grade_summary_data. 
This will put the actual score and actual max score in scope for
the the return_csv function, so actual scores can be dumped.

The ultimate goal is to provide this data in the CSV dump that is
passed to Stellar via pylmod.

This is PR #10395 on edX, and issue 95 on mitocw's edx fork.

https://github.com/edx/edx-platform/pull/10395

https://github.com/mitocw/edx-platform/issues/95
 2015-11-06 12:49:19 -05:00
Zia Fazal
941664294e allow exception to be added for multiple courses 
added unit test to test certs exception same user different courses scenario
 2015-11-05 20:53:18 +05:00
Matt Drayer
fc77a6eae7 Merge pull request #10363 from edx/saleem-latif/SOL-1315 
SOL-1315: Add Cert Exception UI on Instructor Dash
 2015-11-03 10:09:19 -05:00
Saleem Latif
99bd47e9a8 Add Cert Exception UI on Instructor Dash 2015-11-03 12:52:22 +05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Peter Fogg
4805946a83 Override due dates in the LMS for self-paced courses. 2015-10-28 14:33:11 -04:00
Shawn Milochik
9adf9acd11 Adds more tests for get_student_grade_summary_data. 
Tests all the kwargs. This is in support of #95, and will be followed
by an update to get_student_grade_summary_data which adds a new kwarg.
 2015-10-21 15:30:08 -04:00
asadiqbal
74b082497f SOL-1288 2015-10-19 17:28:10 +05:00
Diana Huang
7bfb1127f5 Merge pull request #9771 from edx/diana/add-team-to-reports 
Add team column to grade reports.
 2015-10-02 09:35:25 -04:00
Jamie Folsom
c9fc35d253 Enroll CCX coaches in courses as they're added as coaches. 
Remove log statements.

Add test for CCX coach access addition.

Email CCX coaches when they're enrolled.

Remove ccx_coach from list of roles which can perform access maintenance.

Remove unused variables.

Remove unused import (unenroll_email)

Fix long line in instructor/access.py.

Address long line formatting issue.
 2015-10-01 13:23:34 -04:00
Diana Huang
a53903c46a Add team column to grade reports. 2015-09-23 12:21:13 -04:00
Peter Pinch
01eb2dffaf Merge pull request #9635 from mitocw/fix/bdero/dump-grades-command 
CRI-40 Don't assume user in request context when grading
 2015-09-14 09:05:56 -04:00
Sarina Canelake
b19a0e71d3 Fix pylint issues in spoc_gradebook test 2015-09-09 09:13:29 -04:00
Brandon DeRosier
34eaecc3d4 Test student_grade_summary_data method 2015-09-04 15:42:16 -04:00
Peter Pinch
70d3868b81 Merge pull request #9475 from mitocw/fix/aq/email_ccx_non_members 
Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members
 2015-09-04 10:00:28 -04:00
David Ormsbee
127467f20a Merge pull request #9023 from mcgachey/lti-collated-grades 
[LTI Provider] Grade passback for non-leaf blocks.
 2015-09-02 07:34:10 -04:00
Braden MacDonald
2438b27b9c Merge pull request #9330 from open-craft/fix-offline-gradecalc 
Fix Offline Grade Calculation
 2015-09-01 19:41:22 -07:00
Amir Qayyum Khan
e15732114d Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members 2015-09-01 13:22:50 +05:00
Sarina Canelake
25169ccc4d Merge pull request #9147 from open-craft/OC-791-answer-export 
Move problem responses export from legacy instructor dash to new instructor dash
 2015-08-31 15:12:55 -04:00
Phil McGachey
9e6c44911d [LTI Provider] Grade passback for non-leaf blocks. 
This change allows graded assignments to be added to a campus LMS
regardless of the granularity at which the problem sits. Previously
a grade could only be returned if the usage ID for the problem itself
was specified in the LTI launch.

The code assumes that courses taking advantage of this functionality
are arranged in a hiearchy (with sections being parents to verticals,
and verticals being parents to problems). When a grading event occurs
it traverses the parent hiearchy to identify any previous graded LTI
launches for which the new scoring event should generate a grade
update. It then calculates and sends scores to each of those outcome
services.

Since grade calculation is an expensive operation, the code optimizes
the case where a problem has been added only once as a leaf unit. In
that case it is able to behave as before, just taking the grade from
the signal without having to calculate grades for the whole course.
 2015-08-27 15:54:43 -04:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals 
Add signals for user's discussion activity.
 2015-08-27 14:07:29 -04:00
David Ormsbee
7543e05baa PEP8 fix. 2015-08-26 15:08:38 -04:00
David Ormsbee
ff62a8eaaa Merge branch 'release' into release-2015-08-26-conflict 2015-08-26 14:28:35 -04:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity. 
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
 2015-08-26 12:07:54 -04:00
David Ormsbee
2ecf7aec46 Update Instructor Dashboard tests to use SharedModuleStoreTestCase. 
Also added reset_test_case() and @modifies_courseware to SharedModuleStoreTestCase.

Revert "More verbose test builds in Jenkins, for debugging."

This reverts commit 58cade4cc4288335026649470a48b7bbca969ee8.
 2015-08-25 01:28:55 -04:00
Braden MacDonald
8cc82f7644 Fix Offline Grade Calculation 2015-08-24 18:20:49 -07:00
unknown
88a038aa1e Fixed email parm function for CCX email 
modified:   lms/djangoapps/instructor/tests/test_enrollment.py
 2015-08-24 20:34:11 +05:00
Chris Dodge
674b92f0b9 Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard 
Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard if the feature flag is enabled.
 2015-08-19 11:07:14 -04:00
Tim Krones
df5b2dadda Move functionality for exporting a CSV of all student answers to a given 
problem from legacy instructor dash to new instructor dash.
 2015-08-17 22:32:49 +02:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
cahrens
1b93dd122e Sort the grade cutoffs. 
TNL-2848
 2015-07-24 12:52:56 -04:00
Zia Fazal
5925edbfbc hiding generated certificate button in case of self paced courses 2015-07-23 17:02:34 +05:00
srpearce
93e31e6149 Merge pull request #8573 from edx/sylvia/docs/InstDashHousekeeping 
Clean up some e-commerce strings on the Instructor Dashboard
 2015-07-21 09:27:34 -04:00
Sylvia Pearce
3ab45fba0c Clean up some e-commerce strings on the Instructor Dashboard 2015-07-20 18:29:17 -04:00
Matt Drayer
4c0b00f45e Merge pull request #8952 from edx/ziafazal/SOL-1045 
SOL-1045: Enable certificate generation by students for self-paced courses
 2015-07-20 10:22:02 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Zia Fazal
bed7d80777 enable certificate generation for html certificates 
Enable Student-Generated Certificates for HTML certs flow
 2015-07-16 13:32:14 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00