Commit Graph

2107 Commits

Author SHA1 Message Date
Fred Smith
cc0789a104 Merge pull request #6355 from edx/release
Release
2014-12-23 08:32:58 -05:00
Will Daly
30549bd7ad Send the user to the login page if registering with a linked but inactive account 2014-12-22 13:23:29 -05:00
Renzo Lucioni
c42c2573b0 Merge pull request #6259 from edx/renzo/split-verification-payment-hookup
Hook up new payment and verification flow
2014-12-19 13:29:13 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release
Release
2014-12-19 13:23:22 -05:00
Nimisha Asthagiri
ad7a67da2b Update segment.io shim for mobile event syntax change. 2014-12-19 12:39:39 -05:00
Stephen Sanchez
0e58e7cb23 Merge pull request #6216 from edx/sanchez/cleanup-restful-layer
Enrollment API Cleanup
2014-12-18 11:00:23 -05:00
stephensanchez
22a18e350d Updating the design of the DRF views for enrollments.
Consolidate PUT and POST on the RESTful Layer.

Change URLs for API

Test cleanup.

Adding a course details URL to the enrollment API.

Change student to user

Change to v1, remove feature flag from API URLs

Updating student to user in tests

Re-ordering redirect urls to be evaluated last.

Adding pagination and testing.

Adding Django REST settings for pagination.

Revert "Re-ordering redirect urls to be evaluated last."

This reverts commit 4c9502daa383e49b46f8abec5456c271e5e24ccb.

Re-ordering redirect urls to be evaluated last.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding Django REST settings for pagination."

This reverts commit 9f8a54c41f34caa24818c88f1e75ac59f6ce5259.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding pagination and testing."

This reverts commit 0b2d46262abb78f5ad170700205e7fd28b6af942.

Additional testing, logging, and error messages.
2014-12-18 15:39:01 +00:00
Afzal Wali
872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased 2014-12-17 16:19:06 -05:00
Renzo Lucioni
a268c91236 Hook up new payment/verification flow to dashboard, track selection page, and upgrade 2014-12-16 23:32:17 -05:00
Ben Patterson
a0629003ae Merge pull request #6240 from edx/benp/fix-analytics-init
Mock out the underlying segment-io call.
2014-12-15 13:44:54 -05:00
Nimisha Asthagiri
0687a62a8f Add back end for Studio video upload feature
This feature allows upload of video assets to S3. This requires that the
VIDEO_UPLOAD_PIPELINE setting be properly configured and that each
course be configured with a token issued by the media team for their
processing purposes (e.g. linking the video with a YouTube channel).

Co-authored-by: Greg Price <gprice@edx.org>
2014-12-15 13:09:59 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -05:00
Ben Patterson
7be7b50ba9 Mock out the underlying segment-io call.
TE-532
2014-12-12 21:47:43 -05:00
Calen Pennington
ccbff2dafc Make a generic django field for storing OpaqueKey classes 2014-12-12 21:45:21 -05:00
David Baumgold
3bcf18dd59 Merge pull request #6153 from edx/db/update-pep8
Update pep8 to 1.5.7
2014-12-12 15:00:13 -05:00
Sarina Canelake
2e5b96768a Merge pull request #5449 from Stanford-Online/njdup/bulk_emails_keyword_sub
Implements keyword sub feature for bulk emails
2014-12-12 12:57:21 -05:00
David Baumgold
08a8afa619 For methods on PasswordHistory, only calculate if necessary
Check settings.FEATURES["ADVANCED_SECURITY"] first
2014-12-12 11:53:02 -05:00
Afzal Wali
51e53587dc WL-105 Show course cards sorted by start dates, oldest first. 2014-12-11 20:05:04 -05:00
njdup
32bbb0e71a Implements keyword sub feature for bulk emails
This commit pulls in changes from #4487 that implements keyword
substitution for bulk emails. With these changes, an instructor can
include keywords in their bulk emails which will be automatically substituted
with the corresponding value for the recepient of the email. Keywords are
of the form %%keyword%%, and the keywords implemented in this commit include:

%%USER_ID%% => anonymous_user_id
%%USER_FULLNAME%% => user profile name
%%COURSE_DISPLAY_NAME%% => display name of the course
%%COURSE_END_DATE%% => end date of the course

Client-side validations have also been implemented to ensure that only emails
with well-formed keywords can be sent.
The architecture is designed such that adding in new keywords in the future
would be relatively straight-forward.
2014-12-11 15:03:29 -08:00
David Baumgold
4152f5e4e8 Address pylint issue from diff-cover 2014-12-11 13:09:23 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
John Jarvis
93f0c75fd3 Adding yaml_config, a new settings module
This reads configuration directly from yaml
and imports it directly into settings
2014-12-10 16:46:12 -05:00
cahrens
07b036f380 Return the filename as returned from default storage's save.
It might be different from the requested filename.
2014-12-10 15:23:56 -05:00
Andy Armstrong
0836a89636 Merge pull request #6189 from edx/andya/fix-masquerade
Fix Mako templates to always use updated request context
2014-12-10 11:39:29 -05:00
Christina Roberts
77f5d90d6a Merge pull request #5961 from edx/dan-f/cohort-csv-upload
Upload CSV file for cohorting students
2014-12-10 11:04:14 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File.
TNL-735
2014-12-10 09:23:04 -05:00
Andy Armstrong
4d75c18098 Fix Mako templates to use latest request context
Fixed the edX middleware to lazily create request
context for Mako templates, so that it is based on
any changes made to the request object.

Verified that with this fix the "Instructor" tab is
correctly hidden when a staff member is viewing
the course as a student.
2014-12-09 23:38:31 -05:00
Ben Patterson
cdca3fcbc2 Merge pull request #6208 from edx/clintonb/release-fix
Corrected Import Statement
2014-12-09 21:29:46 -05:00
Ben Patterson
6e1471edc4 Fix import statement. 2014-12-09 21:20:00 -05:00
Nimisha Asthagiri
c6f991fc8f Merge pull request #6172 from edx/mobile/update-analytics
MA-157 Move context back into properties.
2014-12-09 20:25:06 -05:00
Clinton Blackburn
947064f6ab Corrected Import Statement 2014-12-09 20:19:00 -05:00
Nimisha Asthagiri
a6003991a5 MA-157 Mobile analytics end-to-end.
Move app-generated context back into properties.
Ignore BI events through segment's webhook.
Ignore events without Data in Properties.
2014-12-09 18:44:06 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release'
Release 2014-12-10
2014-12-09 17:39:17 -05:00
chrisndodge
099d02d13d Merge pull request #6124 from edx/muhhshoaib/WL-164
Unpurchased items in the shoppingcart should be removed if the enrollment period has closed
2014-12-09 09:25:46 -05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed
changed the url name to verify_cart and change the color of the message in the shopping cart
2014-12-09 12:20:37 +05:00
Clinton Blackburn
97bc506b45 Merge pull request #6179 from edx/sanchez/email_optin_third_party
3rd-party pipeline supports updating email optin
2014-12-08 14:56:30 -05:00
Clinton Blackburn
71bc536c6d Merge pull request #6183 from edx/renzo/email-opt-in-copy
Improved support for multiple organization names
2014-12-08 14:55:06 -05:00
stephensanchez
7ab0cb0730 3rd-party pipeline supports updating email optin
Fix all the 3rd party auth scenarios.

Update pipeline to preserve parameters.

Updating tests
2014-12-08 19:52:06 +00:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware
Cohorted courseware
2014-12-08 14:38:30 -05:00
Renzo Lucioni
1d1baa5009 Improved support for multiple organization names
Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
2014-12-08 14:10:09 -05:00
Ben Patterson
89397d00f9 Revert "Jarv/config refactor wip" 2014-12-08 13:40:49 -05:00
John Jarvis
cc6111181d Merge pull request #6096 from edx/jarv/config-refactor-wip
Jarv/config refactor wip
2014-12-08 13:19:29 -05:00
Will Daly
23a51a6515 Add email opt in to old login and register pages 2014-12-08 09:29:16 -05:00
Xavier Antoviaque
f561e79a3e Merge pull request #6033 from edx-solutions/content-libraries
Modulestore Support for Content libraries (Part of SOL-1, SOL-2, SOL-3)
2014-12-08 10:31:15 +01:00
John Jarvis
c711ed5091 moving the convert_tokens function to a common file 2014-12-05 14:00:25 -05:00
Will Daly
1c6d197bd0 Merge pull request #6156 from edx/will/revert-logistration-enablement
Revert enable login/registration
2014-12-05 13:06:44 -05:00
Don Mitchell
3e1e4a4b25 Merge pull request #6123 from mitocw/bdero/move-course-role-check-to-student
Moved has_course_access from CMS to student.auth (common)
2014-12-05 11:35:16 -05:00
Will Daly
8580620b52 Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page."
This reverts commit f40447b3c8.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395f.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
2014-12-05 10:41:42 -05:00
Andy Armstrong
eced849db0 Add group_access field to all xblocks
TNL-670
2014-12-05 09:55:00 -05:00
jsa
f24f01d217 Add support for user partitioning based on cohort.
JIRA: TNL-710

IMPORTANT: this commit converts the course_groups
package to using migrations.  When deploying to an
existing openedx instance, migration 0001 may fail
with an error indicating that the CourseUserGroup
table already exists.  If this happens, running
the 0001 migration first, with the --fake option,
is recommended.  After performing this step,
remaining migrations should work as expected.
2014-12-05 09:53:44 -05:00