Commit Graph

451 Commits

Author SHA1 Message Date
AlasdairSwan
588e1db629 ECOM-583 Fixes the CSS bugs 2014-11-04 14:56:34 -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
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
2014-10-28 15:16:27 -04:00
AlasdairSwan
728df71acf ECOM-531 Updated style after review with Andy Waldrop 2014-10-28 10:20:44 -04:00
AlasdairSwan
08e03ef380 ECOM-369 updated in light of review with Andy and code review 2014-10-27 15:17:07 -04:00
AlasdairSwan
0b9ed0315b ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging 2014-10-27 15:17:07 -04:00
AlasdairSwan
a86e9e68db ECOM-466 Added support for custom error messages. Styled select widths 2014-10-27 15:15:10 -04:00
AlasdairSwan
e332e79328 ECOM-369 Moved to Base FormView extended by other views. 2014-10-23 16:23:59 -04:00
Will Daly
33f0e92d62 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 2014-10-22 17:13:30 -04:00
AlasdairSwan
3a0304724d ECOM-531 tweaking margins 2014-10-22 09:52:40 -04:00
Muhammad Shoaib
b0802aafc8 css fix of remove icon and Fixed a bug where the discount coupon applied ‘disappeared’
when changing the quantity between enrollment vs reg code cart types.
2014-10-22 09:12:32 -04:00
AlasdairSwan
ab035a0ebb ECOM-531 updating grid column counts in media queries and added some more classes to style against instead of elements 2014-10-22 09:06:28 -04:00
AlasdairSwan
24a01ae37e ECOM-531 Styling the buttons 2014-10-21 16:40:58 -04:00
AlasdairSwan
00ff10820a ECOM-531 Styling the forms 2014-10-21 16:03:58 -04:00
AlasdairSwan
a5da61b4ab ECOM-408 Added breakpoint variables to _grid-settings.scss 2014-10-21 09:39:32 -04:00
AlasdairSwan
93246db656 ECOM-408 Added grid-settings to override the default global box-sizing style 2014-10-21 09:11:59 -04:00
AlasdairSwan
52ffe93866 ECOM-369 added forgot password flow plugged in to Renzo's API 2014-10-20 14:33:40 -04:00
AlasdairSwan
61db0182e5 Added password reset view and started basic styling 2014-10-20 12:12:17 -04:00
asadiqbal08
4f7c494922 EX-71 New shopping Cart UI Single person purchase
Ex-74 Registration Code redemption

fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations

Ex-72-added additional billing information

Added a new CSV file in the instructor dashboard sales tab to download all the order sales separated from the invoice sales

fix path to image

updated the failed unit tests and add some minor tweaks in the Shoppingcart.scss

Ex-78 New UI In receipt page

EX-73 Purchasers can buy a course on behalf of a different student

WL-78 updated the receipt page UI.

Wl-72 updated Billing Information UI and removed the Order Address fields

WL-71 Remove Purchase Type Buttons from UI

WL-71 Updated minor UI issues and updated test cases

WL-78 updated the enrollment links in the receipt page

made changes in Order generated sales csv in Instructor Dashboard.
 The total_registration_codes and total_used_codes
  were not correctly stored in the csv file.

1) The total_registration_codes were not filtered with
 course_id.
2) The total_used_codes that a user had redeemed
 were not correctly included in the CSV.

added a fix in the courseware view to let the users visit the courseware if they have enrolled in the course by clicking on the enrollment link

rebase and resolved conflicts with master

WL-97 Bulk Registration Email Confirmation
Below is the commit summary.
- Make email text bold as per requirement.
- Improve email template quality and reorder points.
- Add text in billing details page : "if no additional billing details are populated the payment confirmation will be sent to the user making the purchase"
- Update text on receipt page "You have successfully purchase 3 course registration codes"

WL-100 fixed the bug on the edit/add coupon and set course price.
Ajax requests were duplicating in each callback. fixed this issue by creating the manual ajax request rather than the Lean Modal Ajax requests

allow for better White Label branding in shopping cart purchase emails

fix up typos and text

fix goof

fix

fix

incorporated model changes as suggested by Jason.

updated order sales csv

updated test cases for CourseRegCodeItem model and csv for the order generated sales

updated the migrations history

fixed the lms acceptance tests

Be sure to check for multiple types

address PR feedback

PR feedback

PR feedback

pep8 fix
2014-10-19 21:50:29 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
Brian Talbot
872dae0f27 LMS: resolving vertical alignment issues with new header global nav items 2014-09-30 08:44:02 -04:00
Frances Botsford
b889f9ef11 fixes for status for prof ed and verified registration on both variants of AB test 2014-09-24 14:11:18 -04:00
Frances Botsford
ef1ef98653 adjusting ID verified status to be just verified status 2014-09-22 16:10:23 -04:00
Frances Botsford
8bd092ec4b adjusting style for professional educationand verification status 2014-09-19 16:27:20 -04:00
chrisndodge
7593ad3a01 Merge pull request #5050 from edx/muhhshoaib/Ex-74-registration-code-redemption
Ex-74 Registration Code redemption
2014-09-16 11:58:42 -04:00
Muhammad Shoaib
739d2f0906 Ex-74 Registration Code redemption
fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations
2014-09-16 07:48:21 +00:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00
asadiqbal08
dc46170f36 registration code checkout flow
Redirecting to dashboard after free user enrollment.
2014-08-05 10:00:12 -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
Dave St.Germain
dbd4e73b04 Fixes LMS-2352 by unifying :hover and :focus styles. 2014-03-14 11:49:00 -04:00
Frances Botsford
cf16eb052d fixes for verification ui discrepancies
UX-351
2014-02-11 14:13:25 -05:00
Frances Botsford
63a22ad0e5 PR review changes for LMS reverification 2014-01-31 22:20:32 +00:00
Frances Botsford
436a1ec7f6 downstairs fixxup on lms reverification 2014-01-31 22:11:57 +00:00
Frances Botsford
86588c492b added notification styles for re-verification and general on LMS 2014-01-31 22:08:09 +00:00
Frances Botsford
5aea466093 styling complete on reverify dash 2014-01-31 22:08:08 +00:00
Frances Botsford
003d82345f adjusting style and html for re-verification on lms 2014-01-31 22:06:37 +00:00
Frances Botsford
6c7d715e0e re-verification dashboard styles 2014-01-31 21:48:35 +00:00
Jason Bau
c8a98051dd CSV Reporting of Shopping Cart Purchases, with tests
squashing to one commit to make cherry-picking by feature possible
2013-11-18 14:45:41 -08:00
Brian Talbot
c64542e10a LMS: revises re-verification instruction UI and help text 2013-10-29 15:21:13 -04:00
Brian Talbot
280c463209 LMS: adds in styling and base UI for reverification flow 2013-10-29 15:15:10 -04:00
Brian Talbot
e9a2787bb3 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-28 14:58:14 -04:00
Brian Talbot
17f3970fc8 LMS: resolves styling issues for button UI in verification flows 2013-10-26 23:09:09 -04:00
Brian Talbot
a76a61a7e5 LMS: revises styling/placement of message for verified status on dashboard 2013-10-25 15:25:30 -04:00
Brian Talbot
91dce9ca7b LMS: preps track selection view for upgrade cases 2013-10-25 15:23:51 -04:00
Brian Talbot
618d307d1f LMS: preps track selection view for upgrade cases 2013-10-25 15:23:51 -04:00
Giulio Gratta
5a46177a5e A11Y changes: better :focus styling, increased contrast, and added image alt texts
- Doubled up :hover and :focus styling to improve a11y
- Increase contrast of certain UI elements for improved a11y
- Added some image alt text for a11y
- Changed video caption styling to blue and made them underline on hover and added a skip link before video for screenreaders.

Fixes Bugs:
- LMS-1336
2013-10-24 12:47:19 -07:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
Frances Botsford
8c224a2aad fixes on review and some corrections to verification sass 2013-10-16 13:51:38 -04:00