Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,462 Commits 1 Branch 0 Tags
95e76dcafe945b62dc7bbaebde1a32434002464a
Commit Graph

4031 Commits

Author SHA1 Message Date
zubair-arbi
7504be1c67 Remove username from force syncing in third party auth pipeline 2018-01-01 16:24:03 +05:00
John Eskew
c7671b75e5 Merge pull request #17036 from edx/jmbowman/PLAT-1863 
PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9
 2017-12-27 14:26:50 -05:00
Jeremy Bowman
bd9c7a082e PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9 2017-12-22 16:53:01 -05:00
Brian Mesick
4ceba7ad64 Merge branch 'master' into bmedx/django111_httpretty_0814 2017-12-22 16:25:25 -05:00
Brian Mesick
5acb0f989b Merge pull request #16989 from edx/bmedx/django111_update_is_authenticated 
Remove unnecessary patches to User::is_authenticated
 2017-12-22 15:39:23 -05:00
bmedx
6ece1708a6 Make sure httpretty usage cleans up after itself 2017-12-22 15:36:46 -05:00
bmedx
23503f5226 Fix test issues with new httpretty 2017-12-22 15:36:45 -05:00
bmedx
b5d6fca44e Update is_authenticated patches to work with Django 1.10+ 2017-12-22 13:22:49 -05:00
Michael LoTurco
f5bc89f1b5 Only upgrade active enrollments for entitlements 2017-12-22 10:25:07 -05:00
Matt Tuchfarber
486f9578b7 Merge pull request #16856 from open-craft/mtyaka/template-block-overrides 
Allow theme template block overrides.
 2017-12-22 09:14:02 -05:00
Douglas Hall
f6e0c70232 Merge pull request #16987 from edx/douglashall/ENT-779_remove_tpa_flag_refs 
ENT-779 Remove code references to ProviderConfig.drop_existing_session.
 2017-12-22 09:07:08 -05:00
zubair-arbi
d7502acc5b ENT-768 
display friendly error message for saml rejection
 2017-12-22 15:12:11 +05:00
Chandrakant Gopalan
f6f29ca49e Allow theme template block overrides. 
This allows an overridding template from a theme to inherit from the
same corresponding standard template.

This is useful when you only want to override one or more named blocks,
but otherwise make no modifications to the standard template.
 2017-12-22 09:41:35 +01:00
Douglas Hall
d8494483c1 ENT-779 Remove code references to ProviderConfig.drop_existing_session. 
We no longer need the drop_existing_session flag on IdP configurations
because dropping the existing session should actually be the only
behavior for certain view in the edx-enterprise code.
 2017-12-21 14:39:46 -05:00
Harry Rein
173e7675bc Merge pull request #16990 from edx/HarryRein/upgrade-or-unpublished-runs-only 
Don't show unpublished or un-upgradable seats in available sessions.
 2017-12-21 12:58:56 -05:00
Harry Rein
cd892e51d2 Don't show unpulished or un-upgradable seats in available sessions. 2017-12-21 11:35:19 -05:00
Jeff LaJoie
0183913fa4 Merge pull request #16996 from edx/jlajoie/LEARNER-3638 
LEARNER-3638: Fixes expiration issues for learners who upgrade late
 2017-12-21 11:18:59 -05:00
Michael Terry
f303fd3f5c Merge pull request #16817 from mikix/mikix/entitlement-expiration 
Add expire_old_entitlements command
 2017-12-21 11:04:10 -05:00
Jeff LaJoie
14986264d9 LEARNER-3638: Fixes expiration issues for learners who upgrade late into a course 2017-12-21 10:44:02 -05:00
Michael Terry
dbc7b89452 Merge pull request #16978 from edx/mikix/editable-course-run 
Avoid a dropdown for course runs
 2017-12-20 11:33:43 -05:00
Anthony Mangano
0cb6bad7ca Merge pull request #16971 from edx/fix-for-LEARNER-3482 
Ensure enrollment_end is parsed to datetime prior to making comparisons
 2017-12-20 10:52:57 -05:00
Michael Terry
1650813d17 Avoid a dropdown for course runs 
Entitlement detail pages in django admin normally show a dropdown
button for the enrollment_course_run field. But on stage, that can
cause a timeout because the enrollment database is so large.
So instead, just show it as a raw id field.
 2017-12-20 10:26:46 -05:00
McKenzie Welter
a4d23eaea9 include email settings in fulfilled entitlement action items 2017-12-20 08:57:27 -05:00
Anthony Mangano
47287de409 ensure enrollment_end is parsed to datetime prior to making comparisons 2017-12-19 16:22:25 -05:00
Michael LoTurco
f0ab07a154 Upgrade audit enrollments on entitlement purchase 
Adds check for existing upgradeable enrollment on user entitlement
creation, if single upgradeable enrollment is present, upgrades enrollment
to entitlement mode and links the entitlement to the upgraded enrollment

LEARNER-3579
 2017-12-19 14:54:10 -05:00
Jeff LaJoie
e063a8bdd8 Merge pull request #16952 from edx/jlajoie/LEARNER-3482 
LEARNER-3482: Do not show sessions past their enrollment end
 2017-12-19 12:53:12 -05:00
Jeff LaJoie
23dbc611fe Filters for only course runs that have an enrollment end date in the future or don't have one 2017-12-19 10:59:10 -05:00
Harry Rein
908c769ae3 Update entitlement card to use Change or Leave Session. 
LEARNER-3646
 2017-12-19 10:26:17 -05:00
Jeremy Bowman
1dbdee9c54 Revert "PLAT-1858 Better capture of deprecation warnings" 2017-12-18 21:18:02 -05:00
Harry Rein
5e2c3e4bf5 Merge pull request #16933 from edx/HarryRein/LEARNER-3636-dont-show-expired-entitlements-unenrolled 
Do not show expired, unfulfilled entitlements on dashboards.
 2017-12-18 16:26:43 -05:00
Jeremy Bowman
0e52b4581f Merge pull request #16915 from edx/jmbowman/PLAT-1858 
PLAT-1858 Better capture of deprecation warnings
 2017-12-18 16:23:58 -05:00
Michael Terry
e32ff53f5f Merge pull request #16935 from edx/mikix/expired-rel-programs 
Show programs for expired entitlements
 2017-12-18 15:51:06 -05:00
Harry Rein
75aa736dcf Do not show expired, unfulfilled entitlements on course/programs dashboard. 
LEARNER-3636
 2017-12-18 15:16:35 -05:00
Matthew Piatetsky
6ea32b7ae6 Merge pull request #16923 from edx/LEARNER-3557 
LEARNER-3557 Add is_enterprise cookie on login page to be checked on basket page
 2017-12-18 15:00:44 -05:00
Jeremy Bowman
b26fe5fd24 PLAT-1858 Better capture of deprecation warnings 2017-12-18 14:59:05 -05:00
Michael Terry
4fe60eb1e4 Show programs for expired entitlements 
The dashboard was not showing related programs for expired but
fulfilled entitlements.

LEARNER-3608
 2017-12-18 14:41:20 -05:00
Matthew Piatetsky
4a2262967f Add is_enterprise cookie on login page to be checked on basket page 2017-12-18 13:51:37 -05:00
Matthew Piatetsky
dd8e879e79 Merge pull request #16892 from edx/LEARNER-3072 
LEARNER-3072 Add bundle purchase button to course dashboard
 2017-12-18 10:54:55 -05:00
Saleem Latif
86da9c1c63 Disable linking of personal accounts to enterprise customers via SSO 2017-12-18 15:12:42 +05:00
Albert (AJ) St. Aubin
365b4fb312 Merge pull request #16920 from edx/aj/add_is_expired_check_to_policy 
Aj/add is expired check to policy
 2017-12-15 12:42:45 -05:00
Albert St. Aubin
3fbb1571df Update to policy check utilities for Course Entitlements 2017-12-15 11:32:33 -05:00
Harry Rein
4cccfca8dc Merge pull request #16834 from edx/HarryJeff/LEARNER-3304-policy-front-end 
Policy Front end on the Course Dashboard
 2017-12-15 09:27:04 -05:00
Harry Rein
610c255bb6 Display the expired at logic for entitlements. 
LEARNER-3304

Displays the expired out status for the course dashboard and the programs pages.
 2017-12-15 08:25:38 -05:00
Albert (AJ) St. Aubin
31e8b67999 Merge pull request #16913 from edx/aj/LEARNER-2668_api_changes_post 
Minor fixes and code changes to the Entitlement Refund API
 2017-12-15 07:47:05 -05:00
Matthew Piatetsky
000bbaf02f Add bundle purchase button to course dashboard 2017-12-14 17:06:52 -05:00
Jeremy Bowman
7ba83dd533 Merge pull request #16908 from edx/jmbowman/PLAT-1847 
PLAT-1847 Fix cms tests under Django 1.9
 2017-12-14 13:49:55 -05:00
Albert St. Aubin
d6feff0ade Minor fixes and code changes to the Entitlement Refund API 
[LEARNER-2668]
 2017-12-14 09:46:47 -05:00
Albert (AJ) St. Aubin
8c205ad84c Merge pull request #16877 from edx/aj/LEARNER-2668_api_changes 
Entitlement API Changes to support User Revoke and Refund
 2017-12-14 07:16:01 -05:00
Waheed Ahmed
67752c39cc Merge pull request #16305 from edx/waheed/LEARNER-2730-text-me-the-app 
Create custom Text Me The App landing page.
 2017-12-14 12:50:00 +05:00
Jeremy Bowman
d44e6297ae PLAT-1847 Fix cms tests under Django 1.9 2017-12-13 15:29:02 -05:00