Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,160 Commits 1 Branch 0 Tags
8fcf574029786fc3d4e84dc50af05262bbab5eb9
Commit Graph

787 Commits

Author SHA1 Message Date
Bill DeRusha
005e07cb95 Remove default course mode setting in enrollment api 2015-12-09 19:46:04 -05:00
Chris Dodge
1592a32de3 White Labels need to still use the 'honor' course mode even through the default has changed 2015-12-06 20:36:26 -05:00
Matt Drayer
c41a887762 Merge pull request #10805 from edx/saleem-latif/SOL-1435 
SOL-1435: Add Certificate Regeneration history table.
 2015-12-04 09:56:18 -05:00
Saleem Latif
1e16e873a4 Add Certificate Regeneration history table. 2015-12-04 10:24:02 +05:00
Peter Fogg
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs 
Remove default honor code.
 2015-12-03 14:55:30 -05:00
Matt Drayer
f6872a0fa4 Merge pull request #10750 from edx/asadiqbal08/SOL-1417-CSV 
SOL-1417 Certs: Allow CSV upload for Cert Exceptions
 2015-12-01 10:36:32 -05:00
Saleem Latif
a8e44b3097 Cert Exception: Add error states and messages 2015-12-01 12:46:04 +05:00
asadiqbal
7c68d80c67 SOL-1417 2015-11-30 14:40:08 +05:00
Peter Fogg
497622d4b4 Switch default course mode to 'audit'. 
ECOM-2972
 2015-11-25 11:22:29 -05:00
Saleem Latif
764ceb00c8 Cert Exceptions: View and Edit Exception list 2015-11-25 10:02:52 +05:00
chrisndodge
0ccb017408 Merge pull request #10713 from edx/cdodge/fix-zero-seat-invoices 
Cdodge/fix zero seat invoices
 2015-11-24 10:28:42 -05:00
Chris Dodge
e534e5d588 fix broken report when there is a zero seat invoice 
fix quality error
 2015-11-24 09:42:54 -05:00
chrisndodge
236d251e6e Merge pull request #10691 from edx/cdodge/add-attempt-code-to-report 
Add in the attempt_code field to the proctoring report
 2015-11-24 07:18:11 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Chris Dodge
21c2d3f7bd Add in the attempt_code field to the proctoring report 2015-11-20 12:05:49 -05:00
Chris Dodge
f4c5541339 be sure to include the enrollment_id when unenrolling 2015-11-19 15:50:51 -05:00
muhammad-ammar
29acc3acfc resolve merge conflicts 
test fixes
 2015-11-18 19:13:54 +05:00
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
asadiqbal
35d04bff89 SOL-1385 2015-11-13 15:23:02 +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
chrisndodge
2301bcbf8f Merge pull request #10403 from edx/afzaledx/MAYN-149_survey_report 
MAYN-149 Survey Report CSV upload for Professional Education courses.
 2015-10-29 18:24:31 -04:00
Afzal Wali
5a11f75a48 Add the ability for self-service course survey reports 2015-10-29 13:26:28 -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
Chris Dodge
8609f80db0 Add email and manual enrollment reason into the Enrollment Report 2015-10-06 22:34:54 -04: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
louyihua
66678c103f i18n fix 
1. Add missing '_()' in capa_base.py & video_xfields.py
2. Fix a bug in instructor_dashboard.py that causes crash when ANALYTICS_DASHBOARD_NAME contains non-ascii characters.
3. Workaround for mis-extractions inside .underscore files when using gettext along with interpolate.
 2015-09-24 13:02:12 +08: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
Chris Dodge
5591101a18 only show proctoring download button when the course has proctoring enabled 2015-09-09 12:06:58 -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