Commit Graph

26377 Commits

Author SHA1 Message Date
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
chrisndodge
b60830268d Merge pull request #5665 from edx/cdodge/better-encoding-for-csv-downloads
Fix unicode problem and also make display links a bit shorter
2014-10-21 14:36:26 -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
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
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
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
stephensanchez
c876c4ae93 Merge remote-tracking branch 'origin/release' into rc/2014-10-20 2014-10-20 16:19:08 +00: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
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
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
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
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
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
Brian Talbot
5a31005e96 Merge pull request #5563 from lpil/master
Stop page extending out of viewport width by 40px
2014-10-17 17:14:01 -04:00
Mark Hoeber
8b98c08d13 Merge pull request #5525 from edx/pmitros/olx-doc-fixups
First pass at improving OLX docs
2014-10-17 16:41:13 -04:00
Mark Hoeber
fba0b7b8a4 Merge pull request #5620 from edx/markhoeber-devdoc-fix
Devdoc fix
2014-10-17 16:38:45 -04:00
Mark Hoeber
3170e36c66 Removed highlight underscore, which was breaking on RTD 2014-10-17 16:24:38 -04:00
Waqas Khalid
9ba03c8aac Post with the discussion id containing dots uneditable
When user try to edit the post under dicussion whose
id contains dots it doesn't allow user to edit taht
post.

TNL-607
2014-10-18 01:07:27 +05: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
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Stephen Sanchez
a9645514df Merge pull request #5619 from edx/sanchez/transfer-student-command
Update the student transfer command to transfer to multiple courses.
2014-10-17 13:48:59 -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
stephensanchez
b6f0c8dd30 Update the student transfer command to transfer to multiple courses.
Quick cleanup

Making kwarg to suppress unenroll events.

pylint and pep8 errors cleaned up.

add commit on success.

Changing transactional behavior of the management command.
2014-10-17 16:59:22 +00:00
Mark Hoeber
cc702589f6 Merge pull request #5607 from edx/carol/docs/DOC-1054
Clarify Max Attempts
2014-10-17 12:50:54 -04:00
Carol Tong
11792fb955 Clarify Max Attempts
Add text to clarify relationship between Max Attempts setting
course-wide vs individual problems
2014-10-17 12:49:15 -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
Jesse Zoldak
f0b7850de3 Merge pull request #5609 from edx/zoldak/remove-tmp-references
Remove references to /tmp in tests
2014-10-17 12:12:53 -04:00
Waqas Khalid
3974e6d95f Merge pull request #5562 from mlkwaqas/waqas/tnl526-search-magnify-glass-not-working
Clicking the magnifying glass should perform search
2014-10-17 20:03:36 +05:00
Ben Patterson
9745b953bc Merge pull request #5597 from edx/benp/doc-paver-changes
Doc for paver quality switches.
2014-10-17 10:57:54 -04:00
Alison Hodges
a08e2ee232 Open source rename child-id 2014-10-17 10:52:03 -04:00
Christina Roberts
2ae3fd0a08 Merge pull request #5589 from edx/christina/tnl-399-remove-save
Do not save an xblock after rendering the Studio view.
2014-10-17 10:37:47 -04:00
Sarina Canelake
d1f256af29 Merge pull request #5566 from Kelketek/lazy_coursemode_translation
Lazy loading of CourseMode model's internationalization.
2014-10-17 10:26:05 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
2014-10-17 10:00:12 -04:00
Waqas Khalid
ff8b281f5b Clicking the magnifying glass should perform search
In forum search is only working when user enter some
text in the search textfield and press the Enter
button. It should also work when we click on
magnifying glass.

TNL-526
2014-10-17 18:34:57 +05:00
cahrens
d3012af733 Do not save an xblock after rendering the Studio view.
TNL-399

Content and settings are no longer saved when Studio view is rendered.
2014-10-17 09:29:32 -04:00
Adam
5511aba23e Merge pull request #5471 from edx/adam/thumbnail-extentions
image files with different extensions should generate thumbnails with di...
2014-10-17 09:18:06 -04:00