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

2603 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
jansenk
027a9bd2cc add api access request management command 2019-06-21 15:34:03 -04:00
DawoudSheraz
5747e97895 Merge branch 'master' into private_to_public_319d54e 2019-06-19 11:22:07 +05: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
Diana Huang
0c7ad64350 Clean up theming tests and microsites. 2019-06-14 15:22:33 -04:00
Diana Huang
fe3d33091f More test fixes. 2019-06-14 15:20:50 -04:00
Diana Huang
762f20385e Fix theming test helpers. 2019-06-14 15:20:50 -04:00
Diana Huang
f8c54212f4 Remove more microsites from theming. 2019-06-14 15:20:50 -04:00
Diana Huang
58a363e9d4 Remove microsites from commerce and theming. 2019-06-14 15:20:50 -04:00
Awais Jibran
66298b8761 fix activation emails for login failure 2019-06-12 16:35:56 +05:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Ned Batchelder
756dd88691 Merge pull request #20393 from edx/nedbat/drf-yasg 
Use drf-yasg for Open API documentation
 2019-06-11 13:58:13 -04:00
Amit
087250cff7 INCR-250: Make compatible with Python 3.x without breaking Python 2.7… (#20534) 
* INCR-250: Make compatible with Python 3.x without breaking Python 2.7 support --> openedx/core/djangoapps/programs

* INCR-250: Disable pylint warning and replace _f placeholder with actual name

* INCR-250: pylint format correction and fix over length line limit
 2019-06-11 10:17:52 -04:00
edx-pipeline-bot
de5d25eccc Merge pull request #20794 from edx/private_to_public_55dd3e1 
Mergeback PR from private to public.
 2019-06-11 19:17:13 +05:00
Ned Batchelder
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same. 2019-06-10 15:27:39 -04:00
Ned Batchelder
fdd66e5390 Adjust the expected error message for DRF 3.7.7 2019-06-10 15:27:39 -04:00
Jeremy Bowman
1198e5f29b Fix intermittent unit test failures (#20783) 2019-06-10 14:56:33 -04:00
Josue Balandrano Coronel
df14f5cdf6 [BB-1132] Decrease NAME_MIN_LENGTH to 1 2019-06-06 22:52:00 +02:00
David Ormsbee
382f6ddc35 Merge pull request #20745 from open-craft/jill/models-gettext-lazy 
Campus.IL SE-1151 Strings used in models should always use gettext_lazy
 2019-06-05 19:53:10 -04:00
Christie Rice
c66ad09dbc REVMI-234 Remove flaky test (#20752) 2019-06-05 15:48:47 -04:00
Dave St.Germain
4b84d630de Merge pull request #20719 from edx/dcs/grade-support 
API support for bulk grade import/export
 2019-06-05 14:46:15 -04:00
Christie Rice
b5d07783b9 REVMI-234 Include user id in jwt sent to ecommerce (#20743) 
* REVMI-234 Include user id in jwt sent to ecommerce

* Reorder params
 2019-06-05 10:27:23 -04:00
jansenk
095c420378 check curriculum rather than courses for program course membership 2019-06-04 14:06:00 -04:00
Jillian Vogel
22ebf0e16f Strings used in models should always use gettext_lazy. 
Otherwise, they generate false migrations when languages other than
English are used as the default.
 2019-06-04 18:48:46 +09:30
Noraiz Anwar
55dd3e18bb Merge pull request #153 from edx/noraiz/PROD-169 
rate limit requests for password reset emails
 2019-06-03 11:39:59 +05:00
Dave St.Germain
a2ca6f96d0 API support for bulk grade import/export 2019-05-31 09:28:44 -04:00
Nimisha Asthagiri
407438970b Merge pull request #20709 from edx/bom/certificates-readme 
README for certificates
 2019-05-29 15:33:03 -04:00
Nimisha Asthagiri
5c3dbaa588 Merge pull request #20708 from edx/depr/microsites-user_authn 
Remove microsites from user_authn
 2019-05-29 10:30:33 -04:00
Nimisha Asthagiri
1118c2bef7 README for certificates 2019-05-29 02:49:41 -04:00
Nimisha Asthagiri
5b29672ed1 Remove microsites from user_authn 
DEPR-30
 2019-05-29 02:20:42 -04:00
Nimisha Asthagiri
01ccd877e6 Merge pull request #20702 from edx/bom/enrollment-readme 
Enrollments README and refactor
 2019-05-28 16:58:27 -04:00
Nimisha Asthagiri
d3b79ae5f7 README for enrollments app 2019-05-28 15:28:15 -04:00
Nimisha Asthagiri
9127075bcf Fix Pylint for enrollments 2019-05-28 13:25:02 -04:00
Nimisha Asthagiri
6e214a85b0 Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments 2019-05-28 11:20:53 -04:00
Dave St.Germain
a0468787aa Merge pull request #20677 from edx/dcs/track-cohort-sgp 
Added track and cohort filter for CSV score export
 2019-05-28 11:14:36 -04:00
Dave St.Germain
14cab5aa16 Added course_id to get_course_cohorts 2019-05-28 10:21:26 -04:00
Matt Hughes
af9dad5214 Merge pull request #20660 from edx/matthugs/EDUCATOR-4327 
Add endpoint for checking learner program enrollments
 2019-05-24 15:23:16 -04:00
Jeremy Bowman
f9929f32b5 Update quality threshold counts (#20681) 2019-05-24 08:27:54 -04:00
edx-pipeline-bot
9336dc48d4 Merge pull request #20685 from edx/private_to_public_79e2911 
Mergeback PR from private to public.
 2019-05-24 14:25:01 +05:00
Evans Dianga
920ce74877 Modernize INCR-210 user_api/management (#20435) 2019-05-23 13:11:57 -04:00
Matt Hughes
047c379cab Add endpoint for checking learner program enrollments 
JIRA:EDUCATOR-4327
 2019-05-23 10:37:13 -04:00
noraiz-anwar
34cf433588 rate limit requests for password reset emails 2019-05-23 13:29:36 +05:00
Awais Jibran
da1c2a119b Fix Elevation in permission over OAuth 2019-05-23 02:12:00 +05:00
Douglas Hall
c85a4da014 Reorder authentication classes for DeactivateLogoutView. 2019-05-20 16:55:00 -04:00
Jason Myatt
ab8ffe6dac Merge pull request #20552 from edx/jmyatt/registration-form-gdpr-fix 
Update registration form text for GDPR
 2019-05-15 15:20:36 -04:00
Amit
b5725b9f29 INCR-233 (#20512) 
* INCR-233: Run python-modernize and isort on openedx/core/djangoapps/django_comment_common

* INCR-233: Fixes for basestring type as the six.string_types is tuple

* INCR-233: Grouped absolute_import and unicode_literals imports

* INCR-233: Grouped absolute_import and unicode_literals imports for migrations
 2019-05-15 12:12:46 -04:00
Jason Myatt
1530124e01 Update registration form text for GDPR 2019-05-14 16:26:54 -04:00
Douglas Hall
60ea09dff3 Send duplicate provider to account MFE. 2019-05-14 13:45:56 -04:00
Amit
d0810a5c94 INCR-249: Make compatible with Python 3.x without breaking Python 2.7 support (#20528) 
* INCR-249: Make compatible with Python 3.x without breaking Python 2.7 support --> openedx/core/djangoapps/content/block_structure

* INCR-249: Grouped six package

* INCR-249: Remove the duplicate lines for absolute_import
 2019-05-13 12:15:05 -04:00
Amit
3a1c68fb30 INCR-243: Make compatible with Python 3.x without breaking Python 2.7 support for openedx/core/djangoapps/models openedx/core/djangoapps/debug (#20532) 2019-05-13 09:29:07 -04:00