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

311 Commits

Author SHA1 Message Date
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05:00
Ayub khan
7d5f66853d BOM-647 
python3 compatibility
 2019-09-19 18:47:43 +05:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Christie Rice
3d062aab62 REVMI-354 Add enroll_in_course permission (#21243) 
* REVMI-354 Add enroll_in_course permission

* Fix test
 2019-08-01 08:37:41 -04:00
uzairr
07821927e2 Add credit modein support enrollment tool. 
Currently, enrollment support tool is only allowing support members
to change course enrollment only one of the two modes i.e. audit and
verified.To move a learner other than these modes,they need to ping
devops.To broaden the scope of enrollment support tool,changes have
been done so that enrollment would be changed to other modes as well.

PROD-305
 2019-07-19 18:14:35 +05:00
Emma Green
c4ae093e75 remove discount banner display flag 2019-06-28 14:46:21 -04:00
Ned Batchelder
b3a731550c Fix problems that drf-yasg uncovered. 
These were originally fixed individually, but had to be reverted, and
are now combined in one commit.  The originals were:

7b9040f6b0 This enum was backwards
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same.
8a44397139 Is this field missing because it is None?
4a1154a7ca Give a safer buffer for clearing the rate limiting
64c47856dd DRF 3.7.4 changed how you delegate to another view, so don't
7359ca4fb2 Is this right? It fixes two tests
fdd66e5390 Adjust the expected error message for DRF 3.7.7
9257f68fd8 The default TIME_ZONE should be UTC
 2019-06-21 18:04:15 -04:00
Calen Pennington
e37e7e67fb Add metrics and logging around track selection rendering without enrollment 2019-06-21 13:15:14 -04:00
Hassan Javeed
6d14f288e5 Added history to CourseMode 
DE-1557
 2019-06-20 19:04:26 +05:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Ned Batchelder
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same. 2019-06-10 15:27:39 -04:00
Matthew Piatetsky
ce5b976f5e update local currency code 2019-06-05 15:46:16 -04:00
Matthew Piatetsky
ad77392f8d add discount banner to track selection 2019-06-03 14:18:17 -04:00
Waheed Ahmed
2c80a76f8e Add feature flag to disable honor mode certificates. 
Added a feature flag to disable honor mode certificates for
edx.org, by default set to false to allow honor mode certificates
for open community.

PROD-269
 2019-05-20 12:53:22 +05:00
Waheed Ahmed
98c286a009 Revert "Making honor code not eligible for Certificate" 
This reverts commit 25130ae3c8.
 2019-05-13 15:39:35 +05:00
Kyle Mulka
b2e6ed0488 incr-205 ran modernize on common/djangoapps/course_modes (#20465) 2019-05-08 13:35:40 -04:00
Dave St.Germain
0e590c0f7e Moved these functions out of helpers because they're not needed elsewhere 2019-04-24 15:53:24 -04:00
Dave St.Germain
27437bc03f Ran python-modernize 2019-04-23 15:29:27 -04:00
Dave St.Germain
a5e5591262 Automatically add master's to the group access of verified content 2019-04-23 14:14:32 -04:00
Michael Roytman
f7d0753210 remove enroll CTA on course homepage for logged out users visiting a Master's only course 2019-04-16 16:05:56 -04:00
Alex Dusenbery
d134a435d5 Add get_queryset method to CourseModesView; cleanup tests again 2019-04-05 16:12:35 -04:00
Alex Dusenbery
cddf32560d Cleanup after tests. 2019-04-04 20:27:27 -04:00
Alex Dusenbery
eff3a07005 Add a course_modes REST API. 2019-04-03 14:44:00 -04:00
Michael Roytman
5c4c3d0753 Merge pull request #19948 from edx/mroytman/EDUCATOR-4083-min-price-masters-course-mode 
allow configurability of the minimum price for a course mode
 2019-03-06 16:03:35 -05:00
Michael Roytman
c8b4f7e779 allow configurability of the minimum price for a course mode 2019-03-06 14:26:00 -05:00
Cali Stenson
7e6147f714 Add price information to enrollments and create dashboard_metadata 
for experiments.

REVEM-174
 2019-03-05 16:55:04 -05:00
Dave St.Germain
954c8e1a67 Merge pull request #19771 from edx/dahlia/masters-track 
Added master's track
 2019-02-25 10:11:24 -05:00
Matt Hughes
17f0a4fb52 Allow educators to partition masters students as content groups 
JIRA:EDUCATOR-4022
 2019-02-20 12:40:53 -05:00
Jeremy Bowman
974ae50bf4 Merge pull request #19620 from cclauss/new-style-exceptions 
Old style exceptions --> new style for Python 3
 2019-02-19 16:31:35 -05:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
cclauss
c0c935b685 Old style exceptions --> new style for Python 3 2019-02-19 13:09:23 +01:00
Dave St.Germain
436416d86d Added modes to coursemode model 2019-02-13 10:21:04 -05:00
Michael Youngstrom
4bbd1dee0b Remove shards from commonlib-unit tests 2019-02-12 14:28:35 -05:00
Calen Pennington
419657d7a5 Prefetch course modes used in has_access calls in course api 2019-02-06 10:11:15 -05:00
Audrey
0589037545 Merge pull request #19661 from edx/aekao/REVEM-136/tearDownBundlingTest 
Tearing down data from bundling test
 2019-01-28 16:04:55 -05:00
Audrey Kao
3b4c4c30cb Tearing down data from bundling test, see REVEM-136 2019-01-28 15:00:28 -05:00
Julia Eskew
48073300e7 Merge pull request #19106 from open-craft/clemente/fix-courseenrollment-admin-querydict 
Fix error when saving CourseEnrollment in admin
 2019-01-28 11:14:04 -05:00
Daniel Clemente Laboreo
e0b0c375be Fix error when saving CourseEnrollment in admin 2019-01-28 14:42:41 +02:00
Calen Pennington
805f32a357 Revert "Allow courses api to return data incrementally" 2019-01-25 12:56:57 -05:00
Calen Pennington
0d273e9506 Prefetch course modes used in has_access calls in course api 2019-01-25 10:30:09 -05:00
Bill Filler
c253374372 Conditionalize track selection based on settings of course duration and content gating 2019-01-07 09:47:37 -05:00
Bill Filler
684d6e3669 check if user is in holdback before showing new track selection 2018-12-17 16:05:13 -05:00
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Matthew Piatetsky
6f8090eadb handle case when list of programs for course is empty 2018-11-20 13:11:33 -05:00
Ned Batchelder
046fe60913 Remove unused imports 2018-11-07 10:31:51 -05:00
Matt Tuchfarber
2f283c411b Update course mode selection text for content gating 2018-10-30 15:04:44 -04:00
Emma Green
5af901e016 fix-bundle-info 2018-10-09 09:27:15 -04:00
Emma Green
fcc1b55496 rev-bundle-discount 2018-10-03 17:20:43 -04:00
Matthew Piatetsky
30c14b36ba bundles on track selection 2018-09-27 14:45:32 -04:00
J Eskew
7affa237df Merge pull request #18557 from mreyk/teltek/feature/improve-course-modes-configuration 
OSPR: Improve Course Modes configuration
 2018-09-12 15:52:48 -04:00