Commit Graph

9272 Commits

Author SHA1 Message Date
Jim
3ceb0e5c6a Commenting out flaky string input test case 2014-10-30 14:33:36 -07:00
Daniel Friedman
8b73de9123 Merge pull request #5728 from edx/dan-f/grade-export-split-test
Verify grade export works for problems in split tests
2014-10-30 11:04:54 -04:00
Daniel Friedman
9bf22ea9fe Verify grade export works for problems in split tests
TNL-41
2014-10-30 09:58:16 -04:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
Clinton Blackburn
a3171eb8d8 Removed Analytics API Client
Instructors should use Insights instead.
2014-10-29 10:25:18 -04:00
Diana Huang
9f441d22b0 Merge pull request #5745 from edx/will/third-party-auth-fixes
Third Party Auth Fixes
2014-10-28 13:06:40 -04:00
Tim Babych
306813674d Merge pull request #5761 from edx/tim/mktg-iframe-fix
Do not show middle-click href in marketing iframe for logged in users
2014-10-28 18:29:36 +02:00
Diana Huang
92b0bf10c1 Update tests to match new text. 2014-10-28 11:58:41 -04:00
John Eskew
831dd593c9 Add tests for empty analytics server info and url-encoded params. 2014-10-28 11:28:57 -04:00
John Eskew
38e88e3011 Check for empty URL and api key before old analytics api call.
Encode course key as a URL parameter.
2014-10-28 11:28:57 -04:00
Tim Babych
960f7b206a Fix to marketing iframe middle-click href: course does not always have openable url. 2014-10-28 17:20:57 +02: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
Sarina Canelake
f1b95b3484 Merge pull request #5699 from Edraak/staff-debug-info-ltr-code
Make staff debug info code to be always LTR
2014-10-28 09:13:51 -04:00
Usman Khalid
ca65b68636 Added commit_on_success_with_read_committed decorator to courseware.views.index.
TNL-367
2014-10-27 20:44:14 +05:00
frances botsford
93425a7c47 Merge pull request #5719 from edx/frances/fix/rtl-dashboard-fixes
small UI fixes on dashboard for RTL
2014-10-24 15:26:42 -04:00
frances botsford
60bb6a1021 Merge pull request #5696 from Stanford-Online/giulio/course-about-font-awesomize
Convert icons on course_about to font awesome
2014-10-24 14:05:23 -04:00
Frances Botsford
13b97e3606 small UI fixes on dashboard for RTL 2014-10-24 14:01:39 -04:00
John Eskew
5ffc6ac256 Merge pull request #4854 from edx/jeskew/assetstore_modulestore_work
Phase 1 of adding asset metadata saving to old Mongo
2014-10-24 12:47:53 -04:00
Sarina Canelake
3d1c54fefa Merge pull request #5595 from Stanford-Online/caijim/resetbutton
Support and tests for adding a reset button to units
2014-10-24 11:49:24 -04:00
John Eskew
b857a0ed7b Phase 1 of adding asset metadata saving to old Mongo 2014-10-24 11:07:32 -04:00
Giulio Gratta
5b647a3a12 remove unused icon images 2014-10-23 14:04:15 -07: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
Giulio Gratta
07263de841 Convert icons on course_about to font awesome 2014-10-23 10:54:18 -07:00
Omar Al-Ithawi
4f4349a63b Make staff debug info code to be always LTR 2014-10-23 14:26:56 +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
Tim Babych
ffd64212ea Merge pull request #5657 from edx/tim/mktg-iframe-trim
TNL-281: reduce amount of JS in marketing iframe
2014-10-22 23:03:15 +03:00
Chris Dodge
f463aca922 Dont use site_name, use platform_name in the shopping cart flow template 2014-10-22 15:09:10 -04:00
Tim Babych
fc6cb50256 TNL-281: reduce amount of JS in marketing iframe 2014-10-22 20:54:45 +03: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
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00
Muhammad Shoaib
b0802aafc8 css fix of remove icon and Fixed a bug where the discount coupon applied ‘disappeared’
when changing the quantity between enrollment vs reg code cart types.
2014-10-22 09:12:32 -04:00
polesye
7e6483f7b5 TNL-633: Remove leftover Google Font reference. 2014-10-22 16:11:49 +03:00
Chris Dodge
cb6f96603b only multi-seat emails is html 2014-10-22 00:37:46 -04:00
Stephen Sanchez
342472e4a3 Merge pull request #5666 from edx/bug/runtime_resource_fs
Temporary fix for runtime.resources_fs error
2014-10-21 15:40:38 -04:00
chrisndodge
1e82c5426c Merge pull request #5670 from edx/cdodge/WL-98
WL-98
2014-10-21 15:35:23 -04:00
asadiqbal08
1035d67a25 WL-98
fix typo and add more security on API

fix some bugs and typos

address PR feedback

be sure to send emails when accounts already exist

PR feedback

fix multiple uploads

pep8 fixes

pep8 fix

pylint fixes

fix url mapping

WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions

updated the UI of the auto_enroll feature

fixed the errors

PR feedback

add test

add back file filtering

add some more error handling of input

remove unneeded coffeescript code

pylint fixes

add pep8 space

WL-98
- Updated and added test cases.
- Updated membership coffee file for errors display handling.
- fixed minor text issues.

allow for blank lines and add a test

add blank line (pep8)
2014-10-21 14:23:46 -04:00
Don Mitchell
f95ecea9a9 Temporary fix for runtime.resources_fs error 2014-10-21 13:55:29 -04:00
Chris Dodge
19ab2b93b4 Fix unicode problem and also make display links a bit shorter
wip

remove unused kwarg
2014-10-21 13:35:25 -04:00
Waheed Ahmed
865850c2ad Fixed screen reader issues.
TNL-568
TNL-588
TNL-595
2014-10-21 12:33:51 +05:00
Brian Talbot
c62bb614f3 LMS: resolving display issue with edx-footer's width 2014-10-20 16:57:01 -04: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