Add missing mimetypes for xblock resources
Add mimetype additions in studio startup
Adding template tag to render the microsite favicon
Adding template tag to render microsite css_overrides_file
Fix i18n bug on Studio's Advanced Settings page

STUD-1955

HTML escaped localized text that was output to
JavaScript.
Merge pull request #4345 from edx/andy/fix-i18n-bug

Fix i18n bug on Studio's Advanced Settings page
Fix bug in inline discussion post creation

Commit 994ccd1 contained a bug that caused new posts created via the
courseware interface to not get posted to the correct topic. They would
appear to work but would actually be posted to the "undefined" topic.
This has now been fixed.

JIRA: FOR-154
Merge pull request #4350 from edx/gprice/for-154

Fix bug in inline discussion post creation
CMS Video Handout Tests
Merge pull request #4307 from edx/ammar/bok-choy-video-handout-tests

CMS Video Handout Tests
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
Make wiki links not look inactive
Merge pull request #3504 from edx/dcs/LMS-1308

Make wiki links not look inactive. Fixes LMS-1308
Release notes for 7-9-2014
Merge pull request #4352 from edx/release

Release
Merge pull request #4284 from edx/sylvia/docs/relnotes_7_2

Sylvia/docs/relnotes 7 2
Edits from Michele
Merge pull request #4312 from edx/ahodges/documentation/DOC158mslotke

Edits from Michele
Updated with UI changes in Studio and LMS, terminology
Merge pull request #4321 from edx/ahodges/documentation/FOR595

Updated with UI and terminology changes