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
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
Farhanah Sheets
e373476430 Merge pull request #23649 from edx/revert-23514-aj/ss-retry-logic 
Revert "Adds retry logic for software secure."
 2020-04-07 12:05:10 -04:00
Feanil Patel
4a7101755c Merge pull request #23454 from edx/feanil/bokchoy_decision 
Add a draft decision related to bokchoy experiment.
 2020-04-07 11:55:07 -04:00
Waheed Ahmed
3dc3e10819 Revert "Adds retry logic for software secure." 2020-04-07 20:40:06 +05:00
Farhanah Sheets
ccdc2bd5d6 Merge pull request #23648 from edx/revert-23642-aj/remove-todo 
Revert "Remove todo"
 2020-04-07 11:39:44 -04:00
Waheed Ahmed
21105898da Revert "Remove todo" 2020-04-07 20:36:39 +05:00
Michael Terry
7a71356cd2 Cut off long course welcome messages 
If a course welcome message is very long, cut it off with an
ellipsis and show a Show More button to reveal the full thing.

AA-46
 2020-04-07 10:49:40 -04:00
Awais Jibran
f1421a62d0 Merge pull request #23618 from edx/aj/problem-grade-report 
ProblemGradeReport OOM - Case1&2
 2020-04-07 19:06:30 +05:00
Tim McCormack
5bbcb273ae Fix typo in read replica DB name for CMS (#23641) 
(LMS side was already fixed.)
 2020-04-07 13:43:22 +00:00
irfanuddinahmad
85f394bad9 Merge pull request #23647 from edx/iahmad/ENT-2612 
ENT-2612 Fix issue with enterprise selection page redirect
 2020-04-07 18:23:44 +05:00
Awais Jibran
ac49d4fd99 Pass course structure to CourseGradeFactory.iter 2020-04-07 18:02:15 +05:00
irfanuddinahmad
5301be1b29 ENT-2612 Fix issue with enterprise selection page redirect 2020-04-07 17:44:10 +05:00
Muhammad Soban Javed
fefb940744 Merge pull request #23634 from edx/BOM-1495 
BOM-1495: Django 2.0: fails on comparing nested lists.
 2020-04-07 16:41:10 +05:00
Awais Jibran
847f1ff124 Merge pull request #23642 from edx/aj/remove-todo 
Remove todo
 2020-04-07 13:00:54 +05:00
Hasnain Naveed
332a8329dc Merge pull request #23595 from edx/hasnain-naveed/ENT-2675 
ENT-2675 | Added permission for staff user to change the student's en…
 2020-04-07 12:46:08 +05:00
Awais Jibran
262b7f7bdc Remove todo 2020-04-07 11:03:17 +05:00
Awais Jibran
4b22554411 Merge pull request #23514 from edx/aj/ss-retry-logic 
Adds retry logic for software secure.
 2020-04-07 10:59:57 +05:00
Jeremy Bowman
3309078242 Prepare for django-oauth-toolkit 1.3.2 upgrade (#23637) 
Prepare to upgrade to django-oauth-toolkit (module name oauth2_provider) 1.3.2 concurrently with the Django 2.2 upgrade (versions after 1.1.3 dropped support for Django 1.11). Key points:

* We can stop using a commit hash since versions 1.3.0 through 1.3.2 have been released since that commit.
* The validator in oauth_dispatch migration 0002 has been removed from DOT, but the whole table was removed in migration 0004 anyway. Newer DOT versions moved where redirect URI validation happens so it's no longer needed here.
* DOT 1.3.0 squashed its original 6 migrations and immediately deleted them. This required some changes in oauth_dispatch migrations 0006 and 0007 to deal with either numbering system.

When deploying to stage and production, we'll need to delete the history for oauth2_provider migrations 0002-0006 first (the new squashed 0001 migration has the same name as the original 0001). The deployment with DOT 1.3.2 will add a new 0002 migration which should then apply cleanly on the existing database state.

Should resolve https://openedx.atlassian.net/browse/BOM-1456 .
 2020-04-06 19:10:19 -04:00
Jeremy Bowman
c4352a0a78 Fix invalid POST in test_module_render.py (#23639) 
This looks like the last failing unit test under Django 2.2. One of a series of such failures resulting from Django no longer accepting None as POST data (since you can't really get it from a real request), most of which were already fixed by the Arbisoft team in the last few days.
 2020-04-06 17:18:36 -04:00
Awais Qureshi
c664852627 Merge pull request #23623 from edx/awais786/BOM-1492 
Django2 shopping_cart: temporary test fix
 2020-04-07 00:20:32 +05:00
Feanil Patel
4084897180 Merge pull request #23636 from edx/feanil/old_use_of_course_id 
Got the template that is used with tests but not this one.
 2020-04-06 14:48:16 -04:00
Brian Mesick
129788606b Merge pull request #23407 from edx/bmedx/rename_start_end_courseoverview_2 
Add writes to new field & data migration for backfiling data
 2020-04-06 14:45:15 -04:00
AsadAzam
255dc26231 Merge pull request #23630 from edx/asad/prod-1394-logs 
Added temporary logs
 2020-04-06 23:32:41 +05:00
Feanil Patel
f61b2e44eb Got the template that is used with tests but not this one. 
This dashboard template is only used for edx.org so we didn't catch this
in testing.  Updating it to use 'course' instead of 'course_id' to
instantiate a CourseEnrollment object.  Using 'course_id' is the old
way.
 2020-04-06 14:25:58 -04:00
hunytalk
42503dd736 Add writes to new field 2020-04-06 14:13:20 -04:00
Feanil Patel
6b276e6742 Merge pull request #23633 from edx/feanil/bom-1455-preserve-last-name-limit 
Limit the last_name field to 30 chars.
 2020-04-06 13:41:28 -04:00
David Joy
90ec0c17a8 Merge pull request #23585 from edx/djoy/course_metadata_access_check 
fix: Improving access check in CoursewareInformation view
 2020-04-06 13:05:39 -04:00