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

54061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahtisham Shahid
cb59896add Fixed xss linter issue 
fixed style issue

fixed js test

fixed quality issue

Fixed linter and style

fixed quality issue
 2020-04-17 15:57:47 +05:00
Simon Chen
fe1ef21bcd MST-187 return course staff role data for ProgramCourseEnrollment get API 2020-04-14 13:47:12 -04:00
Awais Qureshi
4fa970f962 Merge pull request #23704 from edx/awais786/BOM-1515 
BOM-1515
 2020-04-14 21:31:11 +05:00
Nick
ca3012c07b Merge pull request #23707 from edx/ndalfonso/AA-83-special-exam-icon 
AA-83 special exam icon
 2020-04-14 11:56:35 -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
Nicholas D'Alfonso
9e41268322 AA-83 special exam icon 
- fix template rendering so that pencil icon is displayed for
  a special exam and also ensure it is not rendered twice
 2020-04-14 11:08:44 -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
Awais Qureshi
aefafab449 BOM-1515 
Update passing agrs.
verify the error msgs
 2020-04-14 19:52:02 +05: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
AsadAzam
96128cba0a Merge pull request #23713 from edx/asad/prod-1394 
Deactivate account 403 error log
 2020-04-14 19:23:33 +05: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
asadazam93
ee0bcd36ec Deactivate account 403 error log 2020-04-14 17:44:12 +05:00
Hammad Ahmad Waqas
3c1405369e Merge pull request #23699 from edx/hammad/ENT-2724 
ENT-2724 | removed get_cache_key and using it from edx-django-utils.
 2020-04-14 12:10:01 +05: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
Hasnain Naveed
add68c440a Merge pull request #23674 from edx/hasnain-naveed/ENT-2735 
ENT-2735 | Added the discounted payment message on track selection fo…
 2020-04-13 19:02:31 +05:00
Robert Raposa
c3782317ed Merge pull request #23696 from edx/robrap/ARCHBOM-1105-fix-migrations 
add AppConfig for catalog
 2020-04-13 09:55:31 -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
Feanil Patel
a0fb27979e Merge pull request #23692 from edx/jmbowman/ARCHBOM-1103 
Upgrade to Django 2.2
 2020-04-13 09:23:53 -04:00
edX cache uploader bot
dd0a4b6230 Updating Bokchoy testing database cache (#23695) 2020-04-13 07:45:12 -04:00
Awais Jibran
c9d44f7a19 Merge pull request #23656 from edx/aj/ss-retry-logic-2 
Adds retry logic for software secure
 2020-04-13 14:42:14 +05: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
hasnain.naveed
0d85a4ef14 Feedback. 2020-04-13 13:51:59 +05:00
HammadAhmadWaqas
b4ebe11a6b removed get_cache_key and using it from edx-django-utils. 2020-04-13 12:51:39 +05:00
edX Transifex Bot
20fe068a01 fix(i18n): update translations 2020-04-12 17:27:12 -04:00
Jeremy Bowman
0b44434da2 Use correct Django requirements file for xdist workers 2020-04-12 15:50:29 -04:00
Robert Raposa
211dcee217 add AppConfig for catalog 
ARCHBOM-1105
 2020-04-11 15:27:31 -04:00
Jeff Chaves
780ad4ed3e bumping enterprise version to 3.0.14 (#23694) 2020-04-10 18:03:21 -04:00
Jeff LaJoie
9b778371be Merge pull request #23690 from edx/jlajoie/AA-110 
Adds in New Relic tracing to Dates view on course_id, user_id, and is_staff
 2020-04-10 15:41:49 -04:00
Jeremy Bowman
1c91e8a15a Upgrade to Django 2.2 2020-04-10 15:25:49 -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
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
hasnain.naveed
4cff92b0ad ENT-2735 | Added the payment message on track selection for learners in subsidy offer. 2020-04-10 16:07:49 +05: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