Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
49,952 Commits 1 Branch 0 Tags
23ab20a6fd1863c02bf1197ff8f0d3a288288d32
Commit Graph

3598 Commits

Author SHA1 Message Date
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
Josue Balandrano Coronel
df14f5cdf6 [BB-1132] Decrease NAME_MIN_LENGTH to 1 2019-06-06 22:52:00 +02:00
Thomas Tracy
221dc99d23 Merge pull request #20760 from edx/ttracy/ent-1994-dsc-flag-bug 
type uuid for proper encoding.
 2019-06-06 11:41:51 -04:00
Thomas Tracy
be0e6093cd type uuid for proper encoding. 2019-06-06 09:50:24 -04: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
Matthew Piatetsky
ce5b976f5e update local currency code 2019-06-05 15:46:16 -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
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
a2ca6f96d0 API support for bulk grade import/export 2019-05-31 09:28:44 -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
Nimisha Asthagiri
407438970b Merge pull request #20709 from edx/bom/certificates-readme 
README for certificates
 2019-05-29 15:33:03 -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
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
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
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
Jeremy Bowman
ff7292538e More pylint fixes (#20692) 2019-05-28 09:19:31 -04:00
aliciaerwin
ddeb7c4204 INCR-237 Run python modernize on openedx/tests (#20494) 2019-05-24 15:46:18 -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
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
Matt Hughes
047c379cab Add endpoint for checking learner program enrollments 
JIRA:EDUCATOR-4327
 2019-05-23 10:37:13 -04:00
Awais Jibran
da1c2a119b Fix Elevation in permission over OAuth 2019-05-23 02:12:00 +05:00
Matthew Piatetsky
93300a2e0e check course end date and verified mode for first purchase offer 2019-05-21 08:34:07 -04:00
Douglas Hall
c85a4da014 Reorder authentication classes for DeactivateLogoutView. 2019-05-20 16:55:00 -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
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
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