Commit Graph

66833 Commits

Author SHA1 Message Date
Feanil Patel
3b7facd565 fix: Add names to the error page urls.
Some of the static_template_view tests use names to get the URLs for the
error pages for testing, so I added names and updated the test to match
the new names.

I also updated the `test_404` function because we're no longer rendering
the 404 page in a different way from the 500 page so the response
includes the correct response code and content type.  This reduces the
number of differences between the 404 handler and the 500 handler.
2023-06-13 12:20:11 -04:00
Feanil Patel
0326b45d6a fix: Update how we render the error pages.
We were adding paths for the error pages in two places so one of them
simply wasn't being used. The lms urls.py also covered the 429 wich the
static_templates_view urls.py did not cover.  We don't need both and we
need the definition of the handlerNNN variables in urls.py to override
the default django error views so I'll leave just those.

I also made the `exception` parameter for the `render_404` function
optional by adding a default value.  We don't use the exception when
rendering the 404 page but the exception argument is a part of the
default method signature for the function that `render_404` replaces so
I didn't want to remove it and cause issues when django tries to call
this function.
2023-06-13 11:52:19 -04:00
Rômulo Penido
33e93a4c5e fix: styles issue for the "Upload a CSV file" field on the Instructor Dashboard (#32330)
Co-authored-by: o.bugaenko <oleksandr.buhaienko@raccoongang.com>
2023-06-13 10:43:49 -04:00
muhammad-ammar
2a24bf8c4f chore: add comment 2023-06-13 19:40:06 +05:00
Muhammad Bilal Tahir
45efafb07a Merge pull request #32435 from openedx/btahir/ENT-7260
feat: create user profile if not found in current job command
2023-06-13 17:36:27 +05:00
Muhammad Bilal Tahir
8693d5a4a6 feat: create user profile if not found in current job command 2023-06-13 17:07:17 +05:00
Jeremy Ristau
c7559f5697 Merge pull request #32273 from open-craft/field-data-refactor
Make Split Mongo's CachedDescriptorSystem load field-data service on demand
2023-06-13 08:05:49 -04:00
Awais Ansari
52a886d456 feat: filter notifications based on NOTIFICATIONS_EXPIRY (#32411)
* feat: add 2 months limit in notifications list API

* chore: add NOTIFICATIONS_MAX_DAYS in lms settings

* refactor: update NOTIFICATIONS_MAX_DAYS to NOTIFICATIONS_EXPIRY

* feat: add order_by reverse id in notificationslist API
2023-06-13 17:05:18 +05:00
Ahtisham Shahid
44d48f63ef refactor: removed notification app urls from cms (#32434) 2023-06-13 15:40:31 +05:00
Ahtisham Shahid
428849c8a2 fix: resolved spell issue in requirement file (#32433) 2023-06-13 14:47:45 +05:00
Muhammad Ammar
4e5cfaf295 Merge pull request #32389 from openedx/ammar/trigger-signals-to-import-course-details
feat: trigger signals to import and delete course details
2023-06-13 10:55:41 +05:00
John Nagro
b74138f2e6 feat: release edx-enterprise==3.66.8 (#32430) 2023-06-12 22:30:59 +00:00
Feanil Patel
fb7336dd24 Merge pull request #32428 from openedx/feanil/add_annotation
docs: Add an annotation for the ELASTICSEARCH_INDEX_PREFIX
2023-06-12 17:11:50 -04:00
Feanil Patel
9f0aeea6a6 docs: Add an annotation for the ELASTICSEARCH_INDEX_PREFIX
The feature was added to edx-search here: https://github.com/openedx/edx-search/pull/130#issuecomment-1586250567
2023-06-12 16:20:52 -04:00
Feanil Patel
c32514a453 test: Test both mysql 5.7 and 8 in one workflow.
Now that we're using standard service containers, we can use a matrix to
test both the current supported versions in one job.  This should also
make it easier to test with future versions as we get ready to upgrade.
2023-06-12 15:06:15 -04:00
Feanil Patel
640e35e731 test: Change how we test migrations.
Use the default settings file and the minimal.yml config to build the
migrations.
2023-06-12 15:06:15 -04:00
Feanil Patel
4338f55548 fix: Load the DATA_DIR via derived_settings tooling.
If we don't make the DATA_DIR a derived_setting, the only way to
override it is to override the entirety of the MODULESTORE config, or
override DATA_DIR in common.py in your fork.
2023-06-12 15:06:15 -04:00
Feanil Patel
74d1008102 fix: Be able to connect to SQL in containers from CMS
By default if you use `localhost` as the `HOST` value for mysql, it
tries to connect to a file socket on disk rather than trying to connect
to the loopback hostname.  This prevents us from running MySQL in a
container while running the LMS on your local machine.

Setting the host to `127.0.0.1` forces the SQL connection to go over TCP
instead. This allows you to map your container port to your localhost
without any issues.

We did this in lms/envs/common.py in an earlier change but did not
update cms/envs/common.py at that time.
2023-06-12 15:06:15 -04:00
Jenkins
435be23d2b chore(i18n): update translations 2023-06-12 11:41:13 -04:00
Ejaz Ahmad
563fe09a91 Merge pull request #32424 from openedx/eahmadjaved/enterprise-version-bump
chore: bumping enterprise package version to 3.66.6
2023-06-12 19:30:59 +05:00
Ejaz Ahmad
0ba2399f06 Merge pull request #32423 from openedx/jajjibhai008/upgrade-edx-enterprise-078bd91
feat: Upgrade Python dependency edx-enterprise
2023-06-12 19:05:07 +05:00
jajjibhai008
f5a41a0943 feat: Upgrade Python dependency edx-enterprise
Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`
2023-06-12 14:04:19 +00:00
jajjibhai008
078bd91372 chore: bumping enterprise package version to 3.66.6 2023-06-12 18:57:43 +05:00
muhammad-ammar
2ecd06a735 feat: trigger signals to import and delete course details from plugin 2023-06-12 18:31:57 +05:00
Nawfal Ahmed
6a5c1bbf44 feat: update subscription enrollment alert (#32414) 2023-06-12 13:07:43 +00:00
github-actions[bot]
2002dcb7bd feat: Upgrade Python dependency edxval (#32419)
Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`

Co-authored-by: awais786 <awais786@users.noreply.github.com>
2023-06-12 17:50:28 +05:00
Ejaz Ahmad
8d202a53b9 Merge pull request #32404 from openedx/eahmadjaved/ENT-4727
chore: add high_service_user scope in throttle config
2023-06-12 12:44:08 +05:00
Ejaz Ahmad
8f1faccba5 Merge branch 'master' into eahmadjaved/ENT-4727 2023-06-12 12:21:18 +05:00
ruzniaievdm
dea67f29c4 feat: Create DRF for course grading (#32399) 2023-06-09 10:52:30 -04:00
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
jajjibhai008
c9bea667e5 chore: add high_service_user scope in throttle config 2023-06-08 20:28:46 +05: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