Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

53340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manjinder Singh
6f1be3ed2c BOM-933: Fix type mismatches in various migrations 6 (#22170) 
* Fix type mismatches in coursewaqre

* Fix type mismatch in credit migrations

* Fix type mismatch in status migrations

* Fix type mismatch in user_api migrations

* Review Fixes
 2019-10-29 10:36:10 -04:00
Nimisha Asthagiri
f533134db1 Merge pull request #22086 from edx/arch/user-authn-delete-deprecated 
User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION
 2019-10-29 09:37:53 -04:00
Nimisha Asthagiri
db42c7e1e2 User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION 2019-10-29 08:57:58 -04:00
Adeel Khan
e9708ca6e0 Fixing templates for double escaping. 
Some of the email templates are escaped
in such a way that could potentially cause
double escaping i.e via django default behaviour
and other via interpolate_html tag. Fixing it
by only applying escape via tag.

PROD-810
 2019-10-29 14:58:05 +05:00
Jeremy Bowman
6b16a1b9c1 Fix UnicodeEncodeError in dashboard sharing links (#22174) 2019-10-28 18:41:56 -04:00
Andytr1
122ee29a13 Merge pull request #22158 from edx/andytr1/prod-waffle-flag-for-report 
PROD-826 - add waffle flag
 2019-10-28 14:03:31 -04:00
Dave St.Germain
05e0de2956 TNL-6968 
The access settings modal should not have an editable title. Also, the title of the modal was not being interpolated correctly.
 2019-10-28 10:21:34 -04:00
irfanuddinahmad
b509b2b652 Merge pull request #22167 from edx/iahmad/ENT-2428-Upgraded-version-for-edx-enterprise 
ENT-2428: Update edx-enterprise version
 2019-10-28 18:32:14 +05:00
irfanuddinahmad
7bcb618163 Updated requirements for edx-enterprise 2019-10-28 18:02:30 +05:00
AsadAzam
036d8eabd8 Merge pull request #22155 from edx/asad/prod-772 
Upgrade RateXblock
 2019-10-28 17:41:41 +05:00
Hassan
16cea31550 Merge pull request #22130 from edx/hassan/fix-nulls-in-history 
Fix NULLs in history generation.
 2019-10-28 16:41:27 +05:00
Hassan Javeed
86f0f42520 Replace 'NULL' with None. 2019-10-28 16:05:45 +05:00
asadazam93
f6cda52ebd Upgrade RateXblock 2019-10-28 15:18:48 +05:00
Uzair Rasheed
a32786a184 Merge pull request #22111 from edx/PROD-769/add-warning-to-verification-card 
Add warning to the bottom of verification status card on dashboard.
 2019-10-28 13:25:56 +05:00
Awais Qureshi
c3733d05e0 Merge pull request #22154 from edx/awais786/BOM-995 
BOM-995
 2019-10-28 11:40:40 +05:00
edX Transifex Bot
624e48989f fix(i18n): update translations 2019-10-27 17:22:55 -04:00
atesker
c007499a54 PROD-826 - Add CourseWaffleFlag that restricts the set of ProblemGradeReport enrollees to only verified learners. 
cr comments

added unit test

removed debug

style
 2019-10-27 15:23:47 -04:00
Awais Qureshi
2760d401c7 BOM-995 
Fixing acceptance test.
 2019-10-26 15:05:33 +05:00
Luis Moreno
2f22e0189d Mark string as translatable 2019-10-25 19:22:24 -04:00
Luis Moreno
f4ca8bdf48 Addressing feedback 2019-10-25 19:22:24 -04:00
Luis Moreno
d1f96748c5 Do not remove last sentence in StudentAccountDeletion message 2019-10-25 19:22:24 -04:00
Luis Moreno
35bd58a7e4 Use MKTG ROOT LINK instead of LMS_ROOT_URL 2019-10-25 19:22:24 -04:00
jfavellar90
1b5c27eea3 Making student account deletion components a bit site aware 2019-10-25 19:22:24 -04:00
Matthew Piatetsky
08de24f51f Merge pull request #22160 from edx/julianajlk/REV-980/first-purchase-discount-courseware-2 
add missing parameter to discount_percentage
 2019-10-25 17:10:58 -04:00
julianajlk
a4ca026c19 add missing parameter to discount_percentage 2019-10-25 16:28:33 -04:00
Aarif
4285d265b8 Merge pull request #22128 from edx/BOM-992 
changes made to sanitize the urls for consistent comparison - BOM-992
 2019-10-25 23:20:25 +05:00
Calen Pennington
47b8dfae75 Merge pull request #22156 from cpennington/expose-course-duration 
Expose user course duration in the user metadata
 2019-10-25 13:49:14 -04:00
julianajlk
73564a04b0 return course_upgrade_deadline even if dynamic deadline is null (#22150) 
REV-943
 2019-10-25 13:20:40 -04:00
edX cache uploader bot
468b4771d4 Updating Bokchoy testing database cache (#22157) 2019-10-25 10:48:10 -04:00
Matthew Piatetsky
9df790cca5 Merge pull request #22123 from edx/REV-728 
[REV-728] add discount percentage configuration
 2019-10-25 10:10:20 -04:00
Calen Pennington
d92dcb28bb Expose user course duration in the user metadata 2019-10-25 10:02:55 -04:00
edX requirements bot
551f33098a Updating Python Requirements (#22153) 2019-10-25 09:37:47 -04:00
uzairr
386e05d3b1 Add warning to the bottom of verification status card on dashboard. 
Learners are not allowed to make an attempt of the procotored exam if
they verify their identity near to proctored exam date.To make them,
aware about their expiry date, modification are done to the status card
so that user experience will be improved.

PROD-769
 2019-10-25 18:09:39 +05:00
adeelehsan
edd8887e47 Merge pull request #22152 from edx/aehsan/prod-734/added_logs_in_lang_pref_middleware 
Logs added to investigate the middleware
 2019-10-25 15:52:57 +05:00
adeelehsan
88e7589a19 Logs added to investigate the middleware 2019-10-25 15:27:26 +05:00
aarif
45338f4160 changes made to sanitize the urls for consistent comparison 
changes made to finalize the url sanitization to make url comparison consistent

changes made to avoid running sanitize in python 2

changes made to substitute proper query param in url for comparison

changes made to split and compare the query parameter with expected url

updated the split logic to properly split/slice url parts for comparison

updated the dashboard template to remove encode and avoid bytes encoded embeded url

updated the dashboard template to enclose social media urls with unicode
 2019-10-25 15:20:32 +05:00
Awais Qureshi
2cf8341189 Merge pull request #22138 from edx/awais786/BOM-968 
BOM-968
 2019-10-25 14:55:27 +05:00
Awais Qureshi
96400a9674 Merge pull request #22137 from edx/awais786/BOM-981-982 
BOM-981
 2019-10-25 14:52:52 +05:00
noraiz-anwar
4bcedb9eee make upgrade output 2019-10-25 12:00:23 +05:00
Ayub
8cc509e448 Merge pull request #22107 from edx/BOM-949 
BOM-949
 2019-10-25 11:01:51 +05:00
Ayub
6d471e24ac Merge pull request #22142 from edx/BOM-987-2 
BOM-987
 2019-10-25 11:00:53 +05:00
Ayub
279ecba2b7 Merge pull request #22144 from edx/BOM-964 
BOM-964
 2019-10-25 10:57:16 +05:00
Ayub
30c1443671 Merge pull request #22139 from edx/bump-edx-proctoring-version 
BOM-989
 2019-10-25 10:40:25 +05:00
Manjinder Singh
80c7f5af01 BOM-933: Fix type mismatches in various migrations 5 (#22147) 
* fix type mismatch in third_party_auth migrations

* fix type mismatch in verify_student  migrations

* fix type mismatch in video_config  migrations

* fix type mismatch in verified_track_content  migrations

* fix type mismatch in commercemigrations

* fix type mismatch in xblock_config migrations

* fix type mismatch in course_creators migrations

* fix type mismatch in contentstore migrations
 2019-10-24 16:08:04 -04:00
edX cache uploader bot
2ccbeda27d Updating Bokchoy testing database cache (#22148) 2019-10-24 15:05:24 -04:00
Jason Myatt
da90e2e851 Merge pull request #22131 from edx/jmyatt/enable_null_order_numbers_in_entitlements_admin 
Allow empty order numbers in django admin for Entitlements
 2019-10-24 14:21:15 -04:00
Feanil Patel
b5a765e676 Merge pull request #22135 from edx/feanil/fix_show_answer_render 
Pass back the answer html as a string instead of bytes.
 2019-10-24 13:59:53 -04:00
Manjinder Singh
7f3045cf75 BOM-933: Fix type mismatches in various migrations 4 (#22146) 
* fix type mismatch in course_goals  migrations

* fix type mismatch in experiments  migrations

* fix type mismatch in xblock_django  migrations

* fix type mismatch in catalog  migrations

* fix type mismatch in static_replace  migrations

* fix type mismatch in bulk_email  migrations

* fix type mismatch in course_overviews migrations
 2019-10-24 13:47:51 -04:00
Jeremy Bowman
05e9e56d56 Fix CSS selector under Python 3 BOM-991 (#22124) 2019-10-24 13:19:18 -04:00
Jason Myatt
c30865cce6 Allow empty order numbers in django admin for Entitlements 2019-10-24 12:52:41 -04:00