Commit Graph

1926 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
6ad235f5db Ignore errors during cleanup of course export command. 2014-10-31 15:20:17 -04:00
Martyn James
9f3b9c7ba3 Merge pull request #5818 from edx/release
Merging latest updates to release
2014-10-31 14:49:04 -04:00
Calen Pennington
b4562ffe6b Merge pull request #5783 from cpennington/proxy-through-module-system-to-descriptor-system
Fix PLAT-191
2014-10-31 09:31:13 -04:00
Jim
3ceb0e5c6a Commenting out flaky string input test case 2014-10-30 14:33:36 -07:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Calen Pennington
34d09085ab Remove proxying of resources_fs, and add a unittest that exposes the problem
[PLAT-191]
2014-10-29 13:48:57 -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
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
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
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
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
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
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
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
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
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
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
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
Braden MacDonald
a8f622af7f Consistently ensure dog_stats_api tags are formatted correctly 2014-10-09 12:35:26 -07:00
Brian Wilson
61c2b96a4a Only permit ascii characters in filenames generated from course_ids. 2014-10-08 11:43:07 -04:00
Brian Wilson
e26b86de60 Make sure temporary course directory uses safe characters. 2014-10-07 22:28:00 -04:00
Calen Pennington
f47a5e1b68 Merge pull request #5498 from edx/jeskew/split_fix_auto_auth
Optimize LMS views for Split courses.
2014-10-07 16:02:31 -04:00
stephensanchez
afaaca969a Adding new styles for dashboard notifications.
Change the reverification failure message styling.

Changing templates so new styles do not appear in courseware.

Removing unused aria tag.

PR comments on cleaning up SASS

Fix signup LMS test.

Copy changes per review on PR

Updating based on PR comments

Style and HTML changes for notifications
2014-10-07 15:44:47 +00:00
John Eskew
18822bdb4e Wrap course info and dashboard in bulk ops wrapper to reduce Mongo calls. 2014-10-06 16:53:11 -04:00
Don Mitchell
0ed4ee32eb Use bulk operations on get_course_by_id and courseware 2014-10-06 16:53:10 -04:00
John Eskew
c4dc7376ad Add bulk_operations() wrapper around course progress view. 2014-10-06 16:53:10 -04:00
Don Mitchell
4f795f8270 Fix hardcoded course urls 2014-10-03 10:56:00 -04:00
Don Mitchell
edffa73512 Convert acceptance to opaque keys 2014-10-03 10:55:58 -04:00
Calen Pennington
87558c2c9c Merge pull request #5212 from cpennington/split/import-export-performance
Improve performance of split-mongo import/export performance
2014-09-30 15:44:04 -04:00
Calen Pennington
1a682dacd1 Include caching definitions in split bulk operations 2014-09-29 22:35:41 -04:00
Don Mitchell
dc9654283e Fix unit tests for generated
course ids.
2014-09-29 11:25:56 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split
11300
2014-09-29 11:25:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
zubair-arbi
570a922661 Merge pull request #5362 from edx/zub/bugfix/plat-88-importstatusinvalidkeyerror
add couse key verification decorator in common for use in both studio an...
2014-09-29 15:44:02 +05:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms
PLAT-88
2014-09-29 13:26:43 +05:00
Waheed Ahmed
29aa933140 Converted annotation lettuce test into bok-choy test.
TNL-353
2014-09-29 13:12:06 +05:00
Stephen Sanchez
c88e914077 Merge pull request #5398 from edx/sanchez/fix_about_page_header
Allowing new styles on White Label about pages.
2014-09-26 08:18:08 -04:00
Stephen Sanchez
3fd3bd4e43 Crude solution to allowing new styles on White Label about pages. 2014-09-25 20:31:18 +00:00
Andy Armstrong
0ed3a95d3a Merge branch 'release'
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
2014-09-25 16:25:45 -04:00
Julia Hansbrough
6b061ad23b Response to CR 2014-09-24 21:20:49 +00:00
Andy Armstrong
74fb8e93ed Merge pull request #5382 from edx/revert-5380-revert-5359-cdodge/add-microsite-tag-to-zendesk
Revert "Revert "add an additional tag so we can route zendesk tickets be...
2014-09-24 14:21:41 -04:00
Julia Hansbrough
5b3c69bc87 Tests fixed 2014-09-24 17:24:42 +00:00
chrisndodge
c928252b5a Revert "Revert "add an additional tag so we can route zendesk tickets better for..." 2014-09-24 13:19:51 -04:00
Paul Medlock-Walton
b797c6bd09 username and email request for lti module
allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button
2014-09-24 20:05:42 +03:00