Commit Graph

27583 Commits

Author SHA1 Message Date
Will Daly
fabd8a97ad Fix validation for checkboxes in forms.
Remove hard-coded TOS checkbox in registration template.
Disable new dashboard in settings; expose password reset end-point in student account app.
Added empty JS tests for new JavaScript
2014-10-21 07:29:46 -04:00
Oleg Marshev
f5294358a6 Do not deprecate giturl. 2014-10-21 13:21:38 +03:00
Waheed Ahmed
3ad2959f65 Merge pull request #5639 from edx/waheed/fix-screen-reader-user-issues
Fixed screen reader issues.
2014-10-21 14:13:51 +05:00
Waheed Ahmed
9a1bae0453 Merge pull request #5612 from edx/waheed/tnl89-add-missing-required-states-for-video--progress-slider
Added three missing required states for video progress slider.
2014-10-21 13:23:42 +05:00
Waheed Ahmed
865850c2ad Fixed screen reader issues.
TNL-568
TNL-588
TNL-595
2014-10-21 12:33:51 +05:00
Waheed Ahmed
204b52e92d Added three missing required states for video progress slider.
TNL-89
2014-10-21 12:21:16 +05:00
Stephen Sanchez
655381b4d1 Merge pull request #5652 from edx/talbs/fix-edx-footer-width
LMS: FIX - edX Footer Width
2014-10-20 17:56:46 -04: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
Stephen Sanchez
2f0e4fa764 Merge pull request #5651 from edx/talbs/fix-studio-usernav
Studio: FIX - Username Display in Nav
2014-10-20 17:48:03 -04:00
Stephen Sanchez
f9d04e424f Merge pull request #5606 from edx/sanchez/create-enrollment-api
WIP Enrollment API -- Merge to Reg-Login Form branch only
2014-10-20 17:11:13 -04:00
Brian Talbot
c62bb614f3 LMS: resolving display issue with edx-footer's width 2014-10-20 16:57:01 -04:00
Brian Talbot
d238fa1477 Studio: resolving a display issue for longer usernames in Studio's navigation 2014-10-20 16:55:14 -04:00
David Baumgold
9c8c33c532 Merge pull request #5603 from lduarte1991/lduarte-harvardx-pr32
Image Annotation Tool: Border and tag-based coloring
2014-10-20 16:40:11 -04:00
stephensanchez
f01e5268b4 Initial setup for new enrollment API
Quick tweaks to the API

Aggregating course modes data.

Fixing the POST request endpoints.
2014-10-20 20:26:31 +00:00
Alison Hodges
6baae890c0 Merge pull request #5635 from edx/ahodges/doc/DOC1120
Remove weekly tracking log instructions
2014-10-20 15:31:05 -04:00
Alison Hodges
8a80934fcb Remove weekly tracking log instructions
@stroilova, @victor, @mhoeber, @clintonb, @WatsonEmily, please review.
2014-10-20 15:30:42 -04:00
Jesse Zoldak
1d7c8d39b2 Update js-test config with new sources 2014-10-20 15:23:34 -04:00
lduarte1991
464de86c2d Annotation Tool: Search happens when user hits enter 2014-10-20 15:14:36 -04:00
AlasdairSwan
ed0c383ac0 Merge pull request #5647 from edx/alasdair/combine-reg-login-form
Alasdair/combine reg login form
2014-10-20 14:54:34 -04:00
AlasdairSwan
e5386907cc ECOM-369 uncommented model sync trigger 2014-10-20 14:36:14 -04:00
Don Mitchell
4fc8ed8e7a Fix command line migrator 2014-10-20 14:34:33 -04:00
AlasdairSwan
52ffe93866 ECOM-369 added forgot password flow plugged in to Renzo's API 2014-10-20 14:33:40 -04:00
Will Daly
7496041f62 Merge pull request #5567 from edx/will/register-says-enroll
Change text of registration to enrollment
2014-10-20 14:20:45 -04:00
Carol Tong
2639b2f191 Update screenshots for discussion blackout setting 2014-10-20 13:55:59 -04:00
Will Daly
5a9da83abf Update translation strings to ensure tests pass 2014-10-20 12:39:20 -04:00
Will Daly
e7609597bc Change text of registration to enrollment 2014-10-20 12:32:57 -04:00
stephensanchez
c876c4ae93 Merge remote-tracking branch 'origin/release' into rc/2014-10-20 2014-10-20 16:19:08 +00:00
AlasdairSwan
61db0182e5 Added password reset view and started basic styling 2014-10-20 12:12:17 -04:00
Sarina Canelake
3f33fa4eec Merge pull request #5638 from edx/sarina/10202014-translation-update
Update translations (autogenerated message)
2014-10-20 12:11:14 -04:00
AlasdairSwan
b70dfb0780 ECOM-369 added registration view and front end validation 2014-10-20 12:07:51 -04:00
AlasdairSwan
bd0c5f227c ECOM-369 Added initial Backbone code which allows a user to login to lms 2014-10-20 12:07:51 -04:00
Will Daly
6ab8a8560d Merge pull request #5640 from edx/will/open-source-tos
Support separate terms of service and honor code checkboxes.
2014-10-20 11:57:52 -04:00
Mark Hoeber
67c718674f Updated max attempts advanced settings help string 2014-10-20 11:44:05 -04:00
Will Daly
d774bcf36e Support separate terms of service and honor code checkboxes. 2014-10-20 11:26:17 -04:00
Will Daly
a35ce365d7 Merge pull request #5637 from edx/will/honor-code-and-tos
Add honor code to registration dialog.
2014-10-20 11:17:11 -04:00
Will Daly
97f3f09009 Add honor code to registration dialog. 2014-10-20 11:14:39 -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
Sarina Canelake
93cfdc86d4 Update translations (autogenerated message) 2014-10-20 10:59:51 -04:00
Will Daly
458186f7d1 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
Conflicts:
	lms/djangoapps/student_account/test/test_views.py
	lms/djangoapps/student_account/urls.py
	lms/djangoapps/student_account/views.py
2014-10-20 10:57:05 -04:00
Waqas Khalid
be19c1a9a5 Merge pull request #5610 from mlkwaqas/waqas/tnl607-forum-post-are-uneditable
Post with the discussion id containing dots uneditable
2014-10-20 19:39:29 +05:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03: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
Will Daly
9da81adaa4 Merge pull request #5626 from edx/will/more-unit-tests-failures
Fix unit test failures due to duplicate url names
2014-10-20 10:03:52 -04:00
Alison Hodges
3cfe586b41 Merge pull request #5614 from edx/ahodges/doc/DOC1116
Open source rename child-id
2014-10-20 09:48:19 -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
Will Daly
d558a36127 Fix unit test failures due to duplicate url names
Reset the correct URLs module to fix test failures.

Fix third party auth to reconfigure the registry on test cleanup.
2014-10-20 09:10:11 -04:00
Omar Al-Ithawi
bdf8db0522 Fixed UnicodeEncodeError in student`s migrations 2014-10-20 15:29:45 +03:00
zubair-arbi
6bb878afb2 Merge pull request #5468 from edx/zub/bugfix/tnl-256-protex-scroll-with-increased-font-size
set overflow to scroll so that user can see full content with increased ...
2014-10-20 12:23:24 +05: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