Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,022 Commits 1 Branch 0 Tags
468e19262adef8482eb449f13b19212553ca4a5c
Commit Graph

54022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brandon Baker
aed6256830 Update edx-enterprise to 3.0.9 (#23668) 
This update pulls in transitioning various contains content calls to
use the new enterprise catalog service behind a waffle flag.

ENT-2575
 2020-04-09 08:19:01 -04:00
Zia Fazal
f2f8d8519a Merge pull request #23658 from edx/ziafazal/ENT-2709 
ENT-2709:Map first name to edx username by default oauth SSO
 2020-04-09 09:56:56 +05:00
Zia Fazal
9a9683fc21 Merge pull request #23659 from edx/ziafazal/ENT-2759 
Added global staff permission to third party auth users API
 2020-04-09 09:56:16 +05:00
Aarif
20e02dd48f Merge pull request #23620 from edx/BOM-1356 
Fixed warnings for wrong-import-order -- BOM-1356
 2020-04-09 00:48:26 +05:00
Aarif
6ee2089077 fixed warnings for wrong-import-order 2020-04-08 23:43:06 +05:00
Jansen Kantor
e8d4f93635 eamMembershipListView POST should return 404 when user tries to join team they do not have access to (#23654) 2020-04-08 11:22:52 -04:00
Jansen Kantor
261a7cbbfc TeamMembershipDetailView should return 404 when user tries to join team they do not have access to (#23653) 2020-04-08 11:22:21 -04:00
Dillon Dumesnil
b77922b544 Merge pull request #23663 from edx/ddumesnil/welcome-message-fix 
Shorten Welcome Message fix
 2020-04-08 08:13:06 -07:00
adeelehsan
d0c496738d Merge pull request #23596 from edx/aehsan/1418/refund_message_updated 
Refund text updated.
 2020-04-08 19:50:10 +05:00
Dillon Dumesnil
1bbfe2d583 Shorten Welcome Message fix 
We want to ignore certain tags when they show up in the HTML.
This now ignores script tags and link tags (for stylesheets)
 2020-04-08 07:46:46 -07:00
zia.fazal@arbisoft.com
cd60f6c973 Map first name to edx username by default oauth SSO 
Change to map first name to edx username by default oauth SSO with `identityserver3` backend
ENT-2709

Addressed reviewer's feedback
 2020-04-08 19:26:24 +05:00
adeelehsan
02d24fdb63 Refund text updated. 
PROD-1418
 2020-04-08 19:12:54 +05:00
Syed Muhammad Dawoud Sheraz Ali
78aec0513d update edxval (#23662) 2020-04-08 17:47:37 +05:00
edX requirements bot
1e28719c41 Updating Python Requirements (#23661) 2020-04-08 12:22:19 +00:00
Zaman Afzal
c7e2f8d49a ENT-2651 Recovery email Field UX logic on Account Settings page was not same to dashboard (#23565) 2020-04-08 16:21:37 +05:00
zia.fazal@arbisoft.com
b37a986656 Added global staff permission to third party auth users API 2020-04-08 14:53:32 +05:00
Ahtisham Shahid
34d126f9e5 changed verification email type to html 
changed verification email type to html

changed verification email type to html

changed verification email type to html
 2020-04-08 14:50:49 +05:00
Jansen Kantor
90885e4193 create team view teamset privacy fixes (#23607) 2020-04-07 22:04:23 -04:00
Jansen Kantor
1b2e10d96e add HasSpecificTeamAccess permission and change tests (#23608) 2020-04-07 21:21:14 -04:00
Jansen Kantor
480642e8c4 EDUCATOR-4995: text search returns private teamsets for anyone in bubble (#23586) 
* Manually exclude private_managed teams from text search results
 2020-04-07 21:13:42 -04:00
Jansen Kantor
6b9d4e49b3 EDUCATOR-4976 (Part 2): Tests for current behavior (#23567) 
* tests for current teams api view behavior
 2020-04-07 18:30:53 -04:00
Matt Drayer
2d82ac9e72 Merge pull request #23650 from edx/mattdrayer/ENT-2756 
Upgrade edx-enterprise to 3.0.7
 2020-04-07 13:36:42 -04:00
Matt Drayer
c469ac46d9 Upgrade edx-enterprise to 3.0.7 2020-04-07 13:06:53 -04:00
Michael Terry
76fdad7aae Merge pull request #23632 from edx/mikix/welcome-message 
Cut off long course welcome messages
 2020-04-07 12:06:37 -04:00