Commit Graph

2415 Commits

Author SHA1 Message Date
Clinton Blackburn
bfb201ec7d Merge pull request #7822 from edx/clintonb/receipt-page-update
Updated Receipt Page for Oscar
2015-05-02 09:32:11 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
Will Daly
5d16ed46a2 Enrollment API course details include credit modes.
Credit modes are hidden by default, since the user
isn't allowed to select them on the track selection page.
This commit exposes credit modes through the enrollment
API so that consumers can see that a course has a credit
track.
2015-05-01 12:36:30 -04:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
Awais Jibran
3bd45358ab Merge pull request #7753 from edx/aj/tnl1745-change-email-on-dashboard
Fixed change email address error from student dashboard
2015-04-28 11:29:15 +05:00
Mark Hoeber
39cd5cec60 Merge pull request #7791 from edx/markhoeber-doc1904
Updated enrollment api doc for new response fields
2015-04-24 09:23:00 -04:00
Mark Hoeber
568ed781c6 Updated enrollment api doc for new response fields
And cleaned up one doctoring
2015-04-23 15:17:47 -04:00
cahrens
4af79d6f76 Don't event first_name and last_name.
TNL-2044
2015-04-21 16:03:59 -04:00
Will Daly
4df2bd3329 Merge pull request #7756 from edx/will/ecom-1408-take-two
Expose course start/end date in the enrollment API
2015-04-21 10:50:33 -04:00
Calen Pennington
97d9a19052 Merge pull request #7710 from cpennington/relax-context-contract
Fix contract on context argument
2015-04-21 10:01:24 -04:00
Will Daly
fc918fb3d1 Expose course start/end date in the enrollment API 2015-04-21 08:41:42 -04:00
Awais Jibran
1d9499e1ad Fixed change email address error from student dashboard
TNL-1745
2015-04-20 14:36:31 +05:00
Nimisha Asthagiri
a87c881024 MA-612 Mobile Push Notification Studio Django admin setting 2015-04-18 15:30:14 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00
Andy Armstrong
7742735fb0 Event on user preference updates
TNL-1851
2015-04-17 17:23:19 -04:00
cahrens
4797a74e5c Emit events for language proficiencies from the update_account_settings method. 2015-04-17 17:23:18 -04:00
Daniel Friedman
97c43adaa4 Track user settings changed events on User save 2015-04-17 17:23:18 -04:00
Diana Huang
3f20a6f304 Add model change event tracking to UserProfile. 2015-04-17 17:23:18 -04:00
Usman Khalid
da57b13b6d Removed all references to AUTH_ENTRY_DASHBOARD.
TNL-2024
2015-04-17 17:23:17 -04:00
cahrens
938dcce061 Event change_initiated for password and email change requests. 2015-04-17 17:23:16 -04:00
Andy Armstrong
c3a39934a0 Limit the size of the user profile's "bio" field
TNL-1990
2015-04-17 17:23:16 -04:00
muzaffaryousaf
3110cf6bb6 Remove account settings display and editing from dashboard sidebar.
TNL-1516
2015-04-17 17:23:15 -04:00
Usman Khalid
429984efcc Third party auth tests should check account_settings_context().
TNL-1535
2015-04-17 17:23:15 -04:00
Usman Khalid
2667f705ad Enable third party auth from account settings page.
TNL-1535
2015-04-17 17:23:15 -04:00
jsa
bb2599cecd Include profile image version in URLs.
TNL-1860
2015-04-17 17:23:13 -04:00
jsa
1d11345e90 make auto_auth users satisfy PARENTAL_CONSENT_AGE_LIMIT 2015-04-17 17:23:13 -04:00
jsa
46b63164a0 Implement profile_image upload and remove endpoints
TNL-1537

Co-Authored-By: Andy Armstrong <andya@edx.org>
Co-Authored-By: cahrens <christina@edx.org>
2015-04-17 17:23:12 -04:00
Daniel Friedman
97e44ed20f Implement language proficiencies.
TNL-1488
2015-04-17 17:23:12 -04:00
Andy Armstrong
650a9a9b85 Implement parental controls for user profiles
TNL-1606
2015-04-17 17:23:11 -04:00
Daniel Friedman
6f6fdbfb5f Integrate profile images into Accounts API
TNL-1545
2015-04-17 17:23:11 -04:00
cahrens
fad63938e5 New bio field in UserProfile. 2015-04-17 17:23:11 -04:00
cahrens
0a962bf991 Add field that was missing from re-ordered migration 2015-04-17 17:23:11 -04:00
Clinton Blackburn
5b644298fb Merge pull request #7737 from edx/enrollment-api-full-urls
Returning complete URL for Enrollment API user messaging
2015-04-17 17:17:02 -04:00
Jesse Zoldak
b5305147b3 Revert "Expose course start/end date in the enrollment API" 2015-04-17 15:46:55 -04:00
Will Daly
53f4a13f3b Merge pull request #7708 from edx/will/ecom-1411
Expose course start/end date in the enrollment API
2015-04-17 14:23:00 -04:00
Will Daly
3b160eefcb Credit message on track selection page.
* Adds a credit course mode to indicate that a course
has a credit option.

* Hides the credit option from the track selection and
pay-and-verify pages.

* Shows different messaging for the verified track if
it's possible to upgrade from verified to credit at the end
of the course.
2015-04-17 10:59:37 -04:00
Awais
2cd265292f ECOM-1421 implementing the functionality 2015-04-16 21:46:47 +05:00
Will Daly
da8103d2ea Expose course start/end date in the enrollment API 2015-04-15 16:14:30 -04:00
Will Daly
a91d90cbd8 Merge branch 'release' 2015-04-15 16:12:00 -04:00
Calen Pennington
39206948e8 Fix contract on context argument 2015-04-15 15:05:32 -04:00
Clinton Blackburn
cd5039383e Returning complete URL for Enrollment API user messaging
The Enrollment API now returns the complete URL in the user_message_url field. Returning just the path can result in 404s if the consuming code simply redirects to the value of this field without first checking to see if the hostname is included. Using the full URL solves this problem for all clients.
2015-04-15 11:29:54 -04:00
Awais
18282919b5 ECOM-1420 adding new field and migration file. 2015-04-15 12:38:43 +05:00
Clinton Blackburn
e18d69a9e9 Fixed Embargo Bug in Enrollment API
This issue was not found sooner because the test helper used only tested for GeoIP embargoes, and neglected the user profile. An additional test has been added to test for embargoes against the country assigned to the user's profile. Additionally, variable names have been cleaned up--user replaced with username--to avoid confusion in the future.
2015-04-14 22:07:25 -04:00
Awais Qureshi
b8368617e6 Merge pull request #7627 from edx/awais786/ECOM-1183-verification-expiry
ECOM-1183 fixing the
2015-04-13 18:10:40 +05:00
David Ormsbee
03c3bbb379 Merge pull request #6636 from jazkarta/feature-pocs
MIT CCx (was Personal Online Courses)
2015-04-11 11:15:43 -04:00
Carlos de la Guardia
9ddee93401 MIT: CCX. Code Quality fixes
add doc strings; fix pep8 warning
address some minor issues brought up by the code review process
2015-04-10 23:30:26 -04:00
cewing
7f691e4a92 MIT: CCX. Rename POC to CCX
Final official name is Custom Courses for EdX (CCX), rename all code to remove previous name.

Rename the FEATURE constant used to identify this feature

Rename the middleware for the CCX change

rename the constant used for storing the current poc id on the session.

rename the _PocContext threading local

rename the override provider in all places where it is referenced

`PersonalOnlineCoursesOverrideProvider` -> `CustomCoursesForEdxOverrideProvider`

generally rename symbols from overrides.py to replace `poc` with `ccx` where possible without changing model names or attributes

rename more symbols from poc to ccx
rename util functions from app utils module

general symbol renaming poc -> ccx in views.py and related url changes

Rename the coach role wherever it is used.

reword poc_coach to ccx_coach

UI rename

replace POC with CCX globally

template context variable renamed

rename poc_ to ccx_ in urls and all related locations (views, js, scss etc)

remove pocs migrations

Final massive renaming, including models.  Re-built migration.

cleaning up a few tailing references

Fix reference typo in schedule template JS

undo modifications made on the fly in test setup to ensure that our tests are properly isolated from the rest of the system tests.

Fixes jazkarta/edx-platform#38

Clean up some leftover strings and comments

fixing more strings and comments in python files

fix a naming error in the schedule tab that was causing problems in deleting courseware items.

Fixes jazkarta/edx-platform#36

updating tests and utility code to match changes in infrastructure from latest rebase
2015-04-10 23:30:25 -04:00
cewing
0b184881f5 MIT: CCX. Implement display of CCXs in user-facing templates such as dashboard
Show the display name for the POC in the menu for switching.

Remove the MOOC: prefix from the MOOC title to avoid truncation issues.

Incorporate the display name of the POC into the display of course org/number/name at the top of the page in the default theme.

Provide warning on the grading policy page in system warning style.

Provide a PocMembership model api that returns PocMemberships for a user.  Default to active memberships.

Build generator that yields triplets of poc, membership and course for each poc membership a user has.

This is an analog of the `get_course_enrollment_pairs` in common/djangoapps/students/views.py and is used in the student dashboard to provide pocs as options for a student to view.

refactor to use model api instead of inline code.

provide pocs as possible targets for a student to visit from their dashboard.

Unset the current active poc when visiting the dashboard so as to avoid needing to switch active pocs when viewing a plain course.  This ensures we can leave template code for the display of courses unchanged.

Update templates to show pocs in a course-like view on a student's dashboard.

Revert a portion of the template change so that the poc title will still render properly when a poc is being viewed.
2015-04-10 23:28:09 -04:00
cewing
d4a1e99a83 MIT: CCX. Implement auto-enroll for CCX students
Based loosely on course enrollment model

Ensure that registered users are 'active' when they are enrolled in a POC

Respect the 'auto enroll' and 'email students' checkboxes in the UI

Add an auto_enroll flag to the PocFutureMembership model so we can automatically enroll non-users when they have registered and activated their account.

Build a future enrollment using the auto_enroll value from the request so we can ensure that non-existent users can be auto-enrolled

Ensure that any user added by way of the one-at-a-time UI is automatically auto-enrolled

Update tests with email sending to use the flag from the request

Provide api on the PocMembership object to auto-enroll a newly active member in this poc.

This method will delete the passed PocFutureMembership object and will automatically enroll the user in the POC named in that future membership as well as the MOOC from which it was created

Conditionally activate poc memberships that are pending when a new registree first activates their account.
2015-04-10 23:18:39 -04:00
Chris Rossi
a2cb7fd276 MIT: CCX. Implement Custom Courses for Edx.
This feature provides the ability to designate a "coach" who can create customized runs of an existing course, invite students to participate, and manage students through the run of the course.

In this squashed commit we implement the initial scifi, add the 'POC Coach' course role, refine the scifi, add migrations for models, create POCs, enforce POC Coach role, provide panels for Coach Dashboard, set up rudimentary display of course outline, add and remove units, show/hide all units, and save schedule changes, set dates when adding units, edit dates on units already added and provide some tests.

We also provide mechanisms for invitation and enrollment in a POC (to become CCX) and control the display of blocks to students in a POC.
2015-04-10 23:10:48 -04:00