Commit Graph

29 Commits

Author SHA1 Message Date
Bill DeRusha
9877c6ad6e Add UTM tracking for registrations
Add UTM cookie tracking for registrations.
Add config model for cookie names.

ECOM-5539
2016-10-07 10:27:57 -04:00
Clinton Blackburn
03095643c6 Exposed admin for LogoutViewConfiguration
ECOM-4610
2016-06-21 14:13:16 -04:00
Clinton Blackburn
8ea3b62016 Added admin for UserAttribute model (#12596)
ECOM-4502
2016-05-31 18:22:18 -04:00
Clinton Blackburn
b6b5fdc28e Updated UserAdmin
The profile now appears inline for the user model.

ECOM-4310
2016-05-13 01:39:49 -04:00
Ahsan Ulhaq
88df456414 set show_full_result_count false
ECOM-2831
2016-02-17 18:10:40 +05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Clinton Blackburn
afd682e224 Fixed admin issues
- Using raw ID field for user fields for enrollment and user profile admin
- Including user data in enrollment admin queryset
2015-11-06 01:49:22 -05:00
Clinton Blackburn
c34dfac1ff Removed read-only fields from enrollment admin
The read-only protection is more hassle than it's worth when testing locally and on stage. It's a solution to a problem we don't actually have, so I have reverted the changes.
2015-11-02 09:25:56 -05:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta"
Also remove useless docstrings where they were added to keep pylint
quiet.
2015-10-21 07:37:00 -04:00
Clinton Blackburn
f7a7cce881 Using a better admin interface for UserProfiles
This interface should actually be useful as it doesn't attempt to load all users on the edit page.

ECOM-2172
2015-09-17 15:51:16 -04:00
Clinton Blackburn
d0a4284893 Corrected read-only field display for CourseEnrollment admin
Read-only fields are read-only for existing models. These values can be set when creating new models.

ECOM-2172
2015-09-17 15:49:15 -04:00
Clinton Blackburn
7625c6eec3 Built a better course enrollment admin 2015-09-16 14:28:58 -04:00
Waheed Ahmed
f1af5b5c29 Fixed admin course access role required field value not populating.
TNL-3049
2015-08-17 19:22:06 +05:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Sarina Canelake
22bbdacee9 Convert Meta classes to new-style classes 2015-07-13 17:33:26 -04:00
Awais
d5ca25e197 ECOM-1644 minor message updation. 2015-06-10 22:08:23 +05:00
Awais
956e41348e ECOM-1644 Implementing course-access roles. 2015-06-09 15:29:19 +05:00
Will Daly
f854726efc Add tracking code to LinkedIn URL.
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
2015-02-23 11:52:47 -05:00
Awais
57ef60de0a ECOM-1028 adding linked-in button , config model and migration for linked url.
ECOM-1028 update the migration and move the code into class method.
2015-02-11 19:09:30 +05:00
stephensanchez
aed89e422a Improve Django Admin Panel for Course Access Roles. Related to ECOM-857. Allows internal staff to easily use the Django Admin view to create new finance and sales admins. 2015-01-13 21:57:28 +00:00
Stephen Sanchez
bf112f7ef0 Add new enrollment message to the dashboard
The body of the enrollment message template

Tokenize platform name in message.

Changing to a datetime enrollment approach

Adding sorting. A little refactoring.

Adding confguration model for time delta

Adding admin registration and basic form for new config model.

Fixing docstring typo

Updating default time delta to 0, adding test to show it disabled functionality.

Removing the form from configuration and tweaking the enrollment message html
2014-10-02 12:32:35 +00:00
Chris Dodge
bde448d950 make sure the CourseAccessRole Django ORM Admin page uses a raw_id so that we don't populate millions of rows from the production database in the drop down list 2014-07-17 12:04:56 -04:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
Ned Batchelder
df4b512b6f Change wildcard imports into specific imports 2013-06-21 17:33:06 -04:00
ichuang
04d6f08c0c add offline grade computation & DB table for this 2013-01-10 23:32:48 -05:00
Calen Pennington
1d1a9173a4 Cleaning up pep8 violations 2012-07-23 14:44:40 -04:00
Victor Shnayder
39a1502e1a Move student app from lms to common 2012-07-13 11:51:32 -04:00