Commit Graph

1919 Commits

Author SHA1 Message Date
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
stv
d5d6e3f0d8 Fix PEP8: W293 blank line contains whitespace 2014-11-10 10:59:53 -08:00
stv
d87cfa90bf Fix PEP8: W292 no newline at end of file 2014-11-10 10:59:44 -08:00
Waheed Ahmed
3a71901f93 Fixed youtube stub server and removed unused variable.
TNL-778
2014-11-10 11:43:58 +05:00
chrisndodge
01c029aa9f Merge pull request #5805 from edx/cdodge/make-customizeable-region-in-receipt-page
allow for a customized region on the receipt page that is microsite bran...
2014-11-06 21:13:43 -05:00
Greg Price
d2183c58c8 Add endpoint to log in with OAuth access token 2014-11-05 14:09:41 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements
Unit Test Improvements
2014-11-05 19:55:39 +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
Jesse Zoldak
71f237d361 Revert "Fix lettuce css_fill method for devstack"
This reverts commit 471abb8c28.
2014-10-31 11:51:28 -04:00
Jesse Zoldak
471abb8c28 Fix lettuce css_fill method for devstack 2014-10-31 11:48:35 -04:00
muhammad-ammar
fcaa783e43 Unit Test Improvements
TE-489
2014-10-31 11:55:13 +00:00
Chris Dodge
6fcfb2a6a3 allow for a customized region on the receipt page that is microsite brand specific 2014-10-30 22:17:02 -04:00
Sarina Canelake
1b6d1b3730 Fix i18n and quality errors in course_groups/views.py 2014-10-30 11:10:57 -04:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
John Eskew
c9071353fd Merge pull request #5742 from edx/jeskew/asset_manager_read_wrapper
Wrap all asset read operations.
2014-10-28 15:57:28 -04:00
John Eskew
786a32e7cf Wrap all asset read operations.
First step in moving assets out of the contentstore (optionally).
https://openedx.atlassian.net/browse/PLAT-77
2014-10-28 14:20:36 -04:00
Will Daly
f9b5a9173f Redirect users to the track selection page or ?next page when using third party auth
Set marketing site logged in cookie from third party auth.
2014-10-28 10:28:30 -04:00
Will Daly
0735141afc Merge pull request #5730 from edx/will/update-donation-tests
Add a test for donations with a white-label course mode
2014-10-27 14:13:44 -04:00
Will Daly
0cac6ea21b Fix pylint violations 2014-10-27 11:04:22 -04:00
Will Daly
7f54af3be0 Merge remote-tracking branch 'origin/release' 2014-10-27 10:59:31 -04:00
Will Daly
2c062ca08b Add a test for donations with a white-label course mode 2014-10-26 15:58:26 -04:00
Renzo Lucioni
05cb2a071b Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth 2014-10-24 15:59:42 -04:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
stephensanchez
128d4836c0 Change design to check for min price or suggested prices. 2014-10-22 20:26:03 +00:00
stephensanchez
de4a2191c8 pep8 error. 2014-10-22 19:53:59 +00:00
stephensanchez
d5966b1e21 Adding an additional check to avoid donations showing up for microsites. 2014-10-22 18:20:32 +00:00
Sarina Canelake
16771e6944 Merge pull request #5634 from Edraak/fix-unicode-error-in-migration
Fixed UnicodeEncodeError in student`s migrations
2014-10-20 17:51:23 -04:00
stephensanchez
c876c4ae93 Merge remote-tracking branch 'origin/release' into rc/2014-10-20 2014-10-20 16:19:08 +00:00
chrisndodge
1abf064dfd Merge pull request #5235 from edx/cdodge/shopping-cart-rewrite
Cdodge/shopping cart rewrite
2014-10-20 11:13:51 -04:00
Renzo Lucioni
6013c529f4 Merge pull request #5615 from edx/renzo/account-password-reset
Add password reset request handling to the account page
2014-10-20 10:21:18 -04:00
Omar Al-Ithawi
bdf8db0522 Fixed UnicodeEncodeError in student`s migrations 2014-10-20 15:29:45 +03: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
ff587c5cbb Add password reset request handling to the account page
The next step in the password reset process (confirmation) continues to be handled by student.views.password_reset_confirm_wrapper, a custom wrapper around Django's password reset confirmation view.
2014-10-18 00:54:38 -04:00
frances botsford
b9c37120b3 Merge pull request #2682 from edx/frances/experiments/rtl
RTL platform support
2014-10-17 15:22:36 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Jesse Zoldak
03a42898c9 Merge pull request #5608 from edx/zoldak/lti-test-fixes
Fix sychronization issues in LTI lettuce test
2014-10-17 13:18:11 -04:00
stephensanchez
b6f0c8dd30 Update the student transfer command to transfer to multiple courses.
Quick cleanup

Making kwarg to suppress unenroll events.

pylint and pep8 errors cleaned up.

add commit on success.

Changing transactional behavior of the management command.
2014-10-17 16:59:22 +00:00
Jesse Zoldak
dd35005132 Fix sychronization issues in LTI test
Better verification for troubleshooting LTI test failures
Dismiss any lingering alerts after lettuce scenarios
2014-10-17 12:22:34 -04:00
Sarina Canelake
d1f256af29 Merge pull request #5566 from Kelketek/lazy_coursemode_translation
Lazy loading of CourseMode model's internationalization.
2014-10-17 10:26:05 -04:00
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children
Enable pure XBlocks to use children in edx-platform
2014-10-16 10:23:35 -04:00
Calen Pennington
fee681be68 Escape xblock wrapper data attributes and css classes for safe html 2014-10-16 09:09:22 -04:00
Calen Pennington
4a43427c6d Add block.name to xblock javascript frontend 2014-10-16 09:08:57 -04:00
Diana Huang
0c6cba73ac Handle OpenID errors for POST requests.
ECOM-441
2014-10-15 16:33:31 -04:00
Will Daly
26a94afb26 Merge pull request #5573 from edx/will/django-countries-fix
Update django-countries to 2.1.2, override country name for Taiwan
2014-10-14 17:14:32 -04:00
Stephen Sanchez
7df00578f1 Merge pull request #5536 from edx/sanchez/remove-new-header-footer-flags
Removing the feature flags for new header and footer.
2014-10-14 15:06:45 -04:00
Renzo Lucioni
257e8cf857 Merge pull request #5551 from edx/renzo/track-selection-test-cleanup
Clean up after track selection experiment
2014-10-14 15:06:19 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00