Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hasnain Naveed
add68c440a Merge pull request #23674 from edx/hasnain-naveed/ENT-2735 
ENT-2735 | Added the discounted payment message on track selection fo…
 2020-04-13 19:02:31 +05:00
Robert Raposa
c3782317ed Merge pull request #23696 from edx/robrap/ARCHBOM-1105-fix-migrations 
add AppConfig for catalog
 2020-04-13 09:55:31 -04:00
Kyle McCormick
70aeed3b74 Make photo encryption statement sound less gimmicky. 
Unlike the previous commit, this change is suggested by
me, not Learner Support.
 2020-04-13 09:49:40 -04:00
Kyle McCormick
510c892742 Reword photo verification instrutions 
* Clarify device requirements.
* Clarify that one's photo does not need to exactly
  match the photo on their ID.
* Clarify why we need the photo.
* Clarify that the ID need not be government issued.

Rewordings were suggested by Learner Support team.

EDUCATOR-5012
 2020-04-13 09:49:40 -04:00
Feanil Patel
a0fb27979e Merge pull request #23692 from edx/jmbowman/ARCHBOM-1103 
Upgrade to Django 2.2
 2020-04-13 09:23:53 -04:00
Ahtisham Shahid
4b02079f2c Fixed reference error in poll task 2020-04-13 17:22:35 +05:00
edX cache uploader bot
dd0a4b6230 Updating Bokchoy testing database cache (#23695) 2020-04-13 07:45:12 -04:00
Awais Jibran
c9d44f7a19 Merge pull request #23656 from edx/aj/ss-retry-logic-2 
Adds retry logic for software secure
 2020-04-13 14:42:14 +05:00
Awais Jibran
a2091d06ce Rebase and improve logging. 2020-04-13 14:14:11 +05:00
Awais Jibran
d3ada8a2ef Handle json serializable exception. 2020-04-13 14:14:11 +05:00
Awais Jibran
804fac9358 Adds retry logic for software secure 2020-04-13 14:14:11 +05:00
hasnain.naveed
0d85a4ef14 Feedback. 2020-04-13 13:51:59 +05:00
HammadAhmadWaqas
b4ebe11a6b removed get_cache_key and using it from edx-django-utils. 2020-04-13 12:51:39 +05:00
Jillian Vogel
285bbe849b Use DCS_* prefix for django-cookies-samesite settings 
to avoid conflicts with settings in Django>2.2
 2020-04-13 17:14:24 +09:30
Zachary Trabookis
7b3525278e Fix SameSite cookie issue for LTI Provider. EW-449 
There was an issue where external LMS system (e.g. Canvas, Blackboard) that used Open edX LTI Provider calls had cookies blocked. This update fixes this issue by defining third-party cookies to have attributes of `Secure=True` and `SameSite=None`.

Details here: https://discuss.openedx.org/t/lti-xblock-and-samesite/759/5

(cherry picked from commit 28479a2966b87b16a25dbc96c19b6f5817d255de)
 2020-04-13 17:14:15 +09:30
Jillian Vogel
bb85420e91 Adds django-cookies-sameseite middleware 
and settings to set SameSite=None for all secure cookies.
 2020-04-13 17:14:07 +09:30
edX Transifex Bot
20fe068a01 fix(i18n): update translations 2020-04-12 17:27:12 -04:00
Jeremy Bowman
0b44434da2 Use correct Django requirements file for xdist workers 2020-04-12 15:50:29 -04:00
Robert Raposa
211dcee217 add AppConfig for catalog 
ARCHBOM-1105
 2020-04-11 15:27:31 -04:00
Jeff Chaves
780ad4ed3e bumping enterprise version to 3.0.14 (#23694) 2020-04-10 18:03:21 -04:00
Jeff LaJoie
9b778371be Merge pull request #23690 from edx/jlajoie/AA-110 
Adds in New Relic tracing to Dates view on course_id, user_id, and is_staff
 2020-04-10 15:41:49 -04:00
Jeremy Bowman
1c91e8a15a Upgrade to Django 2.2 2020-04-10 15:25:49 -04:00
Jeff LaJoie
a7ac981cd4 Adds in New Relic tracing to Dates view on course_id, user_id, and is_staff 2020-04-10 15:06:10 -04:00
Adam Stankiewicz
468e19262a Merge pull request #23688 from edx/astankiewicz/upgrade-edx-enterprise 
bump edx-enterprise version to 3.0.13
 2020-04-10 12:57:51 -04:00
Adam Stankiewicz
36dd8b8029 bump edx-enterprise version to 3.0.13 2020-04-10 12:25:10 -04:00
Diana Huang
34ea9124c3 Merge pull request #23628 from danialmalik/danial/merge-devstack-docker-with-devstack 
Merge all configs of devstack_docker.py into devstack.py
 2020-04-10 11:30:35 -04:00
Ahtisham Shahid
9b75659b9a Merge pull request #23657 from edx/ahtisham/PROD-1424 
changed verification email type to html
 2020-04-10 18:50:07 +05:00
Feanil Patel
1b63f401b9 Merge pull request #23052 from edx/feanil/production_py_autoload 
Auto load any keys/values from the yaml config file.
 2020-04-10 09:34:37 -04:00
M Zulqarnain
39dcc8b180 BOM-1514 : Remove waffle switch PREVENT_AUTH_USER_WRITES (#23686) 
* Remove waffle switch PREVENT_AUTH_USER_WRITES
 2020-04-10 18:21:12 +05:00
edX cache uploader bot
33242bbc00 Updating Bokchoy testing database cache (#23675) 2020-04-10 09:19:16 -04:00
Waheed Ahmed
ec747e4c27 Fix some submission error message related bugs. 
During another bug investigation I figured there are some
issues related to showing error messages to learners upon
submission.

PROD-1431
 2020-04-10 17:01:56 +05:00
edX requirements bot
c611fac404 Updating Python Requirements (#23684) 2020-04-10 07:54:24 -04:00
hasnain.naveed
4cff92b0ad ENT-2735 | Added the payment message on track selection for learners in subsidy offer. 2020-04-10 16:07:49 +05:00
danialmalik
164c165e1a Merge all configs of devstack_docker.py into devstack.py 2020-04-10 11:36:17 +05:00
Tehreem Sadat
eef904bfef fix broken tests (#23680) 
Tests were failing due to the "404 Error" Response from an API that fetches specific asset (video transcript data) from YouTube.

I have changed it by using a mocked API response instead of direct API call to the Youtube server.
 2020-04-09 16:05:13 -04:00
M Zulqarnain
093bc8d2f3 Remove port range for liveserver test (#23672) 2020-04-10 00:59:34 +05:00
Feanil Patel
bf320f038b Find more vars that are partially updated. 2020-04-09 15:27:28 -04:00
Feanil Patel
75f663791e Account for dicts that don't get replaced wholesale. 
Right now we have a few settings that are not whoesale replaced but
piecemeal updated. So we remove them from the mass update.
 2020-04-09 15:27:28 -04:00
Feanil Patel
7c0c71ca69 Auto load any keys/values from the yaml config file. 
This should allow us to remove all the boilerplate code in this file
where a name is pulled from the config dict and put into the top level
namespace of the settings module.

We do this first so that any logic that adds more complex or dynamic
keys will still run and is safe.

Now that this is here we can start removing any simple boilerplate.
 2020-04-09 15:27:28 -04:00
Dave St.Germain
b6047709b3 Merge pull request #23614 from edx/dcs/notes-toggle 
Support learning MFE for notes toggle
 2020-04-09 14:46:00 -04:00
Jansen Kantor
a9beda2c20 404 if user does not have access to topic (#23638) 2020-04-09 14:13:12 -04:00
Dave St.Germain
543611fbb7 Added edxnotes information to the courseware API. 
Added notes visibility toggle support for courseware MFE.
Removed notes and calculator from chromeless view when rendered in courseware MFE.
 2020-04-09 13:59:01 -04:00
Nick
4afefdf38c Merge pull request #23666 from edx/ndalfonso/AA-97-mobile-reset-message 
AA-97 mobile reset message
 2020-04-09 13:31:14 -04:00
Jansen Kantor
933cb490f2 EDUCATOR-5001: Don't return private teamsets unless user has access to them (#23612) 
* hide 'hidden' teamsets from topic listing endpoint
 2020-04-09 13:30:05 -04:00
Jeff Chaves
534547c24f bumping edx-enterprise version to 3.0.10 (#23681) 2020-04-09 13:15:38 -04:00
Nicholas D'Alfonso
396050703e AA-97 mobile reset message 
- remove code for displaying banner in mobile dates fragment
- replace button with link to web app in reset dates banner on
  the mobile problem template
- adjust spacing of reset dates button in banner when button wraps
  on smaller screen
 2020-04-09 12:55:26 -04:00
Dillon Dumesnil
fa5a4c8adc Merge pull request #23676 from edx/ddumesnil/welcome-message-fix 
Exclude script and style tags content
 2020-04-09 09:31:07 -07:00
Dillon Dumesnil
dd6e7fd7ad Exclude script and style tags content 
Also removing the exclusion of link since links never have content
 2020-04-09 08:56:20 -07:00
Alan Zarembok
57347755df Merge pull request #23679 from edx/azarembok/skip-youtube-test 
Skip tests that are failing due to missing youtube content.
 2020-04-09 11:46:40 -04:00
Alan Zarembok
5371be1c60 Skip tests that are failing due to missing youtube content. 2020-04-09 11:05:10 -04:00