Commit Graph

4251 Commits

Author SHA1 Message Date
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
Carlos Andrés Rocha
578f5b6299 Merge pull request #5673 from rocha/fix-course-structure-command
Fix dump course structure when element metadata uses opaque keys.
2014-10-22 10:22:55 -07:00
Christina Roberts
d4531201e5 Merge pull request #5654 from edx/christina/visible_graded_content
Tests for conditional content (split_test module).
2014-10-22 12:55:30 -04:00
Carlos Andrés Rocha
a1a7504f81 Fix dump course structure when element metadata uses opaque keys.
Make sure that during the serialization, all opaque keys and their
references and serialized using the `unicode` function.

AN-3821
2014-10-22 12:36:50 -04:00
cahrens
c09632ef69 Tests for conditional content (split_test module).
TNL-39
2014-10-22 10:38:50 -04: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
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
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
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
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
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
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
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
Will Daly
e89afa93c0 WIP: add login and registration end-points to the user API. 2014-10-16 08:48:38 -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
37158bab1f Create standard way of updating a task's progress
TNL-566
2014-10-15 15:58:08 -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
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
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
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
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
Braden MacDonald
a8f622af7f Consistently ensure dog_stats_api tags are formatted correctly 2014-10-09 12:35:26 -07:00
Andy Armstrong
03b41032ae Merge pull request #5501 from edx/andya/disable-cohorts-ui-bug
Don't show cohort information when disabled
2014-10-09 12:55:07 -04:00
brianhw
b719c074bc Merge pull request #5517 from edx/brian/fix_export_course
Make sure temporary course directory uses safe characters.
2014-10-09 12:20:09 -04:00
Nimisha Asthagiri
b78bb976cc Merge pull request #5531 from edx/release
Merge Release
2014-10-09 09:58:51 -04:00
Renzo Lucioni
37625e8e29 Merge pull request #5515 from edx/renzo/language-backbone
Use Backbone for student account and profile JS.
2014-10-09 09:50:40 -04:00
Waqas Khalid
c2ecaa7e30 Forum shouldn't cuase error while searching unicode
If we use unicode character in the search of forum
it will cuase the error which is not the desired
behavior it should check and return result.

TNL-336
2014-10-09 14:40:06 +05:00
Renzo Lucioni
00d976b85d Use Backbone for student account and profile JS.
Validate student account and profile form fields. Use RequireJS for Jasmine tests of account and profile JS.
2014-10-08 15:50:13 -04:00
Andy Armstrong
3af9eb25b2 Minor cleanups 2014-10-08 15:14:17 -04:00
Andy Armstrong
fbeb57874c Address code review comments 2014-10-08 15:14:16 -04:00
Andy Armstrong
6114cf05f4 Don't show cohort information when disabled
TNL-552
2014-10-08 15:14:16 -04:00
Daniel Friedman
736ed94064 Fix unicode-related failures in CSV upload.
TNL-586
2014-10-08 13:21:00 -04:00
Chris Dodge
1809a28b89 Add the ability for Microsites to be able to send appropriately branded emails rather than the default system installed version
fix tests. Update Admin views/forms.

enforce uniqueness constraint in the Admin ModelForm submissions

Update bok_choy cached DBs with new schema changes

PR feedback
2014-10-08 13:04:41 -04:00
Brian Wilson
61c2b96a4a Only permit ascii characters in filenames generated from course_ids. 2014-10-08 11:43:07 -04:00
Will Daly
2d50cad0a1 Update donation text in email and receipt page 2014-10-08 06:15:11 -04:00
Will Daly
c4eee8ebc3 Merge pull request #5502 from edx/will/per-course-donation-button
Add donation button to the enrollment success message
2014-10-08 06:05:37 -04:00