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

814 Commits

Author SHA1 Message Date
Matt Drayer
c9933a5878 Merge pull request #11209 from edx/saleem-latif/MAYN-167 
MAYN-167: Bulk uploads (CSV) of manual enrollments on white labels should be performed as 'honor' modes
 2016-01-15 11:07:50 -05:00
Saleem Latif
a856fec574 refactor code, remove duplicate code 2016-01-15 19:17:40 +05:00
Saleem Latif
041ec4c267 Remove unused imports from /tests/test_api.py 2016-01-14 13:36:27 +05:00
Saleem Latif
4122f695d8 Bulk uploads (CSV) of manual enrollments on white labels should be performed as 'honor' modes 2016-01-14 13:35:30 +05:00
Peter Fogg
60860e3aa8 Disable audit certificates for new audit enrollments. 
An `eligible_for_certificate` field is added to the
GeneratedCertificate model. This way we can retain existing grading
logic, as well as maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

This commit also updates the DB cache for acceptance tests.
 2016-01-12 22:44:53 -05:00
Matt Drayer
2c1680a9cb Merge pull request #11080 from edx/saleem-latif/SOL-1529 
SOL-1529: Allow PMs to Invalidate Certificates
 2016-01-04 10:46:27 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default 
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
 2015-12-22 11:52:04 -05:00
Matt Drayer
abb8484ec2 Merge pull request #10974 from edx/saleem-latif/SOL-1418-review-changes 
SOL-1418: display certificate generate history in reverse chronological order
 2015-12-17 00:02:13 -05:00
Saleem Latif
300825efc2 Remove unused imports 2015-12-16 10:27:24 +05:00
Saleem Latif
8b2c4994fa display certificate generate history in reverse chronological order 2015-12-16 10:22:56 +05:00
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
Sarina Canelake
54262bc8e8 Remove ORA1 management commands 2015-12-11 15:07:09 -05:00
Sarina Canelake
e5ad04e370 Merge pull request #10936 from edx/disable-legacy-dash 
Disable Legacy Dash by default
 2015-12-10 16:10:32 -05:00
Bill DeRusha
a164e2fa0a Merge pull request #10934 from edx/release 
Hotfix 2015-12-09a and Hotfix 2015-12-09b
 2015-12-10 15:45:14 -05:00
Sarina Canelake
14ad9d1440 Disable Legacy Dash by default 2015-12-10 15:21:53 -05:00
Matt Drayer
1e96c81dba Merge pull request #10901 from edx/saleem-latif/SOL-1418 
saleem-latif/SOL-1418: Revised Generate Certificates Section and added Certificate Generation UI
 2015-12-10 12:52:58 -05:00
Ned Batchelder
a66d05ae69 Merge pull request #9940 from edx/ned/autospec-all-the-things 
Add autospec to more mocks
 2015-12-10 09:47:28 -05:00
Peter Pinch
f3285f7811 Merge pull request #10672 from mitocw/fix/aq/add_coach_role_on_ccx 
Made coach dashboard available on ccx in addition to master course
 2015-12-10 06:48:09 -05:00
Saleem Latif
3134a76118 Revised Generate Certificates Section and added Certificate Generation history UI. 2015-12-10 16:26:19 +05:00
Amir Qayyum Khan
85c7258ec1 Fixed display name ccx course on coach dashboard 2015-12-10 14:34:01 +05:00
Bill DeRusha
005e07cb95 Remove default course mode setting in enrollment api 2015-12-09 19:46:04 -05:00
Ned Batchelder
43ac38aa87 Add autospec to all mocks 2015-12-09 09:44:22 -05:00
Matt Drayer
1f2f3de4a2 Merge pull request #10809 from edx/asadiqbal08/SOL-1455 
asadiqbal08/SOL-1455 Certs: Revise Exceptions UI
 2015-12-09 00:14:26 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release 
Release
 2015-12-08 15:21:48 -05:00
asadiqbal
aca292de35 SOL-1490 2015-12-08 18:15:47 +05:00
asadiqbal
dfd9b463f0 SOL-1455 2015-12-08 17:51:46 +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
Sarina Canelake
e932632b49 Remove psychometrics app 2015-12-04 16:37:34 -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