Commit Graph

9229 Commits

Author SHA1 Message Date
Waheed Ahmed
865850c2ad Fixed screen reader issues.
TNL-568
TNL-588
TNL-595
2014-10-21 12:33:51 +05:00
Will Daly
e7609597bc Change text of registration to enrollment 2014-10-20 12:32:57 -04: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
Mark Hoeber
5ee7f4eba5 Merge pull request #5491 from edx/markhoeber-doc989
WIP: edX Mobile API Doc
2014-10-20 09:26:27 -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
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
Brian Talbot
5a31005e96 Merge pull request #5563 from lpil/master
Stop page extending out of viewport width by 40px
2014-10-17 17:14:01 -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
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -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
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 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
Mark Hoeber
0ea2254062 Platform API doc 2014-10-17 12:27:45 -04: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
Jesse Zoldak
f0b7850de3 Merge pull request #5609 from edx/zoldak/remove-tmp-references
Remove references to /tmp in tests
2014-10-17 12:12:53 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
2014-10-17 10:00:12 -04:00
Louis Pilfold
16ed497497 Use box-sizing SCSS mixin rather than property 2014-10-17 09:09:19 +01:00
Waheed Ahmed
16566684c9 Fixed CC button in internet explorer.
TNL-617
2014-10-17 12:23:27 +05:00
Ben Patterson
5703adb722 Merge branch 'release'
Includes rc/2014-10-14
2014-10-16 20:11:55 -04:00
Christina Roberts
f7ef9eb511 Merge pull request #5510 from edx/christina/bug-tnl-543
Pass group_id when getting user thread and comment counts.
2014-10-16 16:03:22 -04:00
cahrens
7133cfc150 Pass group_id when getting user thread and comment counts.
Depends on cs_comments_serivce commit ea218a2b038b59e63fd6593b5598db90223636e1.

TNL-543
2014-10-16 14:32:10 -04:00
Daniel Friedman
64d2514f2c Merge pull request #5528 from edx/dan-f/data-download-tech-debt
Student profile CSV background task tech debt
2014-10-15 16:54:41 -04:00
Daniel Friedman
33cfb9c78a Merge pull request #5582 from edx/dan-f/cohorts-internationalization
Ensure all user-facing cohort-related strings are internationalized
2014-10-15 16:26:06 -04:00
Daniel Friedman
62c46c80e7 Bump the report downloads poll interval to 20 seconds
TNL-565
2014-10-15 15:58:08 -04:00
Daniel Friedman
37158bab1f Create standard way of updating a task's progress
TNL-566
2014-10-15 15:58:08 -04:00
Daniel Friedman
a9fc3b035b Verify cohort strings are scraped for translation 2014-10-15 14:51:02 -04:00
Jim Abramson
b6013a2399 Merge pull request #5577 from edx/jsa/tnl549
Fix topic-related errors when editing discussion threads in inline mode.
2014-10-15 11:34:40 -04:00
Nimisha Asthagiri
e0f9def061 Merge pull request #5584 from edx/nimisha/val/MA-81
MA-81 Honor video download setting with VAL-enabled videos.
2014-10-15 10:10:13 -04:00
Nimisha Asthagiri
5355b4b96e MA-81 Honor video download setting with VAL-enabled videos. 2014-10-14 22:32:16 -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
jsa
786fc806f5 Add topic selection to inline thread editing, fixing errors
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549
2014-10-14 15:45:19 -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
Daniel Friedman
1b03534b55 Rename upload_*_to_s3 to no longer reference s3
TNL-534
2014-10-14 14:31:11 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
stephensanchez
c15d97ea9b Removing the feature flags for new header and footer.
Fix acceptance tests

Updating lettuce tests.

Revert the deletion of the original edx header and footer.

Renaming old header and footers to legacy files.

Add IS_EDX_DOMAIN flag for header.

Updating tests and django main template.

renaming the header files for microsite backwards compat.
2014-10-14 17:47:46 +00:00
Will Daly
ad11c1b6f4 Update django-countries to 2.1.2, override country name for Taiwan 2014-10-14 13:12:36 -04:00
Will Daly
5d77fab265 Merge pull request #5541 from edx/will/dashboard-js-shame
Dashboard template cleanup
2014-10-14 11:54:57 -04:00
Usman Khalid
32c6dad526 Moved imports to manage.py and wsgi.py. 2014-10-14 18:27:31 +05:00
Louis Pilfold
a501fbfc2d Stop page extending out of viewport width by 40px
Currently the .container and .wrapper-footer elements are set to 100%,
and also have horizontal padding added to them. This results in a total
width of greater than the full width of the viewport; This causing the
browser to scroll horizonally into empty space, regardless of how wide
the viewport is.

I had added the `box-sizing: border-box` to these elements in order to
resolve this.

Cheers,
Louis
2014-10-13 14:43:16 +01:00
Sarina Canelake
35f9fc595e Merge pull request #5423 from mitocw/bdero/fix-gitlog-focused-error
Added handling in gitlog template for missing import logs
2014-10-10 16:08:15 -04:00
Sarina Canelake
02bfe039fd Merge pull request #5431 from open-craft/datadog-wrapper
Consistently wrap the DataDog API to prevent logged errors & missing stats data
2014-10-10 14:59:38 -04:00
Stephen Sanchez
75908924ce Merge pull request #5549 from edx/sanchez/increase-min-header-width
Making the header width fixed until we have responsive design.
2014-10-10 13:52:51 -04:00
Don Mitchell
f4b2789f54 Merge pull request #5288 from edx/split/info_perf
Upgrade pymongo
2014-10-10 12:55:38 -04:00
Stephen Sanchez
81d4a24b6d Making the header width fixed until we have responsive design. 2014-10-10 12:17:58 -04:00
Brandon DeRosier
c571a2a029 Added handling in gitlog for missing import logs
Fixes a template error that occurs when viewing a course's detailed
git import log. The problem happens for courses imported using methods
other than the `git_add_course` command.
2014-10-10 10:41:06 -04:00
Stephen Sanchez
c578302f73 Changing default donation amount 2014-10-10 09:51:40 -04:00