Commit Graph

7201 Commits

Author SHA1 Message Date
Edward Zarecor
03f00d535e Merge branch 'master' into fix-FB-share 2023-09-07 16:09:14 -04:00
Artur Gaspar
7da99848a7 fix: edxnotes visibility in courseware and courseware API (#33096)
This retrieves user preferences for edxnotes visibility by:
1. Adding a `bind_course_for_student` method to course overview model.
2. Using a bound XBlock in the `toggle_notes.html` template.

The previously used unbound course instance was returning a default value.
2023-09-07 17:59:51 +02:00
Dmytro
d74a6aed2a fix: for the wiki page translation (#33049) 2023-09-05 18:28:06 +05:00
Paulo Viadanna
26d8c2166d feat: implements SHOW_REGISTRATION_LINKS feature toggle
(cherry picked from commit 3025ab5fe6f6f53d6af5b36681355efafa37c74b)
2023-09-01 15:06:40 +02:00
Irtaza Akram
0c46334636 fix: ugetext and ngettext deprecation warnings (#33097) 2023-08-25 14:58:53 +05:00
Braden MacDonald
f491f5bde8 fix: refactor MakoService to allow specifying template more explicitly (Take 2) (#33077)
* fix: refactor MakoService to allow specifying namespace per template (#33061)

* fix: instr. dashboard broken by bulk email reusing HtmlBlock studio_view

* fix: lint issue from unused import
2023-08-23 11:48:06 -07:00
bszabo
68e9a03708 Revert "fix: refactor MakoService to allow specifying namespace per template (#33061)" (#33070)
This reverts commit d60cdc2305.
2023-08-21 16:32:58 -04:00
Braden MacDonald
d60cdc2305 fix: refactor MakoService to allow specifying namespace per template (#33061) 2023-08-21 10:05:38 -07:00
Usama Sadiq
2dba053022 fix: fix django.utils.translations warnings (#33040)
* fix: fix ugetext and ngettext deprecation warnings
* fix: fix deprecation warnings from html templates
2023-08-18 11:34:56 +05:00
Usama Sadiq
59782fa625 fix: fix is_safe_url and urlquote warnings (#33041)
* fix: fix is_safe_url and urlquote warnings
* fix: replace urlquote with quote
2023-08-17 16:59:23 +05:00
Usama Sadiq
852246db8c fix: replace ugettext with gettext (#33022) 2023-08-16 17:07:23 +05:00
Mohamed Akram
43b22557bb feat: allow disabling default beta tester enrollment notifications
The "Notify users by email" checkbox checks the value of the 
`BATCH_ENROLLMENT_NOTIFY_USERS_DEFAULT` configuration to match the user 
experience with other checkboxes on the Membership page.
2023-08-14 18:25:28 +02:00
Agrendalath
e746986820 feat: create Course Limited Staff role
This is an experimental approach to introduce a role which has all Course Staff
permissions, except for the Studio access.

Co-authored-by: 0x29a <demid@opencraft.com>
2023-07-21 15:09:41 +02:00
Yagnesh1998
03b189fc7c feat: Remove FOOTER_ORGANIZATION_IMAGE django settings depr52 (#32757)
* feat: Remove FOOTER_ORGANIZATION_IMAGE django settings depr52

* feat: Update api.py

* feat: Update api.py

* feat: Update footer.html

* feat: change in logo images path

* feat: Update footer.html

as per Diana's suggestion white space is removed.
2023-07-19 10:54:29 -04:00
Kyle McCormick
4aedeb8988 refactor: remove XModule JS from Django Pipeline (#32530)
`module-js` and `module-descriptor-js` are old JavaScript group
indicators, left over from when we managed XModule assets via Django
Pipeline. We would like to get rid of them in order to make it easier to
build XModule JS without using Python.

There is one single usage of `module-js` in the entire platform (the
rest have been replaced with Webpack references, which is the
less-outdated way of managing XModule assets :). The lone `module-js`
reference was added in 2013 [1] so that circuit diagrams would display
in the course wiki. However, the ability to render circuits in the wiki
was removed in 2015 [2], so it is safe to remove the reference.

There is also one single usage of `module-descriptor-js`. It's in the
legacy bulk email editor, which hackily cribs from the old HtmlBlock
editor. Fortunately, we are able to simply replace the Django Pipeline
reference with the equivalent XModule JS Webpack bundle. (Note: The old
email editor is currently still supported, but is currently being
replaced by frontend-app-communications, so this hack will be gone
eventually).

Finally, this commit also sneaks in one styling fix: it adds the
HtmlBlockEditor CSS back to the aforementioned legacy bulk email page.
The missing CSS was causing a read-only 1-line codemirror editor to
appear below the HTML editor [3]. This bug was introduced during the
original XModule SCSS decoupling [4], which removed builtin block CSS
from the LMS-wide bundle, thus removing the HTML editor CSS from the
bulk email page. We imagine that nobody noticed because the bug only
exists in master (not Palm) and frontend-app-communications seems to be
globally enabled on edx.org. As a simple fix, we add the new CSS link to
the legacy bulk email page, and it renders fine again [5].

References:

1. 3fc59b3da5
2. https://github.com/openedx/edx-platform/pull/10324
3. Before fix: https://github.com/openedx/edx-platform/assets/3628148/25fc41b2-403d-4339-8c49-0b04664dfa02
4. https://github.com/openedx/edx-platform/pull/32018
5. After fix: https://github.com/openedx/edx-platform/assets/3628148/9a5d74f1-cc83-4ebe-8f0c-ee270f7721b8

Part of: https://github.com/openedx/edx-platform/issues/32481
2023-07-18 09:32:12 -04:00
Nawfal Ahmed
8cd0cb0d07 feat: get subscription upsell values from env (#32770) 2023-07-18 17:43:39 +05:00
Mubbshar Anwar
2e2687ad38 revert: Removing the save_far_later (#32710)
Removing the save_for_later app after analysing the experiment results. We are not going to make this feature permanent.

VAN-1451
2023-07-18 15:35:27 +05:00
Braden MacDonald
9b9b88df52 chore: remove some usages of six (Python2 compat) (#32554)
* get rid of six.text_type(s)
* get rid of six.b()
* get rid of six.string_types
* get rid of six.PY2/six.PY3
* get rid of six.iteritems() and six.viewvalues()
2023-07-17 12:18:43 -07:00
Nawfal Ahmed
5c0dddd9bd fix: fix padding for mobile users in program dashboard (#32711) 2023-07-11 19:54:33 +05:00
Nawfal Ahmed
84f4d2fb6f fix: ui fixes for subscription programs (#32693)
* fix: hide title for mobile users in program dashboard

* fix: fix subscription trial remaining days logic
2023-07-11 14:17:29 +05:00
Dmytro
bb4beab5eb fix: Incorrect symbols on wiki create article page (#32628)
The message was being double-escaped by React with the
StatusAlertRenderer. This fixes the problem by removing the
first layer of HTML-escaping so it is only escaped once.
2023-07-10 17:25:06 -04:00
Edward Zarecor
a436c04b3e Merge branch 'master' into fix-FB-share 2023-06-28 16:35:43 +02:00
Nawfal Ahmed
80d151b404 feat: add marketing url to subscription upsell (#32560) 2023-06-23 12:54:15 +00:00
Zachary Hancock
41c27e8cbd Add exams dashboard MFE to instructor dash (#32493)
* feat: use new exams mfe for lti enabled courses
2023-06-20 10:21:43 -04:00
Nawfal Ahmed
0aa92af0b2 fix: fix edge-case for completed courses in a subscription program (#32476) 2023-06-15 17:25:02 +05:00
Nawfal Ahmed
ee7213427c fix: fix alert icon unexpected behaviour (#32455) 2023-06-14 18:48:20 +05:00
Nawfal Ahmed
5204ee6981 feat: handle edge cases for purchased courses in a subscription program (#32438) 2023-06-14 16:28:49 +05:00
Edward Zarecor
65f317de7e Merge branch 'master' into fix-FB-share 2023-06-09 10:33:48 -04:00
Ben Warzeski
2df14a8718 feat: add public video url copy interface (#32293) 2023-06-06 10:09:48 -04:00
Leangseu Kim
005b6dd802 fix: embed video css 2023-06-05 11:45:43 -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
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
Leangseu Kim
1b50e80437 chore: add go to course button for student already enrolled in the courses
chore: linting

chore: update requested change
2023-05-30 09:45:50 -04:00
Juliana Kang
c67408b9c5 fix: Modify nextPaymentDate in program details subscriptions (#32310)
PON-247
2023-05-26 10:50:39 -04:00
Nawfal Ahmed
2d9c528827 fix: fix subscription prices and program dashboard max-width (#32278) 2023-05-23 16:17:28 +05:00
Leangseu Kim
ee3a854d14 chore: update og:url for video sharing 2023-05-18 10:41:30 -04:00
Leangseu Kim
f5e5406da8 feat: add header_meta to base template 2023-05-17 10:17:12 -04:00
Nawfal Ahmed
30a66120fd fix: correctly mark program dashboard and details translations string (#32242) 2023-05-16 12:02:54 +00:00
Nawfal Ahmed
7174da78d0 feat: subscription changes and alerts for program dashboard and details (#32217)
* feat: subscription changes on program dashboard and details (#31909)

  - add a h2 programs heading on program dashboard
  - subscription ui changes on program dashboard
  - subscription alerts on both pages

* feat: add subscription upsell, fix responsive layout of program dashboard (#31943)

* test: update tests for subscription changes on program dashboard (#32021)

* feat: subscription api changes on program dashboard (#32085)

* feat: add subscription segment events to program details and dashboard (#32164)

* feat: subscription changes on program dashboard and details pages (#32205)
2023-05-16 10:34:42 +00:00
Nawfal Ahmed
a5987e73d0 feat: subscription changes for program details page (#32060)
* feat: subscription ui changes on program detail page (#31846)
* test: update tests for subscription changes on program details (#32020)
* feat: subscription api changes on program details (#32059)
2023-05-08 20:19:25 +05:00
Braden MacDonald
4b72194b98 feat: Show a preview of what's in the user's clipboard (#32132)
This also fixes Studio container view 404.
2023-05-05 17:35:03 +02:00
Nathan Sprenkle
6307961ff6 fix: video share link fixes (#32187)
* fix: remove outdated click handler in social share

* fix: reestablish blank target of social share link

* test: update js tests
2023-05-04 16:29:47 -04:00
jansenk
4de07c25d0 refactor: video sharing js
test: add testing for VideoSocialSharingHandler

test: fix context tests

refactor: move most link logic to django

chore: update python test

chore: update linting
2023-05-04 09:33:16 -04:00
Braden MacDonald
8ee1f66ffb feat: Paste Components (OLX) into any Unit in Studio (#31969)
* feat: Implement paste button

* chore: improve docs and add tests for python API

* fix: drive-by fix to use a better API for comparing XML

* feat: track which XBlock something was copied from

* feat: add tests

* feat: enable import linter so content_staging's public API is respected

* fix: error seen when trying to paste drag-and-drop-v2 blocks

* fix: use strip_text=True consistently for XML comparisons

* refactor: rename get_user_clipboard_status to get_user_clipboard

* feat: Better error reporting when pasting in Studio

* chore: convert new test suite to pytest assertions

* refactor: push READY status check into the API per review suggestion

* fix: use strip_text=True consistently for XML comparisons

* fix: store "copied_from_block" as a string to avoid Reference field issues

* fix: minor lint error

* refactor: move data types to data.py per OEP-49
2023-04-27 09:58:04 -07:00
Edward Zarecor
c0059c8247 Merge branch 'master' into fix-FB-share 2023-04-24 22:27:59 -04:00
Nathan Sprenkle
df6a60b0e0 feat: video share icons (#32111)
* feat: replace video share links with icons

* feat: add download / share icons to video block

* feat: consistent styling for transcript links

* feat: change order of download/share for videos
2023-04-24 10:04:03 -04:00
Leangseu Kim
96f1c93779 feat: add videos meta tags 2023-04-21 10:07:03 -04:00
Jade Olivier
5142a21016 Merge branch 'master' into jade-REV-3505-prog-details-brk-pnts 2023-04-20 09:57:39 +02:00
Brian Mesick
b2b78f3ca8 Merge pull request #32032 from raccoongang/sagirov/tCRIL_GA-18
[FC-0014] Add GA 4 support to edX platform
2023-04-18 10:02:49 -04:00
Jade Olivier
75c523f39f feat: Updated program details breakpoints 2023-04-18 08:40:42 +02:00