Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,160 Commits 1 Branch 0 Tags
5dae91bdf875eb5da68803e2948e32244dbd035d
Commit Graph

92 Commits

Author SHA1 Message Date
Zulqarnain
cf58da6ee0 Update assertRedirects usage 2020-01-08 14:35:40 +05:00
Feanil Patel
046feb0cf0 Merge pull request #22649 from edx/feanil/fix_pep8 
Fix all E303 pep8 errors.
 2019-12-30 13:32:26 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts 
Run `2to3 -f asserts . -w` on edx-platform.
 2019-12-30 12:13:42 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w 
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
 2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform. 
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
 2019-12-30 10:22:19 -05:00
Dillon Dumesnil
7165eeff44 DISCO-1522: check if enrolled before congrats message 
This helps out the Verified Only case where the user
is not first enrolled as an audit learner.
 2019-12-18 19:54:28 +00:00
Matthew Piatetsky
b0c9662b51 remove discount banner from track selection 2019-11-12 13:28:27 -05:00
julianajlk
afae1f1d2a a11y: add role to FPD banner (#22225) 
REV-705
 2019-11-04 10:46:53 -05:00
julianajlk
6e0914ad5d add FPD banner to courseware (#22113) 
REV-980
 2019-10-23 09:33:11 -04:00
julianajlk
98f907f23c Revert "add first purchase discount to courseware (#22058)" 
This reverts commit 059b619794.
 2019-10-21 13:57:18 -04:00
julianajlk
059b619794 add first purchase discount to courseware (#22058) 
REV-980.
* moved get_first_purchase_offer_banner_fragment to Discounts utils.py
* added banner wrapper method
* updated banner with time limit
 2019-10-21 13:56:38 -04:00
Matthew Piatetsky
f6d0bf77df check if discount expired 2019-10-16 11:32:27 -04:00
Emma Green
c4ae093e75 remove discount banner display flag 2019-06-28 14:46:21 -04:00
Matthew Piatetsky
ce5b976f5e update local currency code 2019-06-05 15:46:16 -04:00
Matthew Piatetsky
ad77392f8d add discount banner to track selection 2019-06-03 14:18:17 -04:00
Dave St.Germain
27437bc03f Ran python-modernize 2019-04-23 15:29:27 -04:00
cclauss
c0c935b685 Old style exceptions --> new style for Python 3 2019-02-19 13:09:23 +01:00
Michael Youngstrom
4bbd1dee0b Remove shards from commonlib-unit tests 2019-02-12 14:28:35 -05:00
Jeremy Bowman
4241249119 TE-2524 Stop using nose.plugins 2018-07-30 21:11:05 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
Tasawer Nawaz
4912888168 stop using deprecated single item basket view 
LEARNER-4428
 2018-03-14 20:29:51 +05:00
bmedx
6ece1708a6 Make sure httpretty usage cleans up after itself 2017-12-22 15:36:46 -05:00
Jeremy Bowman
103c723c6d PLAT-1801 Preserve new user login behavior under Django 1.10+ 2017-12-05 10:20:25 -05:00
bmedx
ace88e7d5a Tag LMS Unit 3 tests that fail in Django 1.11 
Fixed some url reverse errors instead of marking since they were trivial
 2017-11-22 15:48:00 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Matthew Piatetsky
d394c05236 Take users from track selection to course home instead of dashboard 
LEARNER-2546
 2017-10-02 12:15:12 -04:00
Jesse Shapiro
7a31441ebc Move to new consent API 2017-08-16 22:58:09 -04:00
Brittney Exline
8c362d4df6 Revert "Create EnterpriseCourseEnrollment when enrolling via Track Selection page" 
This reverts commit d940bbfd09.
 2017-07-17 14:11:24 -04:00
Brittney Exline
6c761ce8aa Revert "Specify catalog URL to configure" 
This reverts commit add01fdfab.
 2017-07-17 14:11:24 -04:00
Jesse Shapiro
add01fdfab Specify catalog URL to configure 2017-07-03 10:48:11 -04:00
Jesse Shapiro
e408feffb8 Merge pull request #15400 from open-craft/haikuginger/enterprise_audit_enrollment 
[ENT-457] Create EnterpriseCourseEnrollment when enrolling via Track Selection page
 2017-06-30 13:22:17 -04:00
Jesse Shapiro
d940bbfd09 Create EnterpriseCourseEnrollment when enrolling via Track Selection page 2017-06-30 12:39:14 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02:00
Afzal Wali
8173182c86 Taking the url change behind the waffle switch. Required for the Learner-1146 
Learner-1111
 2017-06-21 14:02:14 +05:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
Matt Drayer
5f5a44e062 Hide the audit option from track selection for certain enterprise use cases 2017-05-22 17:14:27 -04:00
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
asadiqbal
47cdf39266 ENT-342 2017-05-03 15:03:34 +05:00
Andy Armstrong
0325425c8c Add data sharing consent redirect for more course tabs 
LEARNER-394
 2017-03-31 19:12:13 -04:00
asadiqbal
ed33d3b09f ENT-287 Track Selection: Enterprise messaging only for catalog courses 2017-03-31 16:54:16 +05:00
Matt Drayer
e2610a31fb Enroll learner in Audit track on postback 2017-03-30 14:29:31 -04:00
asadiqbal
bfde6d63c5 ENT-251 Updated track selection UI for Enterprise context 2017-03-22 17:32:58 +05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"" 
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
 2016-06-30 15:19:51 +05:00
Michael Frey
6efc461fb6 mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys 
* mattdrayer: Add helpers.get_value test
* mattdrayer: Change to simpler implementation, per @douglashall
* mattdrayer: Address quality violations and test failures
 2016-06-21 23:28:36 -04:00
Matt Drayer
c2c2a67753 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-03 13:00:45 -04:00