Commit Graph

64101 Commits

Author SHA1 Message Date
salman2013
942e713ff0 chore: resolve conflicts 2023-10-26 14:20:26 +05:00
Muhammad Adeel Tajamul
808390ace8 fix: sender list was empty in notification generated event (#33590) 2023-10-26 06:49:20 +05:00
Jenkins
e024d2b62d chore: geoip2: update maxmind geolite country database 2023-10-25 16:59:21 -04:00
Alexander J Sheehan
d14d9eac8e Merge pull request #33595 from openedx/alex-sheehan-edx/upgrade-edx-enterprise-086834a
feat: Upgrade Python dependency edx-enterprise
2023-10-25 15:12:25 -04:00
alex-sheehan-edx
e2095bd818 feat: Upgrade Python dependency edx-enterprise
enterprise version bump 4.6.9

Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`
2023-10-25 18:51:28 +00:00
Omar Al-Ithawi
086834aa8b docs: design for atlas pull for the edx-platform and its plugins (#33166) 2023-10-25 13:36:45 -04:00
Muhammad Umar Khan
5b469371d5 chore: update connect_timeout for memcache server (#33594) 2023-10-25 17:11:12 +00:00
Tim McCormack
d18bf2ce8f chore: Update actions/upload-artifact from v2 to v3 (#33580)
v2 is giving warnings:

```
The following actions uses node12 which is deprecated and will be forced to run on node16: actions/upload-artifact@v2. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/
```
2023-10-24 21:18:34 +00:00
connorhaugh
b0a004de33 docs: add pytest django setting specification to docs (#33564) 2023-10-24 11:35:15 -04:00
Ehmad Saeed⚡
c41db87c80 Merge pull request #33570 from openedx/justEhmadSaeed/upgrade-edx-enterprise-5009d05
feat: Upgrade Python dependency edx-enterprise
2023-10-24 19:15:58 +05:00
justEhmadSaeed
ca2f24a0e7 feat: Upgrade Python dependency edx-enterprise
Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`
2023-10-24 17:34:53 +05:00
Ahtisham Shahid
5009d052e5 chore: added debug logs to notifications filters (#33568) 2023-10-24 14:42:38 +05:00
Muhammad Adeel Tajamul
07ae24aaab feat: added sender_id to notification generated events (#33544) 2023-10-24 11:09:00 +05:00
salman2013
e2560e163f chore: fix tests 2023-10-24 09:17:33 +05:00
salman2013
8d7e451c98 Merge remote-tracking branch 'upstream/master' into salman/remove-bok-choy 2023-10-24 09:06:15 +05:00
Sarina Canelake
98fe27fcb7 Merge pull request #33547 from openedx/sarina/itworks
Use Open edX as a noun on the default Open edX homepage
2023-10-23 14:54:49 -04:00
Yusuf Musleh
08d6607636 feat: Add url that exposes taxonomy tags CRUD API (#33525)
* feat: Add url that exposes taxonomy tags CRUD API

Include `content_tagging` namespace for content_tagging urls in cms
for `sub_tags_link` to work in multi-level taxonomy tags.

* chore: Bump openedx-learning version
2023-10-23 11:07:46 -07:00
Sarina Canelake
b917e627ab fix: Use Open edX as a noun on the default Open edX homepage 2023-10-23 13:15:57 -04:00
Andrew Shultz
7770e51fdd Merge pull request #33550 from openedx/ashultz0/rename_second_update_enrollment
fix: rename update cache functions to what they are
2023-10-23 09:17:55 -04:00
Ahtisham Shahid
e9323737c3 fix: updated , notification config name from filter to filters (#33557) 2023-10-23 16:29:34 +05:00
salman2013
2ff9ca8c1b chore: fix comments, remove un-used selenium browser 2023-10-23 12:13:30 +05:00
salman2013
9452cef97d chore: resolve conflicts 2023-10-23 12:05:25 +05:00
Jenkins
7900711684 chore(i18n): update translations 2023-10-22 17:09:52 -04:00
Omar Al-Ithawi
09a6523792 docs: decision to standardize django/djangojs po files (#32994)
This contribution is part of the [FC-0012 project](https://openedx.atlassian.net/l/cp/XGS0iCcQ) which is sparked by the [Translation Infrastructure update OEP-58](https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0058-arch-translations-management.html#specification).
2023-10-20 11:14:30 -04:00
Feanil Patel
2e75ced467 Merge pull request #33186 from thezaeemaanwar/remove_badges_app
[DEPR]: lms/djangoapps/badges
2023-10-20 10:29:43 -04:00
Andy Shultz
c3a24c126e fix: rename update cache functions to what they are 2023-10-20 10:19:42 -04:00
Ehmad Saeed⚡
c597303d4e Merge pull request #33549 from openedx/justEhmadSaeed/upgrade-edx-enterprise-db4911b
feat: Upgrade Python dependency edx-enterprise
2023-10-20 18:51:03 +05:00
justEhmadSaeed
4af2f5b5c2 feat: Upgrade Python dependency edx-enterprise
version bump

Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`
2023-10-20 18:25:26 +05:00
Jesper Hodge
db4911b90e chore: rename Files & Uploads page (#33546) 2023-10-19 21:08:42 +00:00
Rômulo Penido
2482dd4084 feat: more detailed taxonomies permission rules (#33413) 2023-10-19 10:54:30 -07:00
Chris Chávez
1d58bd1106 feat: New link on studio home to Taxonomy list (if waffle flag set) (#33439) 2023-10-19 10:19:50 -07:00
Deborah Kaplan
e3a1cb01bb Merge pull request #33530 from openedx/dkaplan1/APER-2407_remove-coaching-functionality-from-edx-platform
feat: remove deprecated coaching from edx-platform
2023-10-19 10:51:51 -04:00
Kyle McCormick
9c6e765bf6 test: run ./xmodule/ tests with CMS settings (#33534)
Currently, ./xmodule/ unit tests are only run with LMS settings. However,
./common/ and ./xmodule/ are run twice: once with LMS settings and once with
CMS settings.

Just like ./common/ and ./openedx/, the unit tests in ./xmodule/ validate
behavior in both LMS and CMS. So, order to fully test ./xmodule/, we should to
run its tests with CMS settings too.

This will enable us to better validate certain LibraryContentBlocks behaviors
being touched by https://github.com/openedx/edx-platform/pull/33263 which can't
be expressed under LMS settings.

Also in this commit:

* refactor: rename the shards to be clear whether they're running under LMS or CMS
* docs: correct comments regarding conditions under which codejail's
   test_cant_do_something_forbidden is skipped.
* test: update a unit test which was using the now-deleted library_sourced block to use
   library_content block instead.
2023-10-19 10:19:28 -04:00
Feanil Patel
98e8bf8c8a Merge pull request #32137 from openedx/dependabot/github_actions/aws-actions/configure-aws-credentials-2
build(deps): bump aws-actions/configure-aws-credentials from 1 to 2
2023-10-19 10:10:08 -04:00
Muhammad Abdullah Waheed
caf8e456e2 Revert "feat: Account and profile MFE legacy removal - redeployment (#31893)" (#33542)
This reverts commit 08f5e7e563.
2023-10-19 12:26:29 +05:00
Muhammad Abdullah Waheed
08f5e7e563 feat: Account and profile MFE legacy removal - redeployment (#31893)
feat: Account and profile MFE legacy removal - redeployment

* Revert "Revert "FC-0001: Account pages -> micro-frontend (#30336)" (#31888)"

This reverts commit 90c4ca6e47.

* refactor: removed filters test from user_api accounts

---------

Co-authored-by: Bilal Qamar <59555732+BilalQamar95@users.noreply.github.com>
2023-10-19 10:43:15 +05:00
Jenkins
e1bad75565 chore: geoip2: update maxmind geolite country database 2023-10-18 17:04:22 -04:00
Tim McCormack
443753d864 build: Only build and push ci-runner Docker image on origin repo (#33535)
I get a weekly CI failure email due to this scheduled workflow running on
my fork of edx-platform. Cancelling the job when it runs on a fork prevents
this.
2023-10-18 20:00:26 +00:00
Jenkins
44a04a5342 chore(i18n): update translations 2023-10-18 15:08:38 -04:00
thezaeemaanwar
0b3e4d73b6 feat!: Removed Badges App
fix: restored badges handlers

feat: remove FE code for badges

fix: resolved failing tests

fix: removed test case for badges app

fix: unused import error

fix: Response Field Count

fix: shareable account response length

fix: resolved PR comments

fix: revert settings override

feat!: Removed Badges App

fix: restored badges handlers

feat: remove FE code for badges

fix: resolved failing tests

fix: removed test case for badges app

fix: unused import error

fix: Response Field Count

fix: shareable account response length

fix: revert subscription badge
2023-10-18 20:30:04 +05:00
Deborah Kaplan
3060004a4a feat: removing deprecated coaching
Removing unused import
2023-10-18 15:09:59 +00:00
Deborah Kaplan
b2f2e22b8a feat: remove deprecated coaching
linting, fixing pr comment
2023-10-18 14:48:34 +00:00
Deborah Kaplan
5c3237c389 Merge branch 'master' into dkaplan1/APER-2407_remove-coaching-functionality-from-edx-platform 2023-10-18 10:31:46 -04:00
Muhammad Umar Khan
92731be0dc Replace pyjwkest with pyjwt (#32270)
* chore: replace pyjwkest with pyjwt
2023-10-18 15:15:17 +05:00
Deborah Kaplan
f7282229da Merge branch 'master' into dkaplan1/APER-2407_remove-coaching-functionality-from-edx-platform 2023-10-17 16:37:32 -04:00
Alexander J Sheehan
7ef865029a Merge pull request #33524 from openedx/alex-sheehan-edx/upgrade-edx-enterprise-7202c22
feat: Upgrade Python dependency edx-enterprise
2023-10-17 15:23:33 -04:00
Deborah Kaplan
9f8bd36944 feat: remove deprecated coaching from edx-platform
FIXES: APER-2407
2023-10-17 18:07:12 +00:00
alex-sheehan-edx
70d547d622 feat: Upgrade Python dependency edx-enterprise
enterprise version bump

Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`
2023-10-17 17:23:21 +00:00
Feanil Patel
7202c22e1d Merge pull request #33373 from openedx/feanil/update_password_length_default
feat: Update the minimum password length.
2023-10-17 10:08:15 -04:00
Rafay
bf6ed5eb81 fix: reset button becomes available after submission (#33490) 2023-10-17 18:12:34 +05:00