Commit Graph

14096 Commits

Author SHA1 Message Date
Andy Armstrong
f58e96a2fa Fix quality failures 2015-01-15 10:33:47 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware
TNL-652
2015-01-15 10:33:45 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware
TNL-651
2015-01-15 10:33:44 -05:00
jsa
6fb3daa772 support group_access. JIRA: TNL-649 2015-01-15 10:33:44 -05:00
jsa
17d892c521 make block.get_parent() work.
Co-Authored-By: Christina Roberts <christina@edx.org>
Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
Co-Authored-By: Don Mitchell <dmitchell@edx.org>
2015-01-15 10:33:44 -05:00
Afzal Wali
a8ebf6da7f Added the reportlab requirement to base.txt
Added receipts_pdf.py

Used Paragraph for displaying a large body of text.

added the table

Line breaks in the para text. font size adjusted.

Improved the main table (alignments) and totals (converted to a table as well)

Converted the footer into a table, and allowed for pagination.

Added pagination to item data table.

Handled wrapping of long descriptions into multiple lines.

email attachment for both invoice and receipt

added the currency from the settings

Removed magic numeric literals and added meaningful variables.

Added initial set of substitutions from configuration

add defining logo paths via configuration

Removed font dependencies. Will use the system default fonts which appear good enough to me.

Alignment adjustments as per suggestions.

Fixed the pep8 violations. Added comments to styling

added the decimal points to the price values

Cleanup. Docstrings.

i18n the text in the pdf file

fix pep8/pylint issues

Changed the amounts from string to float.

Overrode the 'pdf_receipt_display_name' property in the OrderItem subclass Donation.

used the PaidCourseRegistration instead of the parent OrderItem to avoid course_id related exceptions.

quality fixes

added  the test cases for the pdf

made the changes in the pdf suggested by griff

updated the pdf tests to assert the pdf content

used the pdfminor library

fix quality issues

made the changes suggested by Will

added the text file that says "pdf file not available. please contact support"
 in case pdf fails to attach in the email
2015-01-15 12:24:30 +05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content.
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
2015-01-14 23:34:11 +02:00
Nimisha Asthagiri
920dfb5270 MA-216 Mobile API: display unreleased courses in enrollment list. 2015-01-14 12:30:11 -05:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries
Content libraries MVP
2015-01-13 11:20:20 -08:00
stephensanchez
b188430679 Enable redeem codes.
Update the redeem code schema

Updating the redeem code schema.

Adding migration file.

Adding course mode support when redeeming a code.

Conflicts:
	lms/djangoapps/shoppingcart/views.py

Add sales admin privileges for redeem code generation.

Making sure redeem code URLs work for verified courses.

pep8 violations

Code Review and Test Cleanup changes

Added tests, fixed tests.

Updating the boolean checks in ecommerce template
2015-01-13 15:21:24 +00:00
Nimisha Asthagiri
e57f3e3b03 Merge pull request #6572 from edx/mobile/fix-decorator-api
Fix Mobile API decorators
2015-01-13 06:20:10 -05:00
Nimisha Asthagiri
9566a46a4d Fix Mobile API decorators. 2015-01-13 02:29:53 -05:00
christopher lee
3e5f7bacdd MA-187 ValueError fix
Fix for MA-187 where a value error was thrown when
a course has a video directly under a section. This
PR handles the situations where a chapter or section
can be none, and then returns the appropriate url
if available.
2015-01-12 14:15:18 -05:00
Braden MacDonald
10fe9c0180 pylint fixes 2015-01-12 11:00:51 -08:00
Braden MacDonald
9a116529ce Add module key and library source info to problem events 2015-01-12 10:39:13 -08:00
Braden MacDonald
3973317aa9 Report the original LibraryUsageLocator in LMS analytics 2015-01-12 10:39:12 -08:00
Braden MacDonald
eddf44d853 Library Content XModule 2015-01-12 13:37:56 +03:00
Brian Talbot
c93817962e Merge pull request #6515 from edx/talbs/fix-update-font-awesome
FIX: Upgrade Font Awesome - Part III: Revenge of the Glyph
2015-01-09 12:50:14 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Sarina Canelake
cae70d9966 Move default Open edX branding into default-theme directory
OPEN-307
2015-01-09 10:49:17 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory
OPEN-307
2015-01-09 10:48:20 -05:00
Sarina Canelake
314c935369 Remove edX branding from default Open edX LMS
OPEN-307
2015-01-09 10:48:20 -05:00
Nimisha Asthagiri
fe40fa6deb Merge pull request #6495 from edx/mobile/MA-212
MA-212 Mobile API support for backward compatibility of course updates.
2015-01-09 10:05:59 -05:00
Muhammad Shoaib
10f8d8c097 WL-135 added the migration for the expiration_date field in the coupons model
added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart

added expiration date in the coupons list in the ecommerce page

added the unit tests and jasmine tests

fix the quality issues and rebased with master

regenerated the migration file with a different number

i18n and verified te course mode

changes suggested by  stephan
2015-01-09 19:14:48 +08:00
Dennis Jen
4a37648f36 Merge pull request #6504 from edx/release-merge-test
Merge release (2015-01-08) into master
2015-01-08 16:16:03 -05:00
Dennis Jen
d2660e530f Merge branch 'release'
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
2015-01-08 15:02:26 -05:00
Christine Lytwynec
66228224c0 Merge pull request #6403 from edx/clytwynec/remove_lynx_from_bulk_email
Mock html_to_text.py for unit tests
2015-01-08 14:10:12 -05:00
David Baumgold
a54bff2992 Merge pull request #6487 from edx/remove-linkedin-integration
Remove LinkedIn integration
2015-01-08 10:18:25 -05:00
Nimisha Asthagiri
3498eeb1f6 MA-212 Mobile API support for backward compatibility of course updates. 2015-01-08 10:05:29 -05:00
muhammad-ammar
5ba492ecf3 Get students experiments, groups, and cohorts
TNL-498
2015-01-08 14:29:53 +05:00
Nimisha Asthagiri
3c274e2847 Merge pull request #6398 from edx/mobile/MA-199
MA-199 Course Authorization framework in mobile API
2015-01-07 20:19:27 -05:00
Nimisha Asthagiri
5349b55bd0 MA-199 Course Authorization framework in mobile API. 2015-01-07 19:31:02 -05:00
David Baumgold
e95f2aeeed Remove LinkedIn integration 2015-01-07 14:38:48 -05:00
David Baumgold
2077d4dc6d Merge pull request #6439 from edx/improve-shoppingcart-tests
Change tests so they show failures better.
2015-01-07 09:12:24 -05:00
Chris Dodge
443a552d5f remove unused variable 2015-01-06 19:24:39 -05:00
Sarina Canelake
d6741c7700 Clean up default pages for Open edX instances
Remove Jobs, News
Change "Vision" to "About"
2015-01-06 18:26:12 -05:00
Dennis Jen
a8be702136 Merge pull request #6469 from edx/release
hotfix-2015-01-06
2015-01-06 17:16:32 -05:00
Dennis Jen
2ff8f2faea Merge branch 'release' into rc/2015-01-07 2015-01-06 16:30:11 -05:00
jsa
ce3c650cf9 use modulestore bulk ops in forum views.
JIRA: PLAT-348
2015-01-06 09:59:20 -05:00
Awais
dfb366afb9 ECOM-662 Raise exception in case of DECLINE response.
Adding decline button in fake payment page.
In of case ERROR, CANCEL, and DECLINE removing auth_amount from test cybersource2 and payment fake.
2015-01-06 18:21:25 +05:00
Will Daly
6f593222c4 Fix ECOM-872 2015-01-06 08:17:06 -05:00
Christine Lytwynec
9dc85bf10d PR updates 2015-01-05 17:38:18 -05:00
Christine Lytwynec
c7ede0df4b fixing pep8 violations 2015-01-05 16:19:36 -05:00
Christine Lytwynec
3127ac2b6c mock html_to_text for tests 2015-01-05 16:19:36 -05:00
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -05:00
Ned Batchelder
4571930b12 Change tests so they show failures better. 2015-01-05 10:45:13 -05:00
chrisndodge
91a4796216 Merge pull request #6196 from edx/muhhshoaib/WL-168
WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page
2015-01-01 10:00:06 -05:00
AlasdairSwan
23da87f078 Merge pull request #6414 from edx/alasdair/decoupled-verified-state-copy-cleanup
ECOM-811 design and layout changes
2014-12-31 14:40:15 -05:00
Will Daly
400efdf153 Merge pull request #6421 from edx/will/ecom-850
Set attempting_upgrade session flag in the new payment flow
2014-12-31 11:04:28 -08:00
Will Daly
c183831b43 Merge pull request #6423 from edx/will/ecom-864
Hide verification messaging if the user has an active verification
2014-12-31 11:03:34 -08:00