Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,733 Commits 1 Branch 0 Tags
39fb66fccf35caec1da173d86efbd7eea0f494be
Commit Graph

1407 Commits

Author SHA1 Message Date
cahrens
e77b5eb3c3 Merge with release. 2016-09-28 09:58:14 -04:00
attiyaishaque
e8f109a328 Revert "ECOM-5281 Add retires for email sending while registering." 
This reverts commit 4bbeaf32ae.
 2016-09-27 17:21:24 +05:00
attiyaishaque
648bc7efb4 Revert "Adding celery task for sending activation email." 
This reverts commit fe136122db.
 2016-09-27 17:20:57 +05:00
Awais Jibran
b74e964d7c Revert "Fix user registration " 2016-09-27 16:19:34 +05:00
Awais Jibran
10f6bd1703 Celery need to serialize the arguments for a task. Here, user is not serializable,replace it with ID. ECOM-5784 2016-09-26 18:15:25 +05:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02:00
attiyaishaque
fe136122db Adding celery task for sending activation email. 2016-09-23 11:43:26 +05:00
attiyaishaque
4bbeaf32ae ECOM-5281 Add retires for email sending while registering. 2016-09-23 11:43:26 +05:00
Awais Jibran
3f21b0718f Show error message on password reset if provided passwords does not match. 2016-09-22 10:36:53 +05:00
Nimisha Asthagiri
5822919549 Cache Enrollment state for (user, course) in request cache. 2016-09-12 15:56:03 -04:00
Jesse Shapiro
ce2ab5b15c Adding 'visible' field for SSO providers 2016-09-08 11:27:09 -04:00
Clinton Blackburn
9f0598950c Merge pull request #13400 from edx/revert-13321-clintonb/userinfo-cookie 
Revert "Updated User Info Cookie"
 2016-09-06 11:52:45 -04:00
Awais Jibran
91c1049b24 Merge pull request #13390 from edx/aj/improve-registration-activation-logging 
Aj/improve registration activation logging
 2016-09-06 13:02:18 +05:00
Awais Jibran
0bc4f4e026 Merge pull request #13357 from edx/aj/ECOM-5405-update-bulk-enroll-mgm 
Update each enrollment in atomic transaction not all
 2016-09-05 20:22:50 +05:00
Clinton Blackburn
0dedc6ab71 Revert "Updated User Info Cookie" 2016-09-02 17:26:00 -04:00
Awais Jibran
98f01ebc56 Add logging to better monitor and determine root cause for email sending failures. 2016-09-02 16:10:45 +05:00
Awais Jibran
896b3cb170 Do not to run all enrollment updates in a single atomic transaction, but separate. 
ECOM-5405
 2016-09-02 10:31:50 +05:00
Clinton Blackburn
33636db966 Updating user info cookie when user loads the dashboard 
Updating this cookie here helps ensure the marketing site has the most up-to-date enrollment details.

ECOM-4895
 2016-08-31 19:40:00 -04:00
Clinton Blackburn
09f7b6145f Updated logon user info cookie 
- Cookie now includes users' enrollment info
- Removed user email address from cookie
- Refactored functions so that we can update this cookie on other pages
- Added six to ensure new code is compatible with Python 3.x

ECOM-4896
 2016-08-31 19:40:00 -04:00
Clinton Blackburn
2159b71870 Factory Cleanup 
- Corrected import ordering
- Using a constant for the User password

ECOM-4896
 2016-08-31 19:40:00 -04:00
Awais Jibran
e503ef3d03 Improve logging for email sending while registering. 2016-08-30 18:32:25 +05:00
Renzo Lucioni
40ca3efd6c Merge pull request #13272 from edx/release 
Merge release into master
 2016-08-18 12:04:39 -04:00
Renzo Lucioni
de2608009f Fix Unicode error on dashboard 
Programs with Unicode in their name would prevent the dashboard from loading. ECOM-5293.
 2016-08-17 19:21:39 -04:00
Ayub khan
1d83abc7d3 Merge pull request #13164 from edx/shr/bug/ECOM-5140-multiple-refunds-dashboard-page 
Handle MultipleObjectsReturned exception for dashboardpage
 2016-08-15 23:04:03 +05:00
Syed Hassan Raza
3c9b399314 Handle MultipleObjectsReturned exception for dashboardpage 2016-08-15 17:58:20 +05:00
Awais Jibran
72549cf366 Merge pull request #13185 from edx/aj/ECOM5081-hide-credit-btn 
Hide credit button from  audit track students
 2016-08-12 11:53:40 +05:00
Awais Jibran
511de4c606 Hide credit button from audit track students 
ECOM-5081
 2016-08-11 23:20:01 +05:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard 
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
 2016-08-11 09:00:23 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
Ned Batchelder
8571ceabeb Fix many wrong-assert-type errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
eef964f5f6 Fix unused-variable errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8aae7bcee7 Fix redefined-function errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
ef4c69881c Fix literal-used-as-attribute error 2016-08-03 12:44:41 -04:00
Renzo Lucioni
c5434c5310 Merge pull request #13125 from edx/renzo/multiple-program-types 
Allow program listing page to display programs from any category
 2016-08-02 13:11:23 -04:00
Renzo Lucioni
8196e1a024 Allow program listing page to display programs from any category 
This work removes most references to XSeries from the LMS in an attempt to be more general. ECOM-5018.
 2016-08-01 16:47:21 -04:00
Sven Marnach
0206dfaea5 Add support to set initial password hash to manage_user command. 2016-07-29 11:19:07 +02:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming 
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
 2016-07-27 13:55:14 +05:00
Nimisha Asthagiri
1ada5c3487 Create Grades djangoapp 
https://openedx.atlassian.net/browse/TNL-5008
 2016-07-22 00:09:43 -04:00
Robert Raposa
67e15e22e6 Merge pull request #13046 from edx/release 
Release 2016-07-20 back to Master
 2016-07-21 10:43:58 -04:00
Adam Palay
95c0b50ebe authenticate user after their reset confirmation goes through 
make password validation code more DRY

grammar nit: "less" -> "fewer"
 2016-07-20 11:06:58 -04:00
Edward Zarecor
95800be01f Merge pull request #12999 from edx/e0d/random-passwords 
use random rather than unusable so they can be reset
 2016-07-20 09:28:26 -04:00
e0d
8a18b2c351 use random rather than unusable so they can be reset 2016-07-14 08:09:51 -04:00
Awais Jibran
dba8a51f59 Adding logging if course_id is not found in enrolled course modes. 2016-07-14 12:59:38 +05: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
PaulWattenberger
aa078dfda2 Pwattenberger/sailthru enroll (#12816) 
* Partial changes for purchase tracking

* Continued changes for purchase tracking

* Clean up code quality issues

* Clean up code quality issues

* Responses to code review

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix problem processing sailthru_content cookie
 2016-06-28 11:13:21 -04:00
Tasawer Nawaz
e46764f5fc Merge pull request #12820 from edx/tasawer/bugfix/ecom-1730-make-student-enrollment-more-robust 
Make user enrollment more robust
 2016-06-28 12:47:23 +05:00
Sylvia Pearce
ce3da57546 Merge pull request #12783 from edx/sylvia/DOC-2361 
Account registration and activation text string revisions
 2016-06-27 15:01:36 -04:00
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00