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

56287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saleem Latif
e4cb3dfcbd Merge pull request #25522 from edx/saleem-latif/ENT-3522-bug-fix-2 
ENT-3522: upgrade edx-enterprise version to 3.10.3
 2020-11-04 18:22:17 +05:00
Saleem Latif
d5505461c4 upgrade edx-enterprise version to 3.10.3 2020-11-04 17:39:25 +05:00
Saleem Latif
d14f6c4739 Merge pull request #25520 from edx/saleem-latif/ENT-3522-bug-fix 
ENT-3522: Updated edx-enterprise version to 3.10.2 that contains a bug fix for enterprise customer admin page.
 2020-11-04 13:57:37 +05:00
Saleem Latif
415a433cd0 Updated edx-enterprise version to 3.10.2 that contains a bug fix for enterprise customer admin page. 2020-11-04 13:09:04 +05:00
edX requirements bot
9c312c2976 Updating Python Requirements (#25518) 2020-11-04 13:02:31 +05:00
Sarina Canelake
18059c20e7 Merge pull request #25505 from edx/sarina/gender-neutral-language 
Change gendered language to gender-neutral 'they/them/their'
 2020-11-03 16:16:59 -05:00
Thomas Tracy
ead2825b14 Re-add course key to segment unenroll tracker (#25516) 2020-11-03 15:51:48 -05:00
brianhw
89169443ad Handle more kinds of bad data in segment events. (#25506) 2020-11-03 15:04:05 -05:00
Robert Raposa
4a0e4aa16d Merge pull request #25417 from regisb/regisb/deprecate-toggle-override 
[BD-21] Switch to edx-toggles classes and deprecate waffle override methods
 2020-11-03 14:06:07 -05:00
Régis Behmo
c9c1136459 Re-introduce waffle classes (with deprecation warnings) 
This is for backward compatibility.
 2020-11-03 19:25:37 +01:00
Régis Behmo
b70042435a Deprecate waffle_utils.testutils.override* functions 
These functions should from now on be imported from
edx_toggles.toggles.testutils.
 2020-11-03 19:25:37 +01:00
Régis Behmo
4586002956 Import waffle classes from edx_toggles instead of waffle_utils 
Those classes were ported to edx_toggles. The imports remain in
waffle_utils.__init__ for backward compatibility.
 2020-11-03 19:25:37 +01:00
Régis Behmo
3b127f8c92 Deprecate WaffleSwitch.override* methods 
This allows us to get rid of the custom WaffleSwitch and
WaffleSwitchNamespace classes from waffle_utils in favour of
edx_toggles.toggles classes.
 2020-11-03 19:25:37 +01:00
Régis Behmo
2307dff4c9 Deprecate WaffleFlag.override method 
This allows us to get rid of waffle_utils' custom WaffleFlag method.
 2020-11-03 19:25:37 +01:00
Régis Behmo
16ce16e85e Deprecate ExperimentWaffleFlag.override method 
This is part of a removal of the many override methods of toggle
flag/namespace classes. This allows us to remove imports of test modules
from production code.
 2020-11-03 19:25:37 +01:00
Robert Raposa
64a162f69c Merge pull request #25494 from regisb/regisb/fix-swaggerdocs 
[BD-21] Fix API docs generation and update swagger.yml
 2020-11-03 11:40:29 -05:00
Jansen Kantor
831658c9d1 pin ora temporarily (#25510) 2020-11-03 10:42:31 -05:00
Jansen Kantor
09255000e6 downgrade ORA (#25499) (#25509) 2020-11-03 08:24:59 -05:00
Aarif
dafac0c9eb updated Dockerfile to use ubuntu 20.04 as base (#25435) 2020-11-03 17:28:03 +05:00
adeel khan
7cd9c6652a Merge pull request #25476 from edx/adeel/van_98_update_confirm_password_url_domain 
Adds Logistration MFE url for forgot password email.
 2020-11-03 13:40:03 +05:00
Usama Sadiq
028be7ebdf Merge pull request #25508 from edx/jenkins/upgrade-python-requirements-dbf6ef2 
Python Requirements Update
 2020-11-03 11:41:28 +05:00
edX requirements bot
0f39482e54 Updating Python Requirements 2020-11-02 23:55:45 -05:00
Mike OConnell
dbf6ef22df Using logging filters from edx-django-utils (#25492) 
The UserIdFilter and RemoteIpFilter logging filter classes
were moved from edx-platform to edx-django-utils for more
distributed use. This updated removes those classes from
edx-platform, and references their counterparts in
edx-django-utils.

ENT-3494
 2020-11-02 21:40:59 -05:00
sarina
f414fad0cc Change gendered language to gender-neutral 'they/them/their' 2020-11-02 18:23:13 -05:00
Robert Raposa
acd84598c9 Merge pull request #25504 from edx/robrap/ARCHBOM-1584-fix-monitoring-references 
ARCHBOM-1584: remove internal references to edx_django_utils from tests
 2020-11-02 18:12:12 -05:00
Robert Raposa
39a7c6498c remove internal references to edx_django_utils 
Tests were referring to internal implementation
details of edx-django-utils. This comment removes
those references to free the library up to be
refactored.

ARCHBOM-1584
 2020-11-02 16:46:11 -05:00
Ned Batchelder
57d33f17e8 Merge pull request #25496 from edx/nedbat/https-openedx 
Use https for open.edx.org links
 2020-11-02 14:55:01 -05:00
Muhammad Ammar
c4468b5aee Merge pull request #25502 from edx/ammar/convert-to-str-before-comparision 
convert enterprise customer uuid to str before comparison
 2020-11-03 00:48:16 +05:00
muhammad-ammar
2cc0688e1c convert enterprise customer uuid to str before comparison 
ENT-3494
 2020-11-03 00:20:05 +05:00
Thomas Tracy
5e0ae6bf0c Remove modal flag from code (#25482) 2020-11-02 13:17:07 -05:00
Ned Batchelder
21d7e6f3b2 Use https for open.edx.org 2020-11-02 11:29:03 -05:00
Muhammad Ammar
80ab601fb0 Merge pull request #25501 from edx/ammar/more-logs-for-dsc 
more logs for data sharing consent
 2020-11-02 21:00:06 +05:00
muhammad-ammar
5f04fd35a0 more logs for data sharing consent 
ENT-3494
 2020-11-02 20:24:44 +05:00
Jansen Kantor
dbe96cff8c downgrade ORA (#25499) 2020-11-02 09:16:01 -05:00
Dillon Dumesnil
9ebcf32113 Merge pull request #25485 from edx/ddumesnil/weekly-highlights-error-logging-aa-393 
AA-393: Update Next Section Logic
 2020-11-02 05:36:33 -08:00
Zaman Afzal
94e051d8d8 Upgrade edx-enterprise 3.10.1 version (#25495) 2020-11-02 16:28:01 +05:00
Régis Behmo
3599198f19 Fix API docs generation and update swagger.yml 
API docs generation was being blocked by missing values in the doc
settings. We wanted to update the swagger.yml to get the toggle state
("/toggles/v0/state/") endpoint in the docs.
 2020-11-02 09:27:48 +01:00
edX requirements bot
8fea5971f8 Updating Python Requirements (#25493) 2020-11-02 12:21:52 +05:00
Ned Batchelder
b408d032e4 Merge pull request #25457 from regisb/regisb/squash-lmsinitialization-warning 
Squash lms_initialization deprecated import warning
 2020-10-30 17:09:09 -04:00
Dillon Dumesnil
6b16fcd9b3 AA-393: Update Next Section Logic 
Inside content_highlights.py, we had code to calculate due dates
for when there isn't graded content, but we could only reach that
code path if the user had an assignment with a due date at the
target date. Now we will check for all learners who could be in
range of having an update and let the code in content_highlights.py
decide if a highlight should be sent
 2020-10-30 15:02:03 -04:00
Binod Pant
6dcb0fdb81 enterprise 3.10.0 (#25489) 2020-10-30 13:50:37 -04:00
Jansen Kantor
f41f4f7efd downgrade ora to 2.10.3 (#25487) 2020-10-30 11:12:26 -04:00
Kyle McCormick
854502b560 Re-generate import_shims modules for cms/djangoapps 
Command:
import_shims/generate_shims.sh cms/djangoapps import_shims/studio
 2020-10-30 10:20:48 -04:00
Kyle McCormick
14708147af Re-generate import_shims modules for lms/djangoapps 
Command:
import_shims/generate_shims.sh lms/djangoapps import_shims/lms
 2020-10-30 10:20:48 -04:00
Kyle McCormick
675497be02 Move sys_path_hacks modules to import_shims 2020-10-30 10:20:48 -04:00
Kyle McCormick
630d30563a Silence DeprecatedEdxPlatformImportWarning by default 2020-10-30 10:20:48 -04:00
Kyle McCormick
090e10683c Rename sys_path_hacks/ to import_shims/ 
The old folder name is somewhat confusing, because the
folder contains shims to _compensate for the removal
of sys.path hacks_, but does not contain the sys.path
hacks themselves.

Furthermore, this import_shims/ system could also be
used for other import path changes, such as turning
the locally-installed packages in common/lib/
into regular, importable modules
(e.g. `from common.lib.xmodule import abc` instead of
`from xmodule import abc`). So, a name that is not
specific to the sys.path hacks may be better
in the medium-to-long term.

Along the same lines, we also rename SysPathHackWarning
to DeprecatedEdxPlatformImportWarning.
 2020-10-30 10:20:48 -04:00
Tim McCormack
644963255c Move toggle annotation invocation to a Jenkins job (#25484) 
There wasn't any reason for this to be in edx-platform in particular.

See https://github.com/edx/jenkins-job-dsl-internal/pull/444 -- we can
run `make requirements; pip install -e .` in a code-annotations
virtualenv and point it at each IDA in turn to generate reports for all of them.

ARCHBOM-1583
 2020-10-30 13:35:45 +00:00
Robert Raposa
0cc46ca5b0 Merge pull request #25332 from regisb/regisb/use-settingdict 
[BD-21] Use edx-toggle's SettingDictToggle to document setting-based feature toggles
 2020-10-30 08:59:38 -04:00
Robert Raposa
759cbe2910 Merge pull request #25286 from regisb/regisb/extract-waffle-utils 
[BD-21] Move waffle_utils from edx-platform to edx-toggles
 2020-10-30 08:50:04 -04:00