Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2373 Commits

Author SHA1 Message Date
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
Tasawer
3a984d3ca2 Make user enrollment more robust 
ECOM-1730
 2016-06-27 14:51:09 +00:00
Awais Jibran
4f10552add Merge pull request #12834 from edx/aj/ecom4775-change-bulk-enroll-mgm-cmd 
Fix `bulk_change_enrollment` command to emit event
 2016-06-27 17:33:18 +05:00
Awais Jibran
4267666711 Fix bulk_change_enrollment command to emit event 
ECOM-4775
 2016-06-27 11:43:01 +05: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
mdinino
0a7c534d56 Merge pull request #12824 from edx/release 
Release
 2016-06-22 11:31:34 -04: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
Clinton Blackburn
03095643c6 Exposed admin for LogoutViewConfiguration 
ECOM-4610
 2016-06-21 14:13:16 -04:00
Renzo Lucioni
10ad29f33c Merge pull request #12757 from edx/renzo/link-to-detail 
Link program listing cards to detail pages
 2016-06-21 09:37:02 -04:00
Renzo Lucioni
9cd7c93223 Link program listing cards to detail pages 
When program detail pages are enabled, cards on the listing page will link to their respective detail pages. Includes extensive cleanup of program listing tests. ECOM-4227.
 2016-06-20 16:34:57 -04:00
Kyle Crawshaw
47401742a9 Added 'unusable_password' argument to 'manage_user' management command 2016-06-20 11:30:56 -04:00
Clinton Blackburn
8fa3bf327f Merge pull request #12651 from edx/clintonb/single-logout 
Added support for OpenID Connect single logout
 2016-06-15 12:56:50 -04:00
Clinton Blackburn
3f19cc0265 Updated logout view 
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
 2016-06-15 11:11:49 -04:00
Tasawer
eb3517c27e Fixing IntegrityError happened on concurrent requests for course enrollment 
ECOM-1730
 2016-06-15 12:14:03 +05:00
Adam Palay
44636fe62d fix variable ordering issue with error message 2016-06-14 14:39:07 -04:00
PaulWattenberger
f5b42c8955 Initial lms changes for Sailthru (#12706) 
* Initial lms changes for Sailthru

* Fix identified code quality issues

* Fix migration failure

* Fix code quality identified issue
 2016-06-09 16:21:11 -04:00
Calen Pennington
cfd1620703 Merge pull request #12630 from cpennington/dont-leak-current-requests-in-tests 
Dont leak current requests in tests
 2016-06-09 12:03:34 -04:00
Calen Pennington
029f4a5ef5 Use a contextmanager to cleanup after manipulating the current request in email rendering tests 2016-06-09 10:10:39 -04:00
Calen Pennington
71bb7f0ba0 Use a contextmanager to cleanup after manipulating the current request in create_account tests for external auth 2016-06-09 10:10:39 -04:00
Calen Pennington
6760ac44e8 Use a contextmanager to cleanup after manipulating the current request in password_policy tests for external auth 2016-06-09 10:10:39 -04:00
Peter Fogg
3c223d106a Correct destination of management command args. 2016-06-08 15:48:27 -04:00
Peter Fogg
17fb925cd4 Correct help text for the bulk_change_enrollment command. 2016-06-08 09:59:59 -04:00
Calen Pennington
d76f31bc90 Merge pull request #12627 from cpennington/test-certificates-shared-modulestore-test-case 
Don't modify courses inside SharedModuleStoreTestCase test methods in…
 2016-06-06 15:50:47 -04:00
Matt Drayer
c2c2a67753 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-03 13:00:45 -04:00
Calen Pennington
d5eb1ca586 Don't modify courses inside SharedModuleStoreTestCase test methods in test_certificates 2016-06-02 15:47:57 -04:00
Peter Fogg
d7da5f0af1 Merge pull request #12625 from edx/peter-fogg/bulk-change-enrollment 
Add a bulk version of the change_enrollment script.
 2016-06-02 15:23:39 -04:00
Peter Fogg
e6d31acb11 Add a bulk version of the change_enrollment script. 2016-06-02 14:16:08 -04:00
attiyaishaque
47f2f7de0f Set the Email field length is 254 characters. 2016-06-02 17:08:06 +05:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
Clinton Blackburn
8ea3b62016 Added admin for UserAttribute model (#12596) 
ECOM-4502
 2016-05-31 18:22:18 -04:00
Clinton Blackburn
2fd9896ca1 Allowing profile image upload date to be blank (#12601) 2016-05-31 16:46:11 -04:00
Peter Fogg
f7d002e65e Change user attribute for cookies to a constant value. 2016-05-31 11:23:51 -04:00
Ahsan Ulhaq
a8f2de8375 Course Dashboard Visual Update 
ECOM-4398
 2016-05-24 16:17:19 +05:00