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

20953 Commits

Author SHA1 Message Date
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
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
danialmalik
164c165e1a Merge all configs of devstack_docker.py into devstack.py 2020-04-10 11:36:17 +05: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
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
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
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
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
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
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
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
Waheed Ahmed
3dc3e10819 Revert "Adds retry logic for software secure." 2020-04-07 20:40:06 +05: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
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
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
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
Diana Huang
5d830de88d Merge pull request #23605 from edx/diana/remove-course-id-modes 
Remove `course_id` field from CourseMode.
 2020-04-06 13:00:47 -04:00
Awais Qureshi
95ca67ee48 Merge pull request #23626 from edx/BOM-1493 
BOM-1493
 2020-04-06 21:08:22 +05:00
Awais Jibran
f592f133c5 remove update_from_database from views. 2020-04-06 21:00:53 +05:00
Soban Javed
0ff96e7e25 fixed failures of test due to ordering issue in dict 2020-04-06 20:49:00 +05:00
Diana Huang
99863aebff Remove course_id field from CourseMode. 
Handle this change appropriately in CourseModeFactory.
 2020-04-06 11:21:28 -04:00
Thomas Tracy
09d814f7fd Add link to coaching interstitial for MB students who have not signed up for coaching (#23492) 2020-04-06 10:35:45 -04:00
Feanil Patel
7a52a25132 Fix tests that were creating Enrollments via a course_id. 
We now either pass in the relevant courseoverview or when creating the
enrollement we use the factory which automatically creates the relevant
CourseOverview object for testing purposes.
 2020-04-06 09:37:36 -04:00
Feanil Patel
cf976abea0 Update how dashboard represents entitlements. 
Pass in a CourseOverview object instead of expecting that passing id will work as expected.
 2020-04-06 09:37:36 -04:00
Muhammad Soban Javed
b3d68484eb Merge pull request #23606 from edx/BOM-1473 
BOM-1473: Skip tests, failing in django2.1 because app is deprecated
 2020-04-06 18:08:47 +05:00
irfanuddinahmad
efb4cd944c Merge pull request #23532 from edx/iahmad/ENT-2725-Implicit-Enterprise-Selection-When-Enrolling-With-Url 
ENT-2725 added support for enrolment urls in multiple enterprise case
 2020-04-06 18:00:47 +05:00