Commit Graph

5589 Commits

Author SHA1 Message Date
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
Martyn James
d54cb3b962 Merge pull request #7648 from edx/mjames/AboutExtra
Updated course_about API to include additional information
2015-04-10 13:48:49 -04:00
Awais
b464542e63 ECOM-1183 fixing the 2015-04-10 19:40:48 +05:00
Martyn James
bf9d1ef137 Updated course_about API to include additional information 2015-04-10 10:27:34 -04:00
zubair-arbi
2c10eeb3aa update track selection page, use only min price for course modes
ECOM-1228
2015-04-10 11:53:31 +05:00
Christine Lytwynec
05a8e23d57 Merge pull request #7633 from edx/release
Release
2015-04-08 15:40:45 -04:00
Adam Palay
d9a21bdf4d use email context for keyword substitution, cutting down on db queries (TNL-1591) 2015-04-08 11:22:26 -04:00
Syed Hassan Raza
825aaed67f Split course's assests can access through '/' in asset url 2015-04-08 11:22:25 -04:00
Chris Dodge
31f2e42c02 be sure to take platform_name from microsite config paths in the dashboard
add some more microsite aware config checks
2015-04-08 10:07:47 -04:00
Piotr Mitros
cd8147cbde Merge pull request #7451 from edx/pmitros/disable-email-auth
Make e-mail activation optional
2015-04-06 20:38:51 +03:00
Piotr Mitros
c656998e8d Make e-mail activation optional 2015-04-06 12:50:18 -04:00
Will Daly
645f9c2c7a Add proxy to allow IE9 to make xdomain requests
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
2015-04-03 11:41:31 -04:00
Renzo Lucioni
a8c8863409 Update SKU field help text and verbose name 2015-04-03 11:24:19 -04:00
Adam
9ad4b71688 Merge pull request #7572 from edx/release
Release
2015-04-02 17:24:50 -04:00
Will Daly
464bcf336e Show certificates for all verified modes 2015-04-02 11:21:54 -04:00
Will Daly
bedba6a600 Merge pull request #7529 from edx/will/cors-iframe-proxy
Add proxy to allow IE9 to make xdomain requests
2015-04-01 14:18:42 -04:00
zubair-arbi
1f9ead5d46 Merge pull request #7547 from edx/zub/bugfix/ecom-1273-enrollment-api-catch-NoneType-courses
log and ignore invlaid/deleted courses in Enrollment API
2015-04-01 19:23:40 +05:00
Will Daly
fcc5b1e347 Add proxy to allow IE9 to make xdomain requests
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
2015-04-01 09:16:42 -04:00
zubair-arbi
ec2f4dc2fe Merge pull request #7523 from edx/zub/bugfix/ecom-579-change-education-level-option-label
change education level option label to read "Associate" degree
2015-04-01 17:17:58 +05:00
zubair-arbi
a9b13f0e72 log and ignore invlaid/deleted courses in Enrollment API
ECOM-1273
2015-04-01 16:26:24 +05:00
Matt Drayer
cbf336e8e0 Merge pull request #7293 from edx/ziafazal/access-gating-for-entrance-exam
Entrance exam gating
2015-03-31 13:38:00 -04:00
Zia Fazal
cc04bb990e Add new gating logic to restrict users from accessing courseware when an entrance exam is required
- added entrance exam check on course info
- staff can by pass gating and added tests
- refined gating logic
- changes after rebasing with Asad's branch
- check ENTRANCE_EXAMS feature is enabled
- updated test to reflect new logic
- catering anonymous user in entrance exam permission
- fixed broken tests
- change after feedback on 16/3
- fix for a broken test
- created new entrance_exams module
- fixed quality error and improved test coverage
- put get_required_content back in milestones helper
- Refactored entrance exams logic
- Refactored tabs logic
- Fixed broken unit test
- changes after feedback from dan-f on 3/27
- removed unnecessary user.is_anonymous check
- Addressed PR feedback
- Addressed commit-specific feedback
- Rework guard clauses
- Add coverage for course info case
2015-03-31 12:12:04 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical
Convert Vertical XModule to pure Vertical XBlock.
2015-03-31 11:10:22 -04:00
Calen Pennington
a0bae0c794 Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock 2015-03-31 09:43:52 -04:00
Marco Morales
bd5b0b31a0 Matt - javascript and test changes, Marco - styling feedback from initial reviews 2015-03-31 08:47:17 -04:00
zubair-arbi
d0126959fc change education level option label to read "Associate" degree
ECOM-579
2015-03-31 13:31:16 +05:00
Calen Pennington
b50876fc32 Make XBlockToXModuleShim use json-init-args to record the XModule constructor to shim to 2015-03-30 16:37:53 -04:00