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

53 Commits

Author SHA1 Message Date
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05: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
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Ned Batchelder
9257f68fd8 The default TIME_ZONE should be UTC 
In production, we use UTC as the time zone.  DRF 3.7.7 now puts all
times in the currently set timezone where it used to use UTC.  By
setting TIME_ZONE to UTC, we keep the same results we used to get.

In a few places, we had to change the expected test results to be UTC.
 2019-06-10 15:27:39 -04:00
Wei Lee
1d5a72ac33 INCR-236 (#20502) 
* INCR-236

* Run python-modernize on openedx/features/course_duration_limits and
  verify that the change makes sense and tests does not break

* Remove redundant import and update docstring style
 2019-05-23 11:53:58 -04:00
Matthew Piatetsky
85f0720c50 fix broken FBE banner dates in firefox 2019-05-16 09:33:24 -04:00
Bill Tucker
92e8615669 INCR-224: run python-modernize and isort for openedx/features/course_duration/ (#20429) 2019-05-07 08:47:10 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
e160b23903 Move django_comment_client to discussion/ 2019-05-03 12:09:46 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Nimisha Asthagiri
df962a31b7 Move django_comment_common to openedx/core/djangoapps/discussion_common 2019-05-01 19:15:02 -04:00
Nimisha Asthagiri
db89a64d06 Move django_comment_client to discussion/ 2019-05-01 19:13:10 -04:00
Matthew Piatetsky
62b9bb89c8 Change content_type_gating enabled_for_enrollment to return false if a course has no verified mode or a user is not enrolled in the audit mode 2019-04-14 16:32:13 -04:00
Calen Pennington
fa2ee761d9 Allow overriding Content Type Gating and Course Duration Limits on a per-course (rather than per-course-run) basis 
REVMI-94
 2019-03-11 15:23:19 -04:00
Calen Pennington
5d3c9b36df Merge pull request #19964 from cpennington/fbe-query-perf 
Sort in python and add an index to improve StackedConfigModel.current…
 2019-03-11 12:22:59 -04:00
Calen Pennington
c532077f3a Sort in python and add an index to improve StackedConfigModel.current query performance 2019-03-08 09:50:08 -05:00
Matthew Piatetsky
74bcc29417 Remove FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG 2019-03-07 15:46:33 -05:00
Matthew Piatetsky
49ae6b9d73 Remove CONTENT_TYPE_GATING flag 2019-03-07 15:46:33 -05:00
Matthew Piatetsky
444799fb0e fix unicode strings in openedx/ part 2 2019-02-15 10:15:51 -05:00
Calen Pennington
419657d7a5 Prefetch course modes used in has_access calls in course api 2019-02-06 10:11:15 -05:00
Calen Pennington
6d22866e78 Cache org-site lookups in the RequestCache 2019-02-06 10:11:15 -05:00
Matthew Piatetsky
b37bc75bb4 Revert "Revert "change banner date localization to use dateutilfactory"" 
This reverts commit 08cb56664b.
 2019-02-04 12:42:27 -05: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
Calen Pennington
a842921e1f Cache org-site lookups in the RequestCache 2019-01-25 10:30:09 -05:00
Matthew Piatetsky
08cb56664b Revert "change banner date localization to use dateutilfactory" 2019-01-20 18:27:03 -05:00
Matthew Piatetsky
f870f7c635 change banner date localization to use dateutilfactory 2019-01-15 03:30:53 -05:00
Matthew Piatetsky
e1fd793e86 Merge pull request #19560 from edx/REVMI-2 
add informational banners when masquerading as user who would not have access due to start date
 2019-01-10 13:48:29 -05:00
Matthew Piatetsky
5bb56fe45f add informational banners when masquerading as user who would not have access due to start date 2019-01-10 11:06:30 -05:00
Matt Tuchfarber
ac29017d88 Move banner REVMI-54 
Moves banner into the content instead of at the top. Adds a course
expiration fragment to the course home page, the content, the progress
page, and the discussion page.
 2019-01-09 10:17:16 -05:00
Matthew Piatetsky
c9dc4d116f clean up where access checks happen 2019-01-07 17:02:33 -05:00
Gabe Mulley
a86d499592 Merge pull request #19470 from edx/bfiller/REVE-189 
Conditionalize track selection based on all FBE settings
 2019-01-07 15:42:28 -05:00
Calen Pennington
8b014e1fef Add a test of the FBE Upgrade banner 
REV-656
 2019-01-07 13:11:35 -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
Matthew Piatetsky
4aa576d725 Merge pull request #19511 from edx/REVMI-72 
Ignore enrollment date for FBE when masquerading
 2019-01-02 09:53:13 -05:00
Matthew Piatetsky
1396ca9173 Ignore enrollment date for FBE when masquerading 2018-12-26 20:29:44 -05:00
Matthew Piatetsky
e0b5e5cb97 write tests for when verified mode expires 2018-12-21 09:57:33 -05:00
Bessie Steinberg
6f2a2785e8 REVE-154 FBE Global Kill Switch 
Create a global kill switch for feature based enrollment.  To turn on
the kill switch (and turn off both course duration gating and content
type gating) enable a waffle flag named:
'content_type_gating.global_kill_switch'
 2018-12-14 09:36:56 -05:00
Bill Filler
92551e7b7a Merge pull request #19369 from edx/bfiller/REVE-88 
Add feature-based enrollments search to support form
 2018-12-13 14:01:45 -05:00
Gabe Mulley
5831a1f73d Merge pull request #19439 from edx/update_messaging 
update banner messaging
 2018-12-13 09:50:01 -05:00
Matthew Piatetsky
eaa07082ed update messaging 2018-12-13 01:15:48 -05:00
Matthew Piatetsky
93f6dfa330 Remove username from holdback key 2018-12-12 20:46:45 -05:00
Bill Filler
6606ddefff Add feature-based enrollment search to support form 2018-12-11 09:53:19 -05:00
Matthew Piatetsky
14a899a65d REVE-104 & REVE-108: Ensure Course Roles' Access 2018-12-07 16:39:09 -05:00
Gabe Mulley
3c5caaf762 REVE-103: Fix masquerade for feature based enrollments 2018-12-03 12:05:00 -05:00
Calen Pennington
bced52b728 Merge pull request #19334 from cpennington/enabled-as-of-datetime 
Enabled as of datetime
 2018-11-30 15:09:11 -05:00
Calen Pennington
31047260cc Switch ContentTypeGatingConfig.enabled_as_of and CourseDurationLimitConfig.enabled_as_of to datetimes 2018-11-30 10:02:53 -05:00
Matthew Piatetsky
08301a484e Ensure staff users do not see expiration banner 2018-11-29 09:45:49 -05:00
Matthew Piatetsky
815acda002 Populate experiment data with holdback key post enrollment and check holdback key when setting user group 2018-11-28 13:40:57 -05:00
Bill Filler
7b684106ba Don't allow audit-only courses to expire 2018-11-26 14:28:50 -05:00