Commit Graph

63136 Commits

Author SHA1 Message Date
Edward Zarecor
65f317de7e Merge branch 'master' into fix-FB-share 2023-06-09 10:33:48 -04:00
Alex Dusenbery
2e447b043d feat: edx-enterprise 3.66.4 | more logging for bulk enrollment 2023-06-09 09:59:58 -04:00
ruzniaievdm
96b8ba5d6a feat: Create DRF for course settings and course details views out of current Django views (#32397) 2023-06-08 11:07:29 -04:00
Rebecca Graber
47a568adca chore: remove generate_code_owner_mappings (script moved) (#32403)
This has been moved to https://github.com/edx/edx-arch-experiments/blob/main/edx_arch_experiments/scripts/generate_code_owner_mappings.py
2023-06-08 10:36:49 -04:00
Jody Bailey
76e4e8cfe8 feat: Added separate url for only returning amplitude recommendations (#32398)
* feat: Added separate url for only returning amplitude recommendations

* chore: added extra line between serializers

* chore: changed name of methods

* chore: updated and added docstrings
2023-06-08 16:29:52 +02:00
Syed Ali Abbas Zaidi
4d8c1d6d13 Merge pull request #32296 from openedx/Ali-Abbas/badge-styles
refactor: add badge styles to scss
2023-06-08 18:30:26 +05:00
Syed Ali Abbas Zaidi
b5130f2ae3 Merge branch 'master' into Ali-Abbas/badge-styles 2023-06-08 15:53:30 +05:00
irfanuddinahmad
68f72b3570 Merge pull request #32400 from openedx/iahmad/ENT-7258
chore: upgrade edx-enterprise
2023-06-08 15:22:36 +05:00
IrfanUddinAhmad
901aaa4f7d chore: upgrade edx-enterprise 2023-06-08 14:59:36 +05:00
Syed Ali Abbas Zaidi
9e9130bd67 Merge branch 'master' into Ali-Abbas/badge-styles 2023-06-08 13:15:30 +05:00
Nawfal Ahmed
dd454172a3 feat: show existing UX for purchased program on program details (#32374) 2023-06-08 08:14:05 +00:00
Syed Ali Abbas Zaidi
bd61cc1256 Merge branch 'master' into Ali-Abbas/badge-styles 2023-06-08 10:40:16 +05:00
Edward Zarecor
1dd0bed7ad Merge pull request #32383 from graemeglass/remove-extra-recommender-xblock-requirement
chore: remove 2nd entry of the same xblock
2023-06-07 17:55:22 -04:00
Edward Zarecor
5316d7eee8 Merge branch 'master' into remove-extra-recommender-xblock-requirement 2023-06-07 17:14:37 -04:00
Jenkins
5c961b7b04 chore: geoip2: update maxmind geolite country database 2023-06-07 16:58:55 -04:00
Syed Ali Abbas Zaidi
a1f7f8b672 Merge branch 'master' into Ali-Abbas/badge-styles 2023-06-07 20:24:06 +05:00
Leangseu Kim
40613ae3f4 fix: when no option selected, the criteria should try to create 2023-06-07 11:04:19 -04:00
Kyle McCormick
cef8c062a2 build: stop suffixing XModule SCSS with hashes (#32288)
Similar to https://github.com/openedx/edx-platform/pull/32287,
this change removes another unnecessary step from the
`xmodule_assets` script. The script, which generates XModule
SCSS "entrypoint" files (synthesizing one or more "source" SCSS
resources), was appending MD5 hashes to each SCSS entrypoint filename:

    common/static/xmodule/descriptors/scss:
       AboutBlockStudio.768623f4d8d73dfb637fc94583adb990.scss
       ...
       WordCloudBlockStudio.d41d8cd98f00b204e9800998ecf8427e.scss
    common/static/xmodule/modules/scss:
       AboutBlockPreview.05a6cbd5c10100a245fa2cbf151b9770.scss
       ...
       WordCloudBlockPreview.7b899a56a70d29c58cf14b7e1888a0ec.scss

It's unclear why these MD5 hashes needed to be appended.
A comment in xmodule/static_content.py hints that it might have
something to do with de-duplication, but that doesn't make any sense,
because each XModule has exactly two SCSS entrypoint files (one for
studio_view and one for other student/author_views) and none of those
entrypoint files can possibly be shared between XModules.

Soon, as part of deleting the `xmodule_assets` script,
we would like to just check these SCSS files into version control
rather than generating them. In order to do that, we will need to
drop the hashes. This commit does that.
The new output looks like this:

    common/static/xmodule/descriptors:
       AboutBlockStudio.scss
       ...
       WordCloudBlockStudio.scss
    common/static/xmodule/modules:
       AboutBlockPreview.scss
       ...
       WordCloudBlockPreview.scss

Part of: https://github.com/openedx/edx-platform/issues/32292
2023-06-07 09:26:08 -04:00
Moeez Zahid
6ab9e497fc refactor: Add logging, exception handling to Apple migration commands (#32390)
* refactor: Add logging, exception handling to Apple migration commands
* refactor: pylint fixes
2023-06-07 17:07:13 +05:00
Muhammad Bilal Tahir
698506cb99 Merge pull request #32365 from openedx/btahir/ENT-7192
feat: management command to fetch enterprise learner current job in profile
2023-06-07 15:45:19 +05:00
Muhammad Bilal Tahir
86edbbeb46 feat: management command to fetch enterprise current job in lms extended profile 2023-06-07 15:17:10 +05:00
SaadYousaf
2da176ce32 feat: implementing basic functionality to incorporate new notification types 2023-06-07 14:05:59 +05:00
SaadYousaf
0339784e4e feat: integrating notification preference API 2023-06-07 14:05:59 +05:00
Justin Hynes
7293b3e85a Merge pull request #32386 from openedx/jhynes/APER-2347_fix-topic-name
fix: update name of topic used to publish `CERTIFICATE_CREATED` events
2023-06-06 15:22:31 -04:00
Justin Hynes
a631a05a26 fix: update name of topic used to publish CERTIFICATE_CREATED events
[APER-2347]

This PR updates the name of the topic we are publishing our `CERTIFICATE_CREATED` events to. We had put a very generic name when writing the publishing code (and this was way before the actual topic was created). Now that the Confluent configuration is ready we need to update the name in our publishing code.
2023-06-06 17:57:30 +00:00
Zaman Afzal
009cb09b71 fix: call signal once entry is saved (#32378) 2023-06-06 22:45:28 +05:00
irfanuddinahmad
d77f1ed931 Merge pull request #32384 from openedx/iahmad/ENT-7229-3
chore: upgrade edx-enterprise
2023-06-06 22:05:41 +05:00
IrfanUddinAhmad
f01c47a757 chore: upgrade edx-enterprise 2023-06-06 21:44:11 +05:00
Graeme Glass
50c76087a4 chore: remove 2nd entry of the same xblock 2023-06-06 17:53:23 +02:00
Ben Warzeski
2df14a8718 feat: add public video url copy interface (#32293) 2023-06-06 10:09:48 -04:00
dependabot[bot]
ddf32206af build(deps): bump thollander/actions-comment-pull-request from 1 to 2 (#32141)
Bumps [thollander/actions-comment-pull-request](https://github.com/thollander/actions-comment-pull-request) from 1 to 2.
- [Release notes](https://github.com/thollander/actions-comment-pull-request/releases)
- [Commits](https://github.com/thollander/actions-comment-pull-request/compare/v1...v2)

---
updated-dependencies:
- dependency-name: thollander/actions-comment-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-06 12:27:51 +05:00
Leangseu Kim
005b6dd802 fix: embed video css 2023-06-05 11:45:43 -04:00
Jody Bailey
c7fc04968f feat: new endpoint for cross product and amplitude recommendations (#32297)
* feat: cross product recommendations endpoint enhancement for amplitude recommendations

* fix: general recommendations fix and linting fixes

* fix: query string parameter value check fix

* chore: updated positioning of docstring

* fix: Adjusted docstring for CPR serializer

* fix: Separated view, added new url, fallback recommendations fixes and more

* fix: removed dangerous default value argument

* chore: made necessary linting changes

* chore: updated doctring description

* fix: removed dangerous default argument

* chore: updated doctring for ProductRecommendationsView
2023-06-05 16:31:11 +02:00
Kyle McCormick
585b96583a build: remove prefixes from XModule resource copies (#32287)
The `xmodule_assets` command copies SCSS files from
xmodule/css to common/static/xmodule/{modules|descriptors}/scss.
It renames the files to the format:

     _{INDEX}-{HASH}.scss

where an XModule's first SCSS resource will have INDEX==0,
the next will have INDEX==1, ...and that's it because no
XModule has more than two SCSS resources.
The output looks like this:

    common/static/xmodule/descriptors/scss:
      _000-808fcbb4c5109c5156ae3c0c9729c8be.scss
      ...
      _001-a10fc3e0fd6aca63426a89e75fe69c31.scss
    common/static/xmodule/modules/scss:
      _000-1ad2f05db822d3176affd203d70319c0.scss
	  ...
      _001-482ebc752ab6e41946651ceb0f3e7f55.scss

These indexes serve no purpose. Reading the comments
and git-blame in xmodule/static_content.py, one can glean
that the indexes might have been intended to enforce
dependency relationships between the assets, but
this is unnecessary, because the ordering of the copied
SCSS is *already preserved* by the order which they're
included into the `{BLOCK_NAME}{Studio|Preivew}.{HASH}.scss`
SCSS entrypoint files. I have to assume that this is an
unnecessary relic from the time when the XModule system
was more heavily utilized, rather than just a legacy corner
of the XBlock framework as it is today.
So, we remove the indexes, which lets us simplify the logic
of xmodule/static_content.py. This is a minor refactoring, but it'll
make it easier for the next steps on our way to deleting
xmodule/static_content.py entirely. The new output looks like this:

    common/static/xmodule/descriptors/scss:
      _808fcbb4c5109c5156ae3c0c9729c8be.scss
	  ...
      _d41921b4c5d45188759ef3d04fd9a78a.scss
    common/static/xmodule/modules/scss:
      _1ad2f05db822d3176affd203d70319c0.scss
	  ...
      _b80300e1a5f290f6a850e35874068427.scss

Part of: https://github.com/openedx/edx-platform/issues/32292
2023-06-05 09:10:58 -04:00
Nawfal Ahmed
c6934dda8c PON-241: Copy changes on Program details page (#32352)
* feat: update subscription info text in various states

* feat: update subscription trial ending alert
2023-06-05 17:46:11 +05:00
Awais Qureshi
249aabbc4f feat!: upgrading django-storages. (#32350)
* feat!: upgrading django-storages
2023-06-05 14:55:19 +05:00
Muhammad Adeel Tajamul
3832eda78d fix: change response of course enrollment api for notifications 2023-06-05 14:29:07 +05:00
Awais Qureshi
26b0977067 chore: adding temp pin. (#32360) 2023-06-05 13:52:39 +05:00
Hamza Shafique
9f7cc4a8be fix: Remove extra </div> tag from calculators's HTML (#32276)
Co-authored-by: hamza shafique <hamza.shafique1@arbisoft.com>
2023-06-05 12:19:39 +05:00
Jenkins
8326c19431 chore(i18n): update translations 2023-06-04 17:04:19 -04:00
irfanuddinahmad
af78700e53 Merge pull request #32358 from openedx/iahmad/ENT-7229-2
chore: upgrade edx-enterprise
2023-06-03 20:43:19 +05:00
IrfanUddinAhmad
62be50ca95 chore: upgrade edx-enterprise 2023-06-03 20:23:12 +05:00
Feanil Patel
f7a3faa3e0 docs: Update the issue tracker section of the README. (#32354)
* docs: Update the issue tracker section of the README.

Fixes https://github.com/openedx/edx-platform/issues/32235

Ideally, we'd update the whole readme to better match the new
maintainers standards and we should still do that but for now we'll just
update this egregiously incorrect section quickly.

Co-authored-by: Robert Raposa <rraposa@edx.org>
2023-06-02 13:16:52 -04:00
dependabot[bot]
9249ea9f0c build(deps): bump actions/setup-python from 2 to 4 (#32136)
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-02 18:57:19 +05:00
dependabot[bot]
b054e0d20d build(deps): bump actions/cache from 2 to 3 (#32138)
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-02 18:56:40 +05:00
github-actions[bot]
e2a54e0524 feat: Upgrade Python dependency edx-django-utils (#32345)
feat: update edx-django-utils for new cookie middlewre
2023-06-01 15:12:26 -04:00
Braden MacDonald
b70252db94 fix: Update text of new clipboard menu, hide it in libraries (#32339)
* fix: Use clearer name for the new "Copy" action ("Copy to Clipboard")

* fix: Don't show the new copy menu in content libraries (not yet supported)
2023-06-01 11:36:53 -07:00
edX requirements bot
25139a08bd chore: Updating Python Requirements (#32321) 2023-06-01 20:20:49 +05:00
Kristin Aoki
7816a41b51 fix: conditional rendering of course team link (#32336) 2023-06-01 10:24:02 -04:00
Jenkins
072df9a18b chore(i18n): update translations 2023-06-01 09:59:22 -04:00