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

509 Commits

Author SHA1 Message Date
Douglas Hall
7097e5d02c Merge pull request #13817 from edx/ibrahimahmed443/WL-744-registration-error-message 
Edit error message for Username on registration
 2016-10-26 10:41:45 -04:00
Ibrahim
1459b23456 Edit error message for Username on registration 2016-10-26 14:48:23 +05:00
Ahsan Ulhaq
7368c3428f use reverse 2016-10-25 23:28:09 +05:00
Ahsan Ulhaq
c49f84fa3c parameter next on login page would redirect regardless url safe 
ECOM-5968
 2016-10-25 15:08:40 +05:00
Bill DeRusha
a36df010c0 Fix for UTM parameter tracking when UTM not present 2016-10-17 10:28:47 -04:00
Andy Armstrong
4d4097e13c Move dark_lang and lang_pref apps to openedx/core 2016-10-13 11:56:24 -04:00
Robert Raposa
fea03e466c Move student.views to student/urls.py 2016-10-11 11:41:16 -04:00
Tasawer
1ac94921c3 Show verification expiration message on learner dashboard and allow them to reverify if expiration is X days away. 
ECOM-2979
 2016-10-08 11:32:02 +05:00
Bill DeRusha
a776733d51 Merge pull request #13638 from edx/bderusha/utm-tracking 
Add UTM tracking for registrations
 2016-10-07 17:45:43 -04:00
Nimisha Asthagiri
2112e7f8c8 Merge pull request #13659 from edx/common_cleanup/external_auth 
Moves external_auth from common to openedx/core
 2016-10-07 13:39:21 -04:00
Nimisha Asthagiri
fd49f88e08 Moves external_auth from common to openedx/core. 2016-10-07 12:34:22 -04:00
Bill DeRusha
9877c6ad6e Add UTM tracking for registrations 
Add UTM cookie tracking for registrations.
Add config model for cookie names.

ECOM-5539
 2016-10-07 10:27:57 -04:00
Nimisha Asthagiri
4c0f85b4d9 Move auth_exchange from common to openedx/core. 
Move oauth_dispatch from lms to openedx/core.
 2016-10-06 12:54:39 -04:00
Ahsan
c5d975577a Invalidate access token 
ECOM-4641
 2016-10-03 13:02:52 +05:00
cahrens
e77b5eb3c3 Merge with release. 2016-09-28 09:58:14 -04: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
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
0dedc6ab71 Revert "Updated User Info Cookie" 2016-09-02 17:26: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
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
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
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
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
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
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
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Tasawer
3a984d3ca2 Make user enrollment more robust 
ECOM-1730
 2016-06-27 14:51:09 +00:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Douglas Hall
51d8580982 Fix default from email lookups 2016-06-22 13:54:57 -04:00
Michael Frey
ad45681a53 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-22 13:54:56 -04:00