When mathjax is down discussion forum doesn't work
as we were using markdown.js with processor as
mathjax. Unavailability of mathjax raise error in
js which stops discussion to render. So I made
markdown independent of mathjax. Markdown now will
use mathjax when it is available otherwise ignore it.
TNL-1149
This commit pulls in changes from #4487 that implements keyword
substitution for bulk emails. With these changes, an instructor can
include keywords in their bulk emails which will be automatically substituted
with the corresponding value for the recepient of the email. Keywords are
of the form %%keyword%%, and the keywords implemented in this commit include:
%%USER_ID%% => anonymous_user_id
%%USER_FULLNAME%% => user profile name
%%COURSE_DISPLAY_NAME%% => display name of the course
%%COURSE_END_DATE%% => end date of the course
Client-side validations have also been implemented to ensure that only emails
with well-formed keywords can be sent.
The architecture is designed such that adding in new keywords in the future
would be relatively straight-forward.
Added bokchoy tests and assets (csv files) for CSV auto reg and enrollment.
Set the env flag "ALLOW_AUTOMATED_SIGNUPS": true in bok_choy.env.json
Resolved quality issues.
resolved cherry pick conflicts
Improved bokchoy tests as per code review suggestions.
added the BDD in the docstrings for all the test scenarios
changed the bok choy test string
Improved bokchoy tests as per further code review suggestions.
Made a MembershipPageAutoEnrollSection a separate PageObject.
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4
Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
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)
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
This commit adds a message to the instructor dashboard that is displayed when
no instructor tasks are currently running. This message is displayed where the
instructor pending tasks table would normally be placed, and is replaced
with the table when there are running tasks.
This addresses a bug in the email content history table where
"Unknown" was displayed in the number of emails sent column if any sort of
failure occurred during email sending. This behavior has been editted so now
the number of emails that failed to send is displayed, along with the number
of emails that were successfully sent. If the email task is still pending,
"0 sent" is displayed.
As a small addition, the table now also includes the authors of previously
sent emails, and the modal window for an email also displays its author.
rebased and resolve conficts with cdoge/registration_codes
feature enhancement request: added transaction group name text field to the download buttons as an extra optional query paramerter
Previously on the send email page of the instructor dashboard, instructors could only view
task information about emails they've sent for their course in the past.
In addition to this, I've now added the ability to see the content of all previously sent emails.
A "Sent Email History" button has been added to the page. When clicked, a table displaying the
subject line, number of emails sent, and date/time of submission for each previously sent email
is created. An instructor can then click on any subject line to see the content of that email,
displayed in a modal window that appears on the page.
The window is also equipped with a "copy email to editor" button, which copies the emails contents
to the tinyMCE editor, so that an instructor can easily resend an email that they've sent
in the past.
This commit adds the non-courseware lms/djangoapps and lms/lib.
These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).
For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.
Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>
[LMS-2370]
In the near future an answer distribution report will be displayed in the data download reports table. In order to avoid confusion, we need to clean up several misleading labels and remove a redundant feature.
Note that the redundant feature is surrounded by a feature flag so that it can be disabled once the report goes live in the table.
Fixes: AN-694
