Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,453 Commits 1 Branch 0 Tags
20e8da382589f156eb2bad7a7a0dae7bd588f2ff
Commit Graph

61453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saleem Latif
20e8da3825 Merge pull request #30494 from openedx/saleem-latif/ENT-5796-bug-fix 
fix: Fixed a small error related to function return type.
 2022-05-26 19:52:43 +05:00
Saleem Latif
97f0ce87ac fix: Fixed a small error related to function return type. 2022-05-26 19:36:38 +05:00
Adam Blackwell
4cd36cb2c4 Revert "feat: add marketing email opt in field" (#30493) 2022-05-26 10:00:50 -04:00
Abdoul Aw
8e1475f585 Merge pull request #30461 from openedx/zamir/VAN-970/add_is_marketable_field_to_use_profile 
feat: add marketing email opt in field
 2022-05-26 09:20:17 -04:00
SaadYousaf
2684189127 fix: address UX feedback on reported content email template 2022-05-26 16:59:24 +05:00
Ali Akbar
8528fc07f6 Merge pull request #30464 from openedx/aakbar/PROD-2764-fix-oauth2 
fix: use client-credential oauth2 application entry
 2022-05-26 11:21:53 +05:00
Robert Raposa
432cde31a5 refactor: add create_jwt_token_dict (#30485) 
Moves the functionality from views._get_jwt_dict_from_access_token_dict
to a new method jwt.create_jwt_token_dict, which create a JWT version
of the passed token_dict. Also updates create_jwt_from_token to wrap
this call and return the "access_token" from the dict.

This will hopefully make it less likely that the token
dict attributes could get out of sync with the claims
inside the JWT.
 2022-05-25 17:02:19 -04:00
edX requirements bot
d828f155a6 chore: Updating Python Requirements (#30486) 2022-05-25 16:35:11 -04:00
julianajlk
43fb2cc022 fix: Update enrollments FBE status by course key in dashboard (#30483) 
REV-2466
 2022-05-25 12:01:42 -04:00
Long Lin
1358f99dba chore: bump edx-enterprise version 2022-05-25 10:03:29 -04:00
Robert Raposa
d321ed5ccd refactor: extract shareable jwt methods (#30451) 
Extract some jwt related methods to enable reuse across views.
This is in preparation for a change to AccessTokenExchangeView.

Co-authored-by: jawad-khan <jawadkhan444@gmail.com>
 2022-05-25 08:53:36 -04:00
Saleem Latif
eb45e53799 Merge pull request #30439 from openedx/saleem-latif/ENT-5796 
Enterprise learner with enabled learner portal should be redirect to B2B course about page.
 2022-05-25 12:36:02 +05:00
Saleem Latif
f13b0e0e8a feat: Enterprise learner with enabled learner portal should be redirect to B2B course about page. 2022-05-25 12:19:53 +05:00
John Nagro
3b4c86ef42 feat: release edx-enterprise 3.49.4 (#30474) 
ENT-5822
 2022-05-24 14:44:11 -04:00
julianajlk
f7d4282101 Revert "fix: Use dashboard_index to get FBE status (#30463)" (#30475) 
This reverts commit e25e17ee88.
 2022-05-24 14:35:47 -04:00
Eugene Dyudyunov
b4fecd620b refactor: rename toggle_warnings to toggle_warning (#30458) 
Rename toggle_warnings to toggle_warning for consistency with setting_warning.
 2022-05-24 11:47:31 -04:00
julianajlk
e25e17ee88 fix: Use dashboard_index to get FBE status (#30463) 
REV-2466
 2022-05-24 10:24:38 -04:00
SaadYousaf
23aa0d39c1 fix: add investigation log for comment client request error 2022-05-24 16:39:40 +05:00
Kyle McCormick
25df9ca420 refactor: make safe_lxml an ordinary folder in openedx/core/lib (#25689) 2022-05-24 15:35:23 +05:00
Usama Sadiq
2ef25e3cfe BOM-2247: Upgrade pip to 22.1 (#30393) 
* chore: bump pip to 22.1 & wheel to 0.37.1
 2022-05-24 15:15:00 +05:00
edX requirements bot
96a7ebc95c chore: Updating Python Requirements (#30467) 2022-05-24 14:14:17 +05:00
Usama Sadiq
583b36938e fix: fix ResourceWarnings (#30317) 2022-05-24 11:44:45 +05:00
Brian Citro
677e0b8076 Merge pull request #30465 from openedx/bcitro/ENT-5836 
fix: release edx-enterprise 3.49.3
 2022-05-23 12:44:28 -04:00
Brian Citro
3e166f84d4 fix: release edx-enterprise 3.49.3 2022-05-23 12:21:06 -04:00
AliAkbar
49b2d543e5 fix: use client-credential oauth2 application entry 2022-05-23 19:58:58 +05:00
Zainab Amir
3a43d4344b feat: add marketing email opt in field 
Added a new is_marketable field to UserProfile model to store
marketing email opt in field on registration form in UserProfile.

VAN-970
 2022-05-23 18:30:57 +05:00
Mohammad Ahtasham ul Hassan
c6d113f26d chore: update Docker Image to use node 16 (#30444) 2022-05-23 15:18:53 +05:00
Muhammad Adeel Tajamul
be13b0d6af Merge pull request #30435 from openedx/inf-224 
fix: cohorts api not working
 2022-05-23 09:54:44 +05:00
edx-semantic-release
da6a463f33 chore(i18n): update translations 2022-05-22 17:01:52 -04:00
Justin Hynes
dae0de89dd Merge pull request #30448 from openedx/jhynes/microba-1512_mgmt_cmd 
feat: Add management command for processing scheduled instructor tasks
 2022-05-20 13:49:17 -04:00
Robert Raposa
98d990d7af fix: remove reference to ApplicationOrganization (#30446) 
References to ApplicationOrganization were removed two
years ago in the following PR:
https://github.com/openedx/edx-platform/pull/23199

However, it looks like one reference was missed.

ARCHBOM-992
 2022-05-20 13:42:12 -04:00
Justin Hynes
8026f74e80 feat: Add management command for processing scheduled instructor tasks 
[MICROBA-1512]
* Adds a new management command to the `instructor_task` app that will be used to process scheduled tasks ready for execution by Celery.
 2022-05-20 12:50:27 -04:00
julianajlk
aef4d88eef feat: Add logic for happy and non-happy path upgrade msg in learner dashboard (#30368) 
REV-2466
 2022-05-20 10:09:03 -04:00
Attiya Ishaque
75ca47695c feat: add required fields rest api (#30198) 
* feat: add required fields rest api

* feat: first review changes added.
 2022-05-20 12:06:24 +05:00
adeel.tajamul
8ef0b18f06 fix: cohorts api not working 2022-05-20 11:33:27 +05:00
Justin Hynes
068eecff91 Merge pull request #30408 from openedx/jhynes/microba-1510_update-email-api 
feat: MICROBA-1510; add support for updating course email content and schedules
 2022-05-19 14:10:54 -04:00
Justin Hynes
79c53f1002 feat: MICROBA-1510; add support for updating course email content and schedules 
[MICROBA-1510]
- Add support for updating an instructor task schedule date via REST API
- Add support for updating the contents of a scheduled course email via REST API
 2022-05-19 13:42:58 -04:00
Tim McCormack
47f9234323 chore: Upgrade edx-django-utils to 5.0.0 for corrupt cookie logging (#30445) 2022-05-19 17:34:26 +00:00
Justin Hynes
ee6f810bed Merge pull request #30423 from openedx/jhynes/use_instructor_task_constants 
chore: update instructor task names to use constants
 2022-05-19 11:49:14 -04:00
Robert Raposa
3fc852f53c feat!: change JWT access token expires (#30432) 
Introduces JWT_ACCESS_TOKEN_EXPIRE_SECONDS setting. This is the number
of seconds a JWT access token remains valid. We use this custom
setting for JWT formatted access tokens, rather than the
django-oauth-toolkit setting ACCESS_TOKEN_EXPIRE_SECONDS, because the
JWT is non-revocable and we want it to be shorter lived than the
legacy Bearer (opaque) access tokens, and thus to have a smaller
default.

BREAKING CHANGE: The thing that is breaking is that JWT access tokens
will now have a 1 hour default, instead of a 10 hours default. If
third-party scripts are appropriately checking/refreshing the access
token, this should be ok. However, you can always override with a
longer duration temporarily. From a security perspective, we don't
recommend a longer duration, and you may consider a shorter duration.

ARCHBOM-2099
 2022-05-19 09:46:17 -04:00
Mohammad Ahtasham ul Hassan
7deea6ec6e feat: add lockfile check (#30440) 2022-05-19 17:54:09 +05:00
Chris Pappas
92388c2888 chore: bumping edx-enterprise version (#30434) 2022-05-18 17:14:49 -04:00
alangsto
5b6558c8ca chore: update name affirmation version (#30430) 2022-05-18 09:34:17 -04:00
Mohammad Ahtasham ul Hassan
f801deaae5 Node Upgrade (#30420) 
* feat: Node16 upgrade
 2022-05-18 16:12:34 +05:00
Long Lin
ffb9c5dfa2 chore: bump edx-enterprise version 2022-05-17 16:45:23 -04:00
Chris Pappas
e1277b4b87 chore: bump edx-enterprise version; uncomment migration test skip (#30425) 2022-05-17 14:47:37 -04:00
Chris Pappas
a8b26c3aef chore: bumping edx-enterprise version (#30424) 
* chore: bumping edx-enterprise version

* temp: skip migration sync test
 2022-05-17 12:29:26 -04:00
Justin Hynes
bfd75013a1 chore: update instructor task names to use constants 
* Update various instructor task logic to use constants over strings when referring to instructor task names
 2022-05-17 11:52:35 -04:00
edX requirements bot
4aa40618a6 chore: Updating Python Requirements (#30414) 2022-05-17 10:57:37 +05:00
Mohammad Ahtasham ul Hassan
fee54bf424 Revert "Node 16 Upgrade (#30354)" (#30399) 
This reverts commit f4c3c3fb4d.
 2022-05-16 18:42:42 -04:00