Calen Pennington
f07f2121ba
Make has_non_audit_enrollments exclude entitlements
2019-06-25 16:44:36 -04:00
Calen Pennington
388fac3b9c
Make has_non_audit_enrollments exclude honor courses correctly
2019-06-25 16:44:36 -04:00
Douglas Hall
0f045ab5db
Add analytics tracking to Discover New header link. ( #20896 )
2019-06-25 16:36:59 -04:00
Feanil Patel
52a5c81589
Merge pull request #20883 from amitvadhel/INCR-459
...
INCR-459: Run python-modernize and isort
2019-06-25 15:20:18 -04:00
Simon Chen
a86e8d4f19
EDUCATOR-4361 Add PUT api endpoint to the edx-plaform program course enrollment view
2019-06-25 15:12:22 -04:00
Ned Batchelder
aa13a634a6
Merge pull request #20821 from edx/nedbat/drf-yasg
...
Upgrade djangorestframework and install drf-yasg to get better OpenAPI support
2019-06-25 13:49:13 -04:00
Feanil Patel
0af26561b2
Merge pull request #20876 from amitvadhel/INCR-473
...
INCR-473: Make compatible with Python 3.x
2019-06-25 12:57:02 -04:00
Nadeem Shahzad
441d2e44b9
Merge pull request #20818 from edx/nadeem/OPS-4041
...
Defaults to common.py lms (OPS-4041)
2019-06-25 18:47:12 +05:00
nadeemshahzad
993a21181a
defaults to common.py
2019-06-25 13:01:29 +00:00
adeelehsan
1b227232c5
Python3 update
...
INCR-471
2019-06-25 15:47:00 +05:00
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
Hammad Ahmad Waqas
34589393ac
Merge pull request #20840 from edx/hammad/WL-1492
...
WL-1492 | Remove arbitrary code rendering on course about page
2019-06-25 11:20:07 +05:00
amitvadhel
8a01c9b0a5
INCR-459: Run python-modernize and isort
2019-06-24 21:20:19 +03:00
Christie Rice
eeb265e276
REVEM-376 Disable waffle flags by default ( #20880 )
2019-06-24 11:31:10 -04:00
Christie Rice
b8401beaae
REVEM-374 Remove course prices from dashboard ( #20856 )
2019-06-24 08:56:05 -04:00
Mushtaq Ali
07addf5f22
Merge pull request #20853 from edx/mushtaq/fix-csrf-referer-not-trusted
...
Add CSRF_TRUSTED_ORIGINS settings
2019-06-24 16:18:10 +05:00
DawoudSheraz
b37e679c39
remove staff exemption from the library_content transformer
2019-06-24 11:05:11 +05:00
amitvadhel
b6b1b0c602
INCR-473: Make compatible with Python 3.x
2019-06-23 13:29:43 +03:00
Ned Batchelder
b3a731550c
Fix problems that drf-yasg uncovered.
...
These were originally fixed individually, but had to be reverted, and
are now combined in one commit. The originals were:
7b9040f6b08774ff1f9b8a443971394a1154a7ca64c47856dd7359ca4fb2fdd66e53909257f68fd8
2019-06-21 18:04:15 -04:00
Ned Batchelder
2e9cae46cb
Add drf-yasg
...
* Install drf-yasg
* Add drf-yasg settings and urls
* Pin drf to make drf-yasg work
* Adjust config-models version to be compatible
* Remove django-rest-swagger (the old way)
2019-06-21 17:47:26 -04:00
Douglas Hall
f9d599a1a0
Add Discover New link to LMS header. ( #20875 )
2019-06-21 15:41:06 -04:00
Calen Pennington
b14244fe01
Merge pull request #20862 from cpennington/mobile-fbe-fields
...
Allow a limited subset of fields in the Course Block View for blocks …
2019-06-21 12:25:56 -04:00
Manjinder Singh
a787cd51cf
Merge pull request #20801 from edx/msingh/INCR-482
...
INCR-482: ran python modernization and isort
2019-06-21 11:10:37 -04:00
Andytr1
cac4ec0047
Merge pull request #20843 from edx/andytr1/grades_show_email_for_masters_track_only
...
EDUCATOR-4319 gradebook show student email only for master's track.
2019-06-21 09:29:58 -04:00
usama sadiq
7719314a22
Upgrade to Python3
...
Added absolute_import
Changed the use of unicode with six.text_type
2019-06-21 16:39:24 +05:00
Hammad Ahmad Waqas
63d7b7d6fa
applying filter to remove dangerous html content before rendering in
...
course_about page on course overview field
2019-06-21 16:06:26 +05:00
amitvadhel
fb4aa2a407
INCR-474: Run python-modernize and isort
2019-06-21 14:00:24 +03:00
amitvadhel
e304ab0c3f
INCR-475: Make compatible with Python 3.x
2019-06-21 13:41:23 +03:00
uzairr
9835b21191
Python-modernize on edx-platform (375 of 380)
...
After executing python-modernize and isort, few changes occurred in
import sequence as well as unicode func is replaced by six.text_type
func.
INCR-478
2019-06-21 12:15:36 +05:00
Amit
df949d6de1
INCR-480: Make compatible with Python 3.x and fixed line over length limit ( #20833 )
2019-06-20 16:20:49 -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
atesker
68ec2e184d
gradebook show student email only for master's track.
...
gradebook show student email only for master's track.
show emails for masters track - unit tests pass
fixed more unit tests and linting
2019-06-20 14:51:38 -04:00
Usman Khalid
0b27c62ca6
Convert VideoModule to VideoBlock.
...
Some deprecated functionality has been removed:
- Reading data field and transforms being applied in the init() method.
- The source field.
- The source_visible attribute.
2019-06-20 22:12:39 +05:00
usama sadiq
1630911131
Updated to Python3
...
Added absolute import in both files
2019-06-20 16:07:17 +05:00
Mushtaq Ali
d9a67496ff
Add CSRF_TRUSTED_ORIGINS settings to successfully make POST requests from edx-learner-portal to edx-platform - ENT-2025
2019-06-19 16:04:24 +05:00
amitvadhel
05bf848b1f
INCR-477: pylint: disable import-error for urljoin
2019-06-19 09:16:03 +03:00
amitvadhel
94f410f432
INCR-477: Make compatible with Python 3.x
2019-06-19 08:35:43 +03: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
Zainab Amir
fa8aeb69d9
Remove Remember me button from login page
...
Remember me button does the same thing regardless of if it is checked
or not. Remember me button being unchecked makes a user think they
will be logged out at the end of a browsing session when this is in
fact not the case
LEARNER-6220
2019-06-18 17:30:37 +05:00
Calen Pennington
d2de618b20
Add strike-out price to LMS Course Home sidebar
2019-06-17 15:11:33 -04:00
Diana Huang
6604cf104e
Remove more microsites code.
2019-06-14 15:22:32 -04:00
Diana Huang
58a363e9d4
Remove microsites from commerce and theming.
2019-06-14 15:20:50 -04:00
Jeremy Bowman
45e390d0ea
Upgrade to edx-opaque-keys 1.0.1 ( #20817 )
2019-06-14 12:15:44 -04:00
Usama Sadiq
7373a021cc
Merge pull request #20816 from edx/usama/prod-338-support-contact-us-form
...
Support Contact Form Updated
2019-06-14 18:52:18 +05:00
usama sadiq
44475b9efc
Support Contact Form Updated
...
- Changed the Subject text field to drop down.
- Added aditional text to guide learners to course forums.
2019-06-14 18:22:14 +05:00
Michael Roytman
05c0510cd3
add external_user_key to response and add ability to search by username, email, or external user key
...
Code review comments - EDUCATOR-4319
undoing changes temporarily
undoing changes temporarily
Fixed exception handling
re-added changes after hard reset
removed waffle flag (wrong merge
removed waffle flag (wrong merge
2019-06-14 08:36:00 -04:00
Douglas Hall
fc88c55c76
Header logo should now redirect to learner dashboard. ( #20815 )
2019-06-13 11:07:08 -04:00
David Ormsbee
68905ef4aa
Merge pull request #19165 from EDUlib/cert-translate-2
...
Message related to certificate on courseware progress page are translated to platform language only. Part 2 of 2.
2019-06-12 13:04:46 -04:00
Truong David
9dd5cb86c1
Fix translation issue related to message showed on courseware progress
...
page related to certification and course mode. Part 2 of 2.
Use ugettext_lazy instead of ugettext to ensure the strings shown are in
the language the user chose. Otherwise the strings are in the platform
language.
Keep the original ugettext for function financial_assistance_form.
The test for that function fails if the text is not in english.
2019-06-12 12:20:16 -04:00
msingh
215dde1eca
Fixing error introduced by formatter
2019-06-12 10:55:32 -04:00
