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

284 Commits

Author SHA1 Message Date
Feanil Patel
0c1e18ff53 BOM-622 Fix more type errors. 2019-09-19 16:57:54 -04:00
arbisoft
10312e977d BOM-105 
decoding issue fix
 2019-08-23 13:55:59 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
aarif
61800c619f replaced StringIO imports with import from six 
replaced cStringIO and StringIO imports with import from six

fixed StringIO imports

fixed StringIO imports

fixed XSS python-wrap warning
 2019-08-08 00:09:16 +05:00
Calen Pennington
1f028e0be3 Merge pull request #21269 from cpennington/requires-level-permissions 
Add a decorator that checks for course-level permissions
 2019-08-06 15:09:43 -04:00
Calen Pennington
0cd8f58bcc Remove all instances of from instructor import imports 2019-08-05 09:59:30 -04:00
Calen Pennington
7bbf4ad15c Switch courseware.masquerade_as_student over to using a StaffAccessRule with query checking 2019-08-02 15:06:35 -04:00
David Ormsbee
358ba27a2a Merge pull request #21248 from open-craft/samuel/se-1155-fix-ccx-unicode 
SE-1155 [Campus.il] fix crashes on non-ascii in usernames for ccx enrollments
 2019-08-02 13:15:41 -04:00
Samuel Walladge
54f9434d46 Allows unicode usernames to be used in CCX enrollments and reports. 
Previously, unicode would result in a UnicodeEncodeError as a result of
the format string being str instead of unicode.

Additionally, the log calls would crash with a traceback (while not
affecting the program flow).
 2019-08-02 08:50:15 +09:30
Matthew Piatetsky
628ae59682 add view_ccx_coach_dashboard permission 2019-08-01 12:41:47 -04:00
Amit
9a1bb49910 INCR-466: Updates on Python 3.x and fix line over length limit (#20915) 2019-07-10 09:52:51 -04:00
Feanil Patel
b686368f1d Merge pull request #20914 from amitvadhel/INCR-467 
INCR-467: Updates on Python 3.x
 2019-07-02 09:59:37 -04:00
amitvadhel
80715c80f6 INCR-465: Updates on Python 3.x and disable: import-error 2019-06-28 22:08:53 +03:00
amitvadhel
06582d5972 INCR-467: Updates on Python 3.x 2019-06-27 21:46:03 +03:00
Stu Young
787868d48b INCR-308 Run python-modernize on lms/djangoapps/ccx/tests (#20617) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:43:22 -04:00
Stuart Young
b0250e3b38 run isort 2019-05-15 09:59:27 -04:00
Stuart Young
8b7bb776b0 run python modernize 2019-05-15 09:59:25 -04:00
Christie Rice
6db32a36bc REVEM-239 Add audit access expiration deadline to user-metadata 2019-05-08 08:53:21 -04:00
Nimisha Asthagiri
eb0791ec89 Inter-app API cleanup for Grades 2019-05-04 11:35:06 -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
Dave St.Germain
b4ccd03740 This adds a new django app -- edx-when -- that will copy start and due dates to mysql and allow per-learner overrides in the instructor dashboard, using the existing IDDE interface. 
It adds a data migration for existing IDDE data.
 2019-04-24 12:26:19 -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
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
David Ormsbee
857769e379 Merge pull request #19022 from edx/ormsbee/fix_ccx_data_migration 
Remove course publish from CCX data migration.
 2019-02-06 12:04:53 -05:00
Matthew Piatetsky
6e81c84d8b fix unicode strings in lms/ part 1 2019-02-05 15:15:02 -05:00
Matthew Piatetsky
fc6cc94573 Ensure masquerade works in courses that haven't started yet 2018-12-19 08:43:54 -05:00
Matthew Piatetsky
14a899a65d REVE-104 & REVE-108: Ensure Course Roles' Access 2018-12-07 16:39:09 -05:00
Cali Stenson
241cff006a Add user_metadata to reflect if a user has purchased before. 
REVO-20
 2018-12-07 07:48:32 -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
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
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Bill Filler
cebd85e681 Add expiration banner to progress page 
In audit mode, add expiration banner to course progress page

REVE-6
 2018-11-09 16:13:35 -05:00
Matthew Piatetsky
dfe189e9bb change access_duration to be weeks_to_complete or MIN_DURATION for both SP and IP courses 2018-11-07 13:18:25 -05:00
Matthew Piatetsky
073df570fa Merge pull request #19095 from edx/expired_dashboard_message 
Add course duration limit and dashboard expiration code
 2018-10-23 12:17:58 -04:00
Matthew Piatetsky
9037999bd2 add content gating waffle flag 2018-10-22 20:49:08 -04:00
Matthew Piatetsky
3e87cb7c7d fix expired message on dashboard and some of the tests 2018-10-17 09:20:45 -04:00
Robert Raposa
fbc59231fc Update edx-drf-extensions to 2.0.0. 
Note: this version update is backward incompatible.

ARCH-255
 2018-10-17 01:00:34 -04:00
Calen Pennington
72f556c1a9 Import courseware module from fully-qualified module name 2018-10-10 15:34:33 -04:00
Ahsan Ulhaq
ee7555e85f update usage of SessionAuthenticationAllowInactiveUser 
LEARNER-6469
 2018-10-01 17:52:52 +05:00
David Ormsbee
5f97cecefb Remove course publish from CCX data migration. 
This removes the portion of the CCX course names data migration
that triggers course publishing. While course publishing is the
desired behavior, doing so within the migration makes it so that
this migration is not practical to run if you have hundreds or
thousands of CCX courses (we run out of memory).

By doing the data migration without the accompanying course
publishes, this means that CCX course names will still show up
incorrectly for courses until there is an edit or publish of
either that CCX course or the underlying course that the CCX
course extends. But we at least set up the data so that it's
gradually self-correcting over time, and do so with little coding
effort or operational risk/weirdness.

A more comprehensive fix for this would involve:

* Fixing the memory leak around CourseOverviews creation and/or;
* Moving CourseOverview generation to happen asynchronously and/or;
* Being more careful about transactionality in the data migration
  and running it repeatedly until it all passes.

Full details of our migration issues are at:

https://github.com/edx/edx-platform/pull/18808#issuecomment-422930820
 2018-09-28 18:54:14 -04:00