1. 28 May, 2015 1 commit
  2. 22 May, 2015 1 commit
    • SOL-794 Detailed Enrollment Report · b555c869
      - added the abstract and concrete layers of enrollment report provider
      - created a celery task.
      -added the button in the e-commerce reports section
      
      added the enrollment data backend
      
      added the payment data and start writing the test cases.
      
      updated the code with the feedback suggestions and wrote some test cases.
      - all the downloadable reports are now visible in the ecommerce download section.
      Pending instructor tasks is also visible in the ecommerce section
      
      added the fields in the user profile information
      changed the report store configuration key
      added the new http endpoint for financial reports to add more permissions for finance_admin to access.
      
      fix quality issues
      
      added test cases to check csv content data
      
      rebased with master and resolved conflicts
      
      changed the log messages
      
      added the changes as per code clintonb suggestions during code review
      
      updated the test cases for the finance_admin decorator
      
      changes suggested by clinton.
      
      Created and moved Table level filters to the Custom Manager for the CourseEnrollment model.
      
      ecommerce.js file was loaded twice in the instructor_dashboard.js fixed the issues
      
      added the registration code column in the csv
      
      added the full gender in the csv file
      
      Update data sources and add display name translations for the report columns
      
      fix meta name
      
      Make sure the reports section does not appear on non whitelabel courses
      
      pylint fixes
      
      expand out enumerated values
      Muhammad Shoaib committed
  3. 12 May, 2015 3 commits
  4. 15 Apr, 2015 1 commit
  5. 23 Mar, 2015 1 commit
  6. 06 Mar, 2015 1 commit
  7. 04 Mar, 2015 1 commit
    • backend changes based on feedback · e21ff203
      Conflicts:
      	lms/djangoapps/courseware/courses.py
      	lms/djangoapps/instructor_task/api.py
      
      refined entrance exam student attempts reset
      
      Quality improvements 1/16
      
      added rescore, delete state and task history functionality
      
      added unit tests for entrance exam reset attempts
      
      added unit tests for re scoring of entrance exam and task history
      
      improved test coverage
      
      Got rid of pep violation
      
      feedback changes and added jasmine test
      
      added more jasmine tests for Javascript changes
      
      added bok-choy tests for UI changes
      
      replaced input containing <p> tags with <label>
      
      Removed ee element assertions to avoid js error
      
      Added call to super.setUp()
      
      changes based on feedback on 2/18
      
      Writing tests in JS instead of coffee script
      
      commit related to skip entrance exam 2/13
      
      fixed bad-continuation quality error
      
      fixed broken bok-choy test
      
      changes based on feedback on 2/18
      
      added js tests and removed coffee script tests
      
      fixed broken bok-choy and unit tests
      
      changes left while rebasing
      
      rephrase test titles
      
      do not need these libs
      
      changes based on feedback on 2/24
      
      changes text which was left
      
      Changes based on feedback on 3/3
      Zia Fazal committed
  8. 23 Feb, 2015 2 commits
  9. 18 Feb, 2015 2 commits
  10. 10 Feb, 2015 1 commit
    • Discussion forum doesn't work when mathjax is down · 11159ba7
      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
      Waqas Khalid committed
  11. 21 Jan, 2015 1 commit
  12. 15 Jan, 2015 1 commit
  13. 14 Jan, 2015 1 commit
  14. 09 Jan, 2015 1 commit
  15. 06 Jan, 2015 1 commit
  16. 11 Dec, 2014 1 commit
    • Implements keyword sub feature for bulk emails · 32bbb0e7
      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.
      njdup committed
  17. 04 Dec, 2014 1 commit
  18. 18 Nov, 2014 1 commit
    • WL-124 added the jasmine tests for the autoenrollment csv · 97b45cc2
      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.
      Muhammad Shoaib committed
  19. 03 Nov, 2014 1 commit
  20. 01 Nov, 2014 1 commit
  21. 21 Oct, 2014 1 commit
    • WL-98 · 1035d67a
      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)
      asadiqbal08 committed
  22. 20 Oct, 2014 1 commit
    • EX-71 New shopping Cart UI Single person purchase · 4f7c4949
      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
      asadiqbal08 committed
  23. 15 Oct, 2014 1 commit
  24. 02 Oct, 2014 1 commit
  25. 04 Sep, 2014 1 commit
  26. 02 Sep, 2014 1 commit
  27. 27 Aug, 2014 1 commit
  28. 20 Aug, 2014 1 commit
  29. 15 Aug, 2014 1 commit
  30. 14 Aug, 2014 1 commit
    • Email content history fix and additions · 55521590
      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.
      njdup committed
  31. 05 Aug, 2014 3 commits
  32. 04 Aug, 2014 1 commit
    • Instructors can view previously sent email content · 5791fd10
      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.
      njdup committed
  33. 31 Jul, 2014 1 commit
  34. 30 Jul, 2014 1 commit