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

20971 Commits

Author SHA1 Message Date
SaadYousaf
db95b28b85 handle DeprecationWarning for usage_key.course_key for logs cleanup. 2020-04-15 15:16:58 +05:00
Simon Chen
fe1ef21bcd MST-187 return course staff role data for ProgramCourseEnrollment get API 2020-04-14 13:47:12 -04:00
Calen Pennington
c041959a11 Merge pull request #23703 from cpennington/faster-dates-page 
Use the course_blocks api to fetch data for date blocks
 2020-04-14 11:35:13 -04:00
Robert Raposa
e56eacebd3 ARCHBOM-1105: fix migration issues (#23708) 
* fix direct assignment error
* fix byte string error

ARCHBOM-1105

Co-authored-by: Awais Qureshi <awais.qureshi@arbisoft.com>
 2020-04-14 10:53:26 -04:00
Adam Butterworth
02a7022571 Reenable Learning Sequence MFE redirect tests (#23691) 
* Reenable Learning Sequence MFE redirect tests

TNL-7157 These tests may were the cause of intermittent test failures a couple weeks ago. Here they are reenabled after changing the way ExperimentWaffleFlag is overridden.

* Update is_experiment_on and add ExperimentWaffleFlag override test

* Update test_flags.py

* Add docstring about overrides

* prefer is_experiment_on over _is_enabled
 2020-04-14 10:25:38 -04:00
Calen Pennington
9be7341b20 Use the course_blocks api to fetch data for date blocks 2020-04-14 10:08:19 -04:00
Adam Butterworth
d066b43851 prefer is_experiment_on over _is_enabled 2020-04-14 09:33:15 -04:00
Adam Butterworth
b767d29561 Add docstring about overrides 2020-04-13 16:53:01 -04:00
Adam Butterworth
e9e1715bd0 Update test_flags.py 2020-04-13 16:42:18 -04:00
Adam Butterworth
2459382fe3 Update is_experiment_on and add ExperimentWaffleFlag override test 2020-04-13 16:39:46 -04:00
Adam Butterworth
f5f6fc49ba Reenable Learning Sequence MFE redirect tests 
TNL-7157 These tests may were the cause of intermittent test failures a couple weeks ago. Here they are reenabled after changing the way ExperimentWaffleFlag is overridden.
 2020-04-13 14:22:20 -04:00
Zachary Hancock
f0d7ff9025 Write course_staff role on enrollment (#23677) 2020-04-13 14:13:24 -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
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
edX Transifex Bot
20fe068a01 fix(i18n): update translations 2020-04-12 17:27:12 -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
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