Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,111 Commits 1 Branch 0 Tags
441d2e44b9457817bf9d2e052d160bc2e3effc2a
Commit Graph

640 Commits

Author SHA1 Message Date
Adeel Khan
298d3554fe Fix templates for XSS code injection via translations 
This would patch all templates (django/mako)
for a possible XSS code injection via
translation files by html escaping them..

LEARNER-4632
 2019-06-25 14:22:42 +05:00
Matt Tuchfarber
4e1877670e Check if enterprise matches site before consent 
We don't support enterprises with catalogs that span sites, so we can
safely ignore checking for consent when the site a learner is viewing a
course in is different than the enterprise that the learner is linked
to.
 2019-06-24 14:30:59 -04:00
Calen Pennington
093fc9f68a Allow a limited subset of fields in the Course Block View for blocks that have been denied authorization 2019-06-20 15:23:32 -04:00
Calen Pennington
92d9a1f541 Merge pull request #20789 from cpennington/first-enroll-discount-strikeout 
Add strike-out price to LMS Course Home sidebar
 2019-06-18 13:02:15 -04:00
Calen Pennington
2901d5f810 Centralize the strike-out price formatting to make correct accessibility easier 2019-06-18 11:00:08 -04:00
Brittney Exline
52d03626e2 Version bump for edx-enterprise 2019-06-17 14:28:05 -06:00
Calen Pennington
f842717c49 Add strike-out price to LMS Course Home sock 2019-06-17 15:11:33 -04:00
Calen Pennington
26cb18b01d Fix test name typo 2019-06-17 15:11:33 -04:00
Calen Pennington
dc7daccfc8 Add strike-out price in LMS courseware 2019-06-17 15:11:33 -04:00
Calen Pennington
d2de618b20 Add strike-out price to LMS Course Home sidebar 2019-06-17 15:11:33 -04:00
George Babey
fb0a4220a7 Revert "Version bump for edx-enterprise" 
This reverts commit bf88bca776.
 2019-06-16 15:22:09 -04:00
Brittney Exline
bf88bca776 Version bump for edx-enterprise 2019-06-14 13:57:01 -06:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Ned Batchelder
9257f68fd8 The default TIME_ZONE should be UTC 
In production, we use UTC as the time zone.  DRF 3.7.7 now puts all
times in the currently set timezone where it used to use UTC.  By
setting TIME_ZONE to UTC, we keep the same results we used to get.

In a few places, we had to change the expected test results to be UTC.
 2019-06-10 15:27:39 -04:00
Matthew Piatetsky
aba836b517 Merge pull request #20674 from edx/REVEM-354 
add discount banner to track selection and discount price to upgrade button
 2019-06-07 11:35:34 -04:00
Thomas Tracy
be0e6093cd type uuid for proper encoding. 2019-06-06 09:50:24 -04:00
Matthew Piatetsky
ce5b976f5e update local currency code 2019-06-05 15:46:16 -04:00
Matthew Piatetsky
8f2d7cfc8a switch enabled to disabled 2019-06-03 14:02:04 -04:00
Matthew Piatetsky
b32ed9ff2b add discount restriction stacked config models 2019-06-02 18:21:31 -04:00
Dave St.Germain
49b5b88a30 Bumped edx-when 2019-05-30 10:48:38 -04:00
Nimisha Asthagiri
ba4921b538 Merge pull request #20710 from edx/bom/course-experience-readme 
README for course_experience
 2019-05-29 15:33:53 -04:00
emma-green
8615b1b0ac Merge pull request #20661 from edx/emma-green/REVEM-355/add-arch-decision 
add arch decision of computation of course-user discount
 2019-05-29 12:08:21 -04:00
Emma Green
95c15495dd add arch decision of computation of course-user discount 2019-05-29 10:21:46 -04:00
Nimisha Asthagiri
5945d1dcee README for course_experience 2019-05-29 03:00:19 -04:00
Wei Lee
1d5a72ac33 INCR-236 (#20502) 
* INCR-236

* Run python-modernize on openedx/features/course_duration_limits and
  verify that the change makes sense and tests does not break

* Remove redundant import and update docstring style
 2019-05-23 11:53:58 -04:00
Matthew Piatetsky
93300a2e0e check course end date and verified mode for first purchase offer 2019-05-21 08:34:07 -04:00
Calen Pennington
ff73f7d746 Merge pull request #20397 from cpennington/revmi-34-attempt-2 
Revmi 34 attempt 2
 2019-05-20 10:35:39 -04:00
Calen Pennington
755a5c7db6 Augment content_type_gating tests to detect the failure case from the original REVMI-34 implementation 2019-05-16 15:17:33 -04:00
Matthew Piatetsky
85f0720c50 fix broken FBE banner dates in firefox 2019-05-16 09:33:24 -04:00
Syed Muhammad Dawoud Sheraz Ali
fd8c959604 Merge pull request #20536 from edx/dsheraz/prod-256 
add visual check for due dates in self-paced courses
 2019-05-16 17:58:51 +05:00
DawoudSheraz
4329168810 add visual check for due dates in self-paced courses 2019-05-16 16:35:42 +05:00
Hammad Ahmad Waqas
a8e92120be Merge pull request #20541 from edx/hammad/WL-1934 
WL-1934 | We need a way to reset the DSC flag for Ent clients
 2019-05-16 15:19:19 +05:00
Calen Pennington
8c0ad119ec Revert "Revert "Merge pull request #20272 from cpennington/revmi-34-recheck-access"" 
This reverts commit b64664932d.
 2019-05-15 11:29:00 -04:00
emma-green
3c97b5778e Merge pull request #20540 from edx/emma-green/REVEM-282/D/Connect-discount-lms-display-and-applicability-calc 
connect discount display to applicability
 2019-05-15 10:49:37 -04:00
Emma Green
7bcce26f85 spell receive correctly when discounting 2019-05-15 09:54:20 -04:00
Emma Green
6439070121 connect discount display to applicability 2019-05-14 17:21:48 -04:00
Hammad Ahmad Waqas
cdc8ddf190 clearing all relevant cache if enterprise customer change DSC enable flag. 2019-05-14 17:50:48 +05:00
Uzair Rasheed
82ce621e0f Merge pull request #20489 from edx/LEARNER-7057/anomaly-in-certificates-visibility 
Anomaly in certs visibility on user profile.
 2019-05-14 14:46:52 +05:00
Emma Green
7ae68aa383 add applicability endpoint 2019-05-10 09:11:54 -04:00
uzairr
cefebce67a Anomaly in certs visibility on user profile. 
While visiting a profile of another user from a non-staff account,
backend is returning html of its certs in page source.To avoid it,
a check is added in backend so that certs are only added when the
visiting user is itself visiting its profile or it would be a staff.

LEARNER-7057
 2019-05-10 16:13:16 +05:00
Kyle Mulka
bf47cd0cc2 incr-178: ran modernize on openedx/features/content_type_gating (#20470) 
*  incr-178: ran modernize on openedx/features/content_type_gating

* removed unused imports

* ran isort on openedx/features/content_type_gating/migrations
 2019-05-09 13:25:59 -04:00
Amit
3b79bf85fe INCR-175: Run python-modernize on openedx/features/announcements (#20475) 2019-05-09 00:15:23 -04:00
kill-gear
69584ca573 incr-177 run python-modernize on openedx/features/learner_profile (#20454) 
* incr-172

* incr-177 run modernize

* fixed bug due to running modernize
 2019-05-08 16:50:04 -04:00
Christie Rice
6db32a36bc REVEM-239 Add audit access expiration deadline to user-metadata 2019-05-08 08:53:21 -04:00
Bill Tucker
92e8615669 INCR-224: run python-modernize and isort for openedx/features/course_duration/ (#20429) 2019-05-07 08:47:10 -04:00
Kyle Mulka
4138445ad7 ran modernize on openedx/features/course_search, course_experience, and coursetalk (#20423) 2019-05-06 22:44:04 -04:00
Nimisha Asthagiri
e298004f88 Merge pull request #20394 from edx/arch/fix-synch-learner-data-for-enterprise 
Account API: Fix Enterprise enforcement when NOT sync profile_data
 2019-05-06 22:12:14 -04:00
Diana Huang
c6a89b03b9 Remove Diff Paid experimental features. 2019-05-03 15:09:20 -04:00
Nimisha Asthagiri
d2d6f81278 Account API: Fix Enterprise enforcement when NOT sync profile_data 
ARCH-740
 2019-05-03 13:44:22 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00