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

54007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stvn
fb830eea88 Add audit access expiration message to courseware_api 
to display the banner in the Learner MFE.
 2020-04-13 18:01:50 -07: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
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