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

5589 Commits

Author SHA1 Message Date
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
Albert St. Aubin
1d7443221d Entitlement API Changes to support User Revoke and Refund 
[LEARNER-2668]

These changes will support a user intiated Revoke and Refund of
an Entitlement. This includes unenrolling the User from
any related Course Runs they are currently enrolled in.
 2017-12-13 13:37:14 -05:00
Michael Terry
4b25ffa39d Add expire_old_entitlements command 
This new management command will search for possible entitlements
that are languishing in the database and expire them if they can
be according to our policy.

This is meant to be run on a regular basis to clear out old
entitlements.

LEARNER-3087
 2017-12-13 11:11:55 -05:00
Matt Drayer
931fd8a537 Merge pull request #16886 from edx/mattdrayer/ENT-807 
ENT-807: Utilize configured user for SuccessFactors BizX OData API callbacks
 2017-12-13 10:26:54 -05:00
Waheed Ahmed
efe4120b8f Create custom Text Me the App landing page. 
Rebrand the branch.io text me the app landing page to reflect edX's style.

LEARNER-2730
 2017-12-13 17:10:32 +05:00
Matt Drayer
885ddb9977 Utilize configured user for SuccessFactors BizX OData API callbacks 2017-12-12 15:23:05 -05:00
Harry Rein
2711fb521a Allowing a user to fulfill their entitlement on the programs dashboard. 
LEARNER-3438

The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the programs dashboard.
 2017-12-12 10:35:26 -05:00
Michael Terry
25076e6a92 Show related programs when unenrolled 
On the course dashboard, show related programs to your course
even if you are not enrolled in a current session.

LEARNER-3504
 2017-12-11 14:52:36 -05:00
McKenzie Welter
853cd9a0a7 show programs in which user holds a course entitlement on programs listing page 2017-12-11 12:22:36 -05:00
Sven Marnach
02ddf4d321 Merge pull request #16166 from open-craft/smarnach/filter-course-enrollment-allowed 
Add search box to CourseEnrollmentAllowed admin interface.
 2017-12-11 13:57:24 +01:00
uzairr
8ffac2061d Verify 'Full Name' field does not allow HTML in Signup form 
'Full Name' field in the signup form is allowing HTML as an input
which makes spoofing easily.To avoid it, validation is added
that will ensure 'Full Name' field does not allow HTML.

LEARNER-3385
 2017-12-08 19:18:18 +05:00
McKenzie Welter
5d1eecd43c python tests, quality, and html element type fix 2017-12-07 13:50:24 -05:00
Albert St. Aubin
28837c020f Allowing a user to fulfill their entitlement on the course dashboard. 
The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the course dashboard.
 2017-12-07 12:41:12 -05:00
Albert (AJ) St. Aubin
292848cfe7 Merge pull request #16617 from edx/aj/entitlement_session_backend 
Aj/entitlement session backend
 2017-12-07 12:05:17 -05:00
Albert St. Aubin
0ea3753d94 Added Entitlement enroll and unenroll logic to the Enrollment API 
[LEARNER-3136]

This commit containts the logic and API endpoint for a user to Enroll,
Unenroll, and switch-session on a Course Entitlement.
 2017-12-07 10:54:59 -05:00
Ari Rizzitano
8b59c6d596 Merge pull request #16639 from edx/ari/react-renderer 
mako/react bridge code
 2017-12-06 11:12:24 -05:00
Jeff LaJoie
a567719236 LEARNER-2983: Adding of helper functions and modification of DRF to use SiteConfiguration policy 2017-12-06 08:36:21 -05:00
Ari Rizzitano
8ca0fe9dfc introduce ReactRenderer module and renderReact mako def 
[FEDX-453]

[extreme wip] mako/react bridge code [FEDX-453]

more attempts

split out entry points into separate file

this works!

kill dynamic import

error handling

didn't need webpack_static

handle passing props

cleanup django-template-rendering defs

pytest monkeypatch fix

cleanup

add id arg to renderReact def

more cleanup

oops

quality xss fixes

unittest fix

kill HelloWorld
 2017-12-05 17:53:46 -05:00
John Eskew
d4667691fb Convert final field from CommaSeparatedIntegerField to CharField. 2017-12-05 16:47:23 -05:00
Jeremy Bowman
103c723c6d PLAT-1801 Preserve new user login behavior under Django 1.10+ 2017-12-05 10:20:25 -05:00
Brian Mesick
d905899873 Merge pull request #16760 from edx/bmedx/django111_remove_noargscommand 
Update clear_collectstatic_cache management command to Django 1.11 spec
 2017-12-04 14:19:44 -05:00
Albert (AJ) St. Aubin
48c40cf05e Merge pull request #16751 from edx/aj/stafF_entitlement_permissions 
Updates to the API Endpoint to remove the Staff users ability to get all
 2017-12-04 14:08:56 -05:00
bmedx
29514cc2d2 Update clear_collectstatic_cache management command to Django 1.11 spec 2017-12-04 13:05:33 -05:00
Eric Fischer
2e3f871c12 Memoize common lookups during request 
Prevents repeated memcached lookups on functions whose values should
remain static for the lifetime of a request.

EDUCATOR-1731
 2017-12-04 11:54:50 -05:00
Jeremy Bowman
067785dbfd Merge pull request #16710 from edx/jmbowman/PLAT-1419 
PLAT-1419 Make edxmako a proper template backend
 2017-12-04 11:07:30 -05:00
Albert St. Aubin
dfa7b73a61 Updates to the API Endpoint to remove the Staff users ability to get all 
Entitlements
 2017-12-04 08:37:15 -05:00
Farhanah Sheets
d0687e97b1 Merge pull request #16734 from edx/fsheets/EDUCATOR-1825 
Update studiofrontend to pass generic studioContext
 2017-12-01 19:02:33 -05:00
Farhanah Sheets
e395e78521 Update to use generic studioContext configuration 2017-12-01 17:55:55 -05:00
Jeremy Bowman
fdc50c3aa8 PLAT-1419 Make edxmako a proper template backend 2017-12-01 17:01:52 -05:00
Matt Drayer
61bd579810 mattdrayer/ENT-783: Remove city from SuccessFactors OData API requests 2017-12-01 13:27:57 -05:00
Jesse Zoldak
9c49c10b27 Revert "Allow theme template block override" 2017-11-30 17:09:13 -05:00
Brian Mesick
3951b7527c Merge pull request #16658 from edx/bmedx/django111_tag_test_failures_lms_3 
Tag LMS Unit 3 tests that fail in Django 1.11
 2017-11-30 16:14:18 -05:00
Anthony Mangano
f72cf800e1 Consider user entitlements and use entitlement products in bundle one-click purchase 2017-11-30 13:59:46 -05:00
Uman Shahzad
37844fd927 Merge pull request #15947 from open-craft/allow-theme-template-block-override 
Allow theme template block override
 2017-11-29 22:25:27 +05:00
Albert (AJ) St. Aubin
8bd9c14f0b Merge pull request #16660 from edx/aj/entitlement_api_permissions 
Updated the permissions to all non staff users to get their entitlements
 2017-11-29 07:28:33 -05:00
Uman Shahzad
53fea6a4b7 Merge pull request #16624 from open-craft/uman/force-sync-learner-data 
[ENT-759] Add a TPA pipeline step to take forced sync into account.
 2017-11-29 17:11:29 +05:00
Uman Shahzad
ee09c4ccf9 Add a TPA pipeline step to allow force sync of user details. 
The feature is controlled by a switch on the provider.
Emails are sent if the email changes during the sync.
We skip syncing the username/email if there would be a conflict.
 2017-11-29 16:16:55 +05:00
Albert St. Aubin
dbbe52abbd Updated the permissions to all non staff users to get their entitlements 
[LEARNER-3084]
 2017-11-28 11:25:38 -05:00
Sven Marnach
b77bff4d96 Small fixes to support Okta SSO. 2017-11-28 16:50:53 +01:00
bmedx
ace88e7d5a Tag LMS Unit 3 tests that fail in Django 1.11 
Fixed some url reverse errors instead of marking since they were trivial
 2017-11-22 15:48:00 -05:00
bmedx
d3e6836d9e Fixes to common/openedx tests that reference apps CMS doesn't use 2017-11-22 15:46:06 -05:00
Calen Pennington
48abc492ae Fix linting errors from https://github.com/edx/edx-platform/pull/16615 2017-11-22 14:47:49 -05:00
Ned Batchelder
a2e2aace82 Merge pull request #16650 from edx/nedbat/fix-unused-imports 
Fix a number of unused-import pylint violations
 2017-11-22 11:17:07 -05:00