Commit Graph

131 Commits

Author SHA1 Message Date
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File.
TNL-735
2014-12-10 09:23:04 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations
TNL-649
2014-12-05 09:52:26 -05:00
Muhammad Shoaib
cd30164b5f Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 2014-12-04 01:11:49 -05:00
Sarina Canelake
520935209d s/pylint: disable=W0402/pylint: disable=deprecated-module/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
f663a7fe8d s/pylint: disable=W0612/pylint: disable=unused-variable/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
5f723e8d3c s/pylint: disable=W0703/pylint: disable=broad-except/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
c0556a7ef8 s/pylint: disable=W0613/pylint: disable=unused-argument/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
90624ac4ba s/pylint: disable=R0915/pylint: disable=too-many-statements/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
19f1dacab2 s/pylint: disable=E1101/pylint: disable=no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
e0f1d3f3f3 s/pylint: disable=C0111/pylint: disable=missing-docstring/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
0dad9da5e4 s/pylint: disable=W0621/pylint: disable=redefined-outer-name/ 2014-12-01 11:22:08 -05:00
Muhammad Shoaib
9fddc6946a WL-163-added-the-USD-symbol-himBHin-the-HTML-templates-configuration-settings
added the unit tests for the default currency settings
2014-11-27 17:05:19 +05:00
Muhammad Shoaib
df0bb491fa WL-99 send a copy of the invoice to the finance@edx.org when registration codes are generated
changed the finance_email in the common.py file

added the test for the FiNANCE_EMAIL settings
2014-11-21 17:43:37 +05: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
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
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
Chris Dodge
1809a28b89 Add the ability for Microsites to be able to send appropriately branded emails rather than the default system installed version
fix tests. Update Admin views/forms.

enforce uniqueness constraint in the Admin ModelForm submissions

Update bok_choy cached DBs with new schema changes

PR feedback
2014-10-08 13:04:41 -04:00
Daniel Friedman
ba3f7f9409 Make student profile CSV download a background task, add cohort column 2014-10-02 14:21:13 -04: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
Waqas Khalid
d0d225d8a9 Course admin should be able to de-admin dicussion admins
As a global staff or course staff once you added yourself
in the discussion admins you cannot revoke it back unless
you remove yourself as course staff. Any of the course staff
member should be able to remove others from discussion admins
whether they are course staff or not.

TNL-315
2014-09-24 22:26:31 +05:00
Chris Dodge
0c72e37374 change registration code email and attachments, per product requirements
remove extra lines

conditionalize address line 2
2014-09-24 09:13:37 -04:00
Chris Dodge
f34a1c9d11 Add the 'meta' column from the UserProfile table to the CSV download
add special case logic to get the 'meta' field into the downloaded CSV

wip

wip
2014-09-23 15:08:38 -04:00
Don Mitchell
afa57f505b Remove client side parsing of module_id
in analytics dashboard.
LMS-11209
2014-09-03 21:59:29 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00
Waheed Ahmed
57bc5c9314 Modified request method for change enrollment and bulk beta modify access on instructor dashboard.
LMS-11266
2014-08-27 13:20:04 +05:00
Braden MacDonald
c3abf326ff Friendly error if invalid student identifier is entered for due date extension 2014-08-20 17:09:57 -07:00
Braden MacDonald
f4e021093a Fix: 500 response if indiv. due date deleted after normal due date was deleted 2014-08-19 23:23:07 -07:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
2014-08-05 10:00:13 -04:00
Muhammad Shoaib
4333e53997 added registration-codes generation functionality
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
2014-08-05 10:00:11 -04:00
asadiqbal08
5a9fc036a6 Course Instructor as financeadmin role, will be able to download all purchase transactions in the course as a CSV file 2014-08-05 10:00:10 -04:00
njdup
c5cf6db93d Cleaned pylint quality issues in instructor email content history code. 2014-08-04 16:01:11 -07:00
njdup
5791fd1087 Instructors can view previously sent email content
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.
2014-08-04 10:08:32 -07:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul""
This reverts commit 079808ee47.
2014-07-30 17:01:52 -04:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
2014-07-29 17:41:46 +00:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Abdallah
cf16975bd2 unicode fixes 2014-07-10 17:06:16 -04:00
Will Daly
b00398f5ee ORA2 release-2014-06-11T10.43
Install edx-submissions from PyPi instead of from edx-ora2
2014-06-11 08:15:10 -04:00
Adam Palay
a2b2b37ed7 adds user id to student profile information (LMS-2791) 2014-06-02 15:49:46 -04:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
David Baumgold
0c9d682df3 Merge pull request #3196 from mtyaka/enrollment-emails-http
Don't hardcode https protocol in enrollment emails.
2014-05-30 09:30:43 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Matjaz Gregoric
b755863639 Don't hardcode https protocol in enrollment emails.
Use http or https, depending on the value of `request.is_secure()`.
That is how links in most other emails are handled.
2014-05-28 22:44:42 +02:00
Usman Khalid
3824e234fe Do not persist anonymous ids when exporting for all students of a course.
For large courses this causes export to take a long time and to time out.

LMS-2747
2014-05-28 20:48:43 +05:00
Sarina Canelake
1a4fcb055b Make SPOC gradebook an API implementation
rather than just hacked in to the instructor_dashboard base file.
Also move the tests from the legacy implementation to the new dash API implementation.
2014-05-27 10:59:16 -04:00
Calen Pennington
8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info 2014-05-22 11:24:05 -04:00
Calen Pennington
ddf1874ca4 Fix merge conflicts 2014-05-14 15:59:25 -04:00
Calen Pennington
661f37ecd6 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/legacy.py
2014-05-14 15:57:38 -04:00