Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

4251 Commits

Author SHA1 Message Date
Nimisha Asthagiri
406daa513b Move get_grades management command from student to grades app. 2016-10-06 10:34:24 -04:00
John Eskew
fab11b90d7 Move monkey_patch to openedx.core.djangoapps. 2016-10-06 10:16:14 -04:00
Brandon DeRosier
ec6c924b7c Fixed site keying for SAMLConfigurationsfor SAML management command 2016-10-03 10:26:25 -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
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
Douglas Hall
f806f3a165 Merge pull request #13474 from open-craft/bdero/site-sso 
ENT-16 Make SSO configurable per Site
 2016-09-26 14:54:40 -04:00
Douglas Hall
d1a3af9460 Merge pull request #13526 from edx/douglashall/JER-157/allow_for_site_override_of_mktg_urls_setting 
JER-157 Allow for per-Site override of MKTG_URLS setting
 2016-09-26 14:01:36 -04:00
Brandon DeRosier
3dcf689ee2 Implement Site settings for Third Party Auth providers 2016-09-26 12:43:00 -04:00
Jesse Shapiro
6b9b34886c Merge pull request #13537 from open-craft/haikuginger/adjust-saml-expiration-type 
[ENT-23] Convert SAML cache expiration to timezone-aware datetime.datetime
 2016-09-26 12:33:23 -04:00
Jesse Shapiro
45bca67f79 Set up type conversion in third_party_auth to allow cacheDuration attribute to work 2016-09-26 10:28:39 -04: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
Douglas Hall
1d1952c8d3 Added SiteMixin for tests that need to test Site specific functionality 2016-09-23 15:57:08 -04:00
Brandon DeRosier
cdf413bda2 Disambiguate queryset extensions for ConfigurationModels 
This change disambiguates the use of `id` in the
ConfigurationModelManager queryset extensions. This is required
when specifying KEY_FIELDS where there is more than one key and
at least one of them is a ForeignKey. The table must be specified
in this case because the query extension may be appended to the
WHERE clause of queries selecting `id` fields from multiple tables
via an INNER JOIN clause.
 2016-09-23 13:47:06 -04: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
Matjaz Gregoric
977e664afe Don't fail if platform name contains non-ascii characters. 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
Douglas Hall
8f6182aabf Allow for site override of MKTG_URLS setting in index view 2016-09-22 15:58:27 -04: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
cca19c321e Merge pull request #13442 from edx/tnl/enrollment_queries_cache 
Cache Enrollment state for (user, course) in request cache
 2016-09-12 16:46:36 -04:00
Nimisha Asthagiri
5822919549 Cache Enrollment state for (user, course) in request cache. 2016-09-12 15:56:03 -04:00
Matjaz Gregoric
8dc84bec3a Enable discussions on CCX courses. 
Discussion is restricted to the CCX course (there is no sharing of
discussions with the parent course or other CCX instances).
 2016-09-12 09:51:05 +02:00
Jesse Shapiro
ce2ab5b15c Adding 'visible' field for SSO providers 2016-09-08 11:27:09 -04:00
Renzo Lucioni
948c1bd8ae Merge pull request #13408 from edx/renzo/display-catalog-micromasters 
Retrieve marketable MicroMasters from the catalog service
 2016-09-08 09:47:20 -04:00
Renzo Lucioni
37523939f2 Retrieve marketable MicroMasters from the catalog service 
Catalog-based MicroMasters need to be displayed in the LMS. However, the LMS currently retrieves all program data from the soon-to-be-retired programs service. Consuming program data exclusively from the catalog service is out of the question right now; it's too complex to confidently pull off in a week. This is a functional middle ground introduced by ECOM-5460. Cleaning up this debt is tracked by ECOM-4418.
 2016-09-07 17:44:54 -04:00
Matt Drayer
e53721433f Merge pull request #13413 from edx/release 
Merge release back to master
 2016-09-07 11:30:24 -04:00
Braden MacDonald
8bf9b188a5 Add optional "debug mode" w/ detailed logging for SAML IdPs 2016-09-06 15:27:45 -07: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
40110b3171 Revert "Updated User Info Cookie" 2016-09-02 17:28:34 -04:00
Clinton Blackburn
0dedc6ab71 Revert "Updated User Info Cookie" 2016-09-02 17:26:00 -04:00
Ehtesham
1b960e3e17 requiring codemirror compressed with all addons included 2016-09-02 21:40:20 +05: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
Peter Desjardins
e276ae2d36 Adds a context-sensitive link to learner documentation from the LMS. The base URL defaults to Open edX learner doc and can be overridden with the base URL for edx.org learner doc. Also relabels the tab for support from help to support. 2016-09-01 10:56:09 -04: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
John Eskew
43834839b1 Quality fixes and unicode strings for logs. 2016-08-25 13:43:51 -04:00
John Eskew
db25725f32 Log when OpaqueKeyField detects trailing newline to/from DB. 
Correct the key when reading from DB into a key object.
 2016-08-25 12:24:21 -04:00
Chris Rodriguez
b5efcc15f5 AC-530 fixing link-href ignores in the platform 2016-08-19 10:04:40 -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