Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,566 Commits 1 Branch 0 Tags
db331b7fa9ee705b32a398d0052f880daaa2cbda
Commit Graph

809 Commits

Author SHA1 Message Date
John Jarvis
128d763047 Merge pull request #6218 from edx/jarv/env-revision-override 
optionally using environment variable for edx-platform hash
 2014-12-17 11:37:13 -05:00
Will Daly
2ea2b8f674 Add JSON end-point for shoppingcart receipt information 
Add enrollment confirmation page

Fix progress update

Add order info to the payment confirmation page.
 2014-12-16 20:40:13 -05:00
John Jarvis
a9d731165c optionally using environment variable for edx-platform hash 2014-12-16 15:13:08 -05:00
Will Daly
d3c3f73428 Combine payment and intro step 2014-12-15 13:23:07 -05:00
Will Daly
93cc03a570 Separate verification / payment flow. 2014-12-15 13:11:33 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
Calen Pennington
980f30c17f Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it 2014-12-12 21:45:21 -05:00
Afzal Wali
51e53587dc WL-105 Show course cards sorted by start dates, oldest first. 2014-12-11 20:05:04 -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
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
jmclaus
082cb3b9ed Load OVA JS with requireJS in LMS. 2014-12-09 09:49:45 -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
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations 
TNL-649
 2014-12-05 09:52:26 -05:00
Will Daly
84301e7698 Merge pull request #6070 from edx/will/verified-messaging-per-course 
Student verification status
 2014-12-02 16:08:25 -05:00
Will Daly
464dfcfabc Show student verification status on the dashboard. 2014-12-02 09:42:24 -05:00
Renzo Lucioni
28186e233c Merge pull request #6062 from edx/renzo/email-opt-in 
Updating the marketing iframe, courseware views, and student views for email opt-in
 2014-12-01 17:22:49 -05:00
Stephen Sanchez
de1c054187 Merge pull request #6079 from edx/sanchez/logistration-opt-in 
Hooking the logistration page into the new HTTP endpoint for email opt in
 2014-12-01 13:57:36 -05:00
stephensanchez
32c9230cd1 Hooking the logistration page into the new HTTP endpoint for email opt in. 
Update the PR based on Code Review comments, and additional tests.

Using underscore js
 2014-12-01 17:25:57 +00:00
Sarina Canelake
ff18b7d01a s/pylint: disable=W0611/pylint: disable=unused-import/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
d406261e4b s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
f223ac8404 s/pylint: disable=W0401/pylint: disable=wildcard-import/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
b127d2844b s/pylint: disable=C0103/pylint: disable=invalid-name/ 2014-12-01 11:22:09 -05:00
Renzo Lucioni
f5767a961c Prep marketing iframe and relevant courseware view for email opt-in 
Feature flagged. Puts a checkbox in the iframe. The iframe uses an organization_full_name parameter forwarded from Drupal by the courseware views and POSTs an email_opt_in parameter to the student views, preserving it on 403.
 2014-12-01 10:30:16 -05:00
stephensanchez
6214365158 Create new API endpoint for email optin 
Updating the design of the email opt in end point.

Updating API call based on new Org Model.
 2014-11-26 14:12:58 +00:00
Muhammad Shoaib
df0bb491fa WL-99 send a copy of the invoice to the finance@edx.org when registration codes are generated 
changed the finance_email in the common.py file

added the test for the FiNANCE_EMAIL settings
 2014-11-21 17:43:37 +05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form 
Combined Login/Registration Form
 2014-11-17 16:00:20 -05:00
John Eskew
546d81a822 Always create an asset metadata collection in the Mongo modulestore. 
If no collection name is specified, use a default name.
https://openedx.atlassian.net/browse/PLAT-294
 2014-11-14 09:44:31 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
 2014-11-13 11:16:16 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -05:00
Dennis Jen
dd38f52358 Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments 
Feature flagged enrollment counts on instructor dashboard.
 2014-11-12 10:40:04 -05:00
AlasdairSwan
790ac3f3ef Merge pull request #5915 from edx/alasdair/rwd-trackselection 
ECOM-574 Updated track selection page to be responsive
 2014-11-10 16:41:50 -05:00
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
 2014-11-10 15:05:37 -05:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Will Daly
578c04f62f Put logistration page behind a feature flag 2014-11-07 13:05:17 -05:00
Will Daly
e629ce2ba6 Move redirection/enrollment to AccessView and trigger it using an event. 
Ensure window.isExternal is loaded

Don't set a default for terms of service

For paid courses, add the course to the cart and redirect to the shopping cart view.

Don't send form method and url as form data.

Stub window.analytics in the access view test.
 2014-11-07 12:59:08 -05:00
Renzo Lucioni
bedd6cc2f5 Jasmine tests of validation utility 
Includes a modification of validation logic which performs min and max length checks on optional fields in addition to required fields.
 2014-11-07 10:44:25 -05:00
Dennis Jen
b27401554c Feature flagged enrollment counts on instructor dashboard. 
* enrollments counts removed from legacy dashboard
 2014-11-04 12:56:53 -05:00
Sarina Canelake
fece2b9dd2 Merge pull request #5821 from edx/sarina/remove-old-admin-files 
Remove admin files deprecated in Django 1.4
 2014-11-04 10:55:13 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8 
Remove more pep8 violations
 2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Gabe Mulley
821c97fbb4 Implement shim for mobile video events. 
This PR addresses the following issues:

1) All requests return a 200 OK unless there is an authorization failure. This is deliberate in case the secret key is compromised.
2) Push all of the nasty logic necessary to generate compatible video events into the LMS instead of trying to do that mapping on the mobile devices.
3) Stop using the deprecated "action" field in the segment.io event. According to their support team this field should not be used anymore and is just around for backwards compatibility reasons.

Fixes: AN-3818
 2014-11-03 14:12:07 -05:00
Clinton Blackburn
22952af61f Merge pull request #5782 from edx/remove-analytics-demographics 
Updates to Demographics Display
 2014-11-03 10:07:31 -05:00
Sarina Canelake
ed76907c0d Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4

Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
 2014-11-01 00:01:17 -04:00
Martyn James
9f3b9c7ba3 Merge pull request #5818 from edx/release 
Merging latest updates to release
 2014-10-31 14:49:04 -04:00
Diana Huang
fc468bf696 Set up basic enrollment infrastructure. 2014-10-30 17:15:26 -04:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Nimisha Asthagiri
994ac6da6d Fixes for MOB-836 and MOB-766 and MA-96. 2014-10-29 22:06:42 -04:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive 
Made the header and footer responsive
 2014-10-29 14:00:54 -04:00