Commit Graph

11117 Commits

Author SHA1 Message Date
AlasdairSwan
b14a129132 Merge pull request #5705 from edx/alasdair/logistration-error-styles
Alasdair/logistration error styles
2014-10-23 16:28:05 -04:00
AlasdairSwan
e332e79328 ECOM-369 Moved to Base FormView extended by other views. 2014-10-23 16:23:59 -04:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Jim
6d19a0c87c Support and tests for adding a reset button to units
Users may want to start anew when answering a question. This commit decouples reset from randomization while still preserving backward compatibility. Users can clear their input.
Instructors can set course-wide and problem-specific settings for reset button display.
2014-10-23 12:14:27 -07:00
Adam Palay
0be9a26521 change ItemNotFoundErrors to log.warning in x_module.py 2014-10-23 13:38:12 -04:00
stephensanchez
e7570c52e6 adding all the tests for data and api.
Updating tests for views

Last chunk of tests and pep8 cleanup

Code Review cleanup.

Additional CR comments

Changing serialization of suggested prices.
2014-10-23 16:57:29 +00:00
David Baumgold
14209c672a Merge pull request #5667 from lduarte1991/lduarte-harvardx-pr33
Annotation Tools: Upgrading Share plugin from v1.0 to v1.1
2014-10-23 11:22:22 -04:00
Will Daly
fb5a8098de Disable auth for login and registration end-points 2014-10-23 10:20:37 -04:00
Will Daly
0245c7e16e Use 'defaultValue' instead of 'default' in the form description. Fix an error that would cause the login and password reset pages to not load correctly. 2014-10-23 08:56:40 -04:00
Anton Stupak
b12aa0b1b6 Merge pull request #5518 from edx/anton/requirejs-optimizer
Add RequireJS Optimizer.
2014-10-23 15:29:42 +03:00
Oleg Marshev
f550359d67 Merge pull request #5545 from edx/oleg/lms-dashboard-course-start-time
Add course start/end time to student dashboard.
2014-10-23 11:56:37 +03:00
Will Daly
33f0e92d62 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 2014-10-22 17:13:30 -04:00
Will Daly
9e9dec1de1 Integrate third party auth into the combined login/registration page.
Change third party auth login failure code to a 401, to detect authentication
success with no linked account.

If already authenticated, redirect immediately to the dashboard.

Use "Location" header correctly for 302 redirects from student views.

Add utility functions for simulating a running third-party auth pipeline.

Add a utility function for checking whether third party auth is enabled.

Respect default values sent by the server
2014-10-22 17:10:49 -04: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
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00
lduarte1991
976c3cb11f Annotation Tool: Fix Share Plugin style and spacing
- fixed parseInt issue

 - PR fixes
2014-10-22 09:22:10 -04:00
lduarte1991
deefe9b13e Annotation Tools: Updated Share plugin from version 1.0 to v1.1 2014-10-22 09:21:39 -04:00
Adam
2bb44a001a Merge pull request #5641 from edx/adam/update-latex-data
update latex problem data (TNL-264)
2014-10-22 08:52:52 -04:00
Adam Palay
becd4c1b9a update latex problem data (TNL-264) 2014-10-21 16:58:30 -04:00
Don Mitchell
0d36dd7264 Merge pull request #5646 from edx/dhm/migrate_bug
Fix command line migrator
2014-10-21 16:55:59 -04:00
Mark Hoeber
c213f64d4f Merge pull request #5642 from edx/markhoeber-doc1123
Updated max attempts advanced settings help string
2014-10-21 11:09:34 -04:00
Will Daly
d610237388 Merge pull request #5656 from edx/will/logistration-js-work
Combined login/registration JS work
2014-10-21 08:35:55 -04:00
Oleg Marshev
3d149bf5ea Merge pull request #5585 from edx/oleg/giturl-not-deprecate
GIT URL should not be a deprecated setting (TNL-396).
2014-10-21 14:52:57 +03:00
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
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
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
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
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
Don Mitchell
4fc8ed8e7a Fix command line migrator 2014-10-20 14:34:33 -04:00
stephensanchez
c876c4ae93 Merge remote-tracking branch 'origin/release' into rc/2014-10-20 2014-10-20 16:19:08 +00:00
AlasdairSwan
b70dfb0780 ECOM-369 added registration view and front end validation 2014-10-20 12:07:51 -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
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
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
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