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

52155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
e1034675e2 Merge pull request #22184 from cpennington/fix-typo-in-user-metadat 
Fix typo in user_metadata.html (which was being obscured by mako non-…
 2019-10-30 11:33:25 -04:00
Manjinder Singh
bf18c1ecc6 Modified dependencies and ran make upgrade: (#22171) 
- edx-sga recently released new release that supports python 3.5
 2019-10-30 11:27:46 -04:00
edX requirements bot
2874c1fa6a Updating Python Requirements (#22183) 2019-10-30 11:04:20 -04:00
Calen Pennington
7de48b4351 Fix typo in user_metadata.html (which was being obscured by mako non-strictness) 2019-10-30 10:41:30 -04:00
Uzair Rasheed
9ce3d555d2 Merge pull request #22177 from edx/PROD-782/disable-language-cookie 
Disable language preference cookie to mobile views.
 2019-10-30 17:58:07 +05:00
uzairr
4efe22c959 Disable language preference cookie to mobile views. 
Language preference cookie is not allowing to change the site
language on mobile-apps affecting user-experience.To improve it,
mobile team suggested to disable the language preference cookie
for the request originated from mobile.

PROD-782
 2019-10-30 17:12:10 +05:00
adeel khan
61f7cf25b2 Merge pull request #22175 from edx/adeel/prod_810_fixing_course_title_escaping 
Fixing templates for double escaping.
 2019-10-30 16:27:58 +05:00
Awais Jibran
38f296fa93 Merge pull request #22182 from edx/aj/improve-logging-capa 
Improve logging when a CAPA problem fails to display HTML
 2019-10-30 14:54:26 +05:00
Awais Jibran
2423069315 Merge pull request #22165 from edx/as/bug/html-editor-url 
fixed language issue and added test
 2019-10-30 14:42:39 +05:00
Awais Jibran
c0a26e932d Improve logging when a CAPA problem fails to display HTML 2019-10-30 14:23:50 +05:00
Awais Jibran
3ee5969f73 fixed language issue and added test #2 2019-10-30 14:02:50 +05:00
Awais Jibran
a27bd563b4 Merge pull request #22102 from edx/as/bug/tinymce-add-image 
JavaScript Error when inserting second image in Studio
 2019-10-30 12:59:56 +05:00
Syed Muhammad Dawoud Sheraz Ali
6e4559c933 Merge pull request #22181 from edx/dsheraz/PROD-762 
enable video url rewrite flag
 2019-10-30 12:48:34 +05:00
Awais Jibran
222c74e855 JavaScript Error when inserting second image in Studio 2019-10-30 12:21:40 +05:00
DawoudSheraz
8c75a3757d enable video url rewrite flag 2019-10-30 12:19:37 +05:00
Matt Hughes
cfbfe35904 Link program enrollments on social auth updates in add. to creation 
See
lms/djangoapps/program_enrollments/docs/decisions/0002-matriculation-on-user_social_auth_change.rst
for more details

JIRA:EDUCATOR-4770
 2019-10-29 16:19:48 -04:00
Kyle McCormick
3858036a4e Expand and refactor teams configuration on course. (#22168) 
Wrap CourseModule.teams_configuration in TeamsConfig
class, centralizing parsing, validation, error handling,
etc. Wrapped object is exposed on 'teams_conf' field.

Old code still uses 'teams_configuration' dict;
we should change this in the future (MST-18).

MST-16
 2019-10-29 16:10:19 -04:00
Alex Dusenbery
a5aaffbb78 Upgrade edx-ora2==2.3.3 2019-10-29 12:07:20 -04:00
Diana Huang
2e3f9cb1de Merge pull request #22145 from edx/diana/remove-node-install 
Remove nodeenv install for jenkins.
 2019-10-29 11:30:52 -04:00
Ned Batchelder
b245defb11 Merge pull request #22132 from philanthropy-u/saad/fix_visible_blocks_hash_value 
Fixed exception in VisibleBlocks.bulk_create due to incorrect argument passed
 2019-10-29 11:14:52 -04:00
Diana Huang
a4d70cb127 Remove nodeenv install for jenkins. 2019-10-29 11:04:13 -04:00
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
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
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