Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,367 Commits 1 Branch 0 Tags
9fb1d9ecf2aaf4e7cdfd11fa95682abeb96b416e
Commit Graph

320 Commits

Author SHA1 Message Date
brianhw
97e01be147 Merge pull request #1359 from edx/brian/bulk-email-rc 
Bulk Email improvements for release
 2013-10-16 10:26:28 -07:00
Brian Wilson
ffbb228acb Add support for counting and reporting skips in background tasks. 2013-10-16 13:01:58 -04:00
Brian Wilson
67a8ee1184 Revert remnants of disable-button, and how html editor is invoked. 2013-10-16 13:01:57 -04:00
Julia Hansbrough
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -04:00
Adam Palay
d69748ce7f disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-16 13:01:14 -04:00
Brian Talbot
ef2218296f LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits 2013-10-16 12:29:49 -04:00
marco
81a2ac413d Merge branch 'release' 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2013-10-01 17:05:02 -04:00
Jason Bau
06cac195f0 make ENABLE_SHOPPING_CART truly optional 
course_about was throwing 500s if ENABLE_SHOPPING_CART=False
 2013-09-30 09:09:17 -07:00
Sarina Canelake
8a2bd25b7c Visual rearrangement of new dash "Student Admin" page 2013-09-27 12:17:24 -04:00
Jason Bau
c1d555beef Merge pull request #1118 from edx/jbau/shoppingcart-stanford 
Stanford paid course registration
 2013-09-27 07:31:17 -07:00
Jason Bau
667a1eadb5 Stanford paid course registration 
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
 2013-09-26 18:25:00 -07:00
Nick Parlante
08cb469409 Merge pull request #1104 from edx/nick/anon-userids 
Add "Download CSV of all student anonymized IDs" button to instructor dashboards
 2013-09-25 20:58:34 -07:00
Renzo Lucioni
e7e03f10fb Refactor tab tests 2013-09-25 00:27:36 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Nick Parlante
1b5903935e Add "Download CSV of all student anonymized IDs" button to instructor dashboard 
This is a recurrent ops problem, so we wanted to make it available
on the instructor dashboard.
 2013-09-24 12:59:42 -07:00
Felipe Montoya
c6f4c8b2b8 i18n: staff/student toggle link 2013-09-12 18:13:12 -05:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04:00
cahrens
08d9942993 Allow custom formatting of due date strings. 
STUD-724

Test course for allowing custom formatting of due date strings.

STUD-724

Try making the name of the course match the folder name.

More cleanup.

More cleanup.

updates.
 2013-09-12 14:30:00 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	lms/envs/common.py
 2013-09-09 10:18:25 -04:00
Brian Talbot
70cdc9a705 edx.org: addresses vertical scrollbar on course register button when placed in iframe 2013-09-05 08:49:02 -04:00
Brian Talbot
d4e849d2b2 edx.org: adds custom styling for register button in case of verified option/content displayed 2013-09-04 15:30:10 -04:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms 
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
 2013-09-04 11:29:22 -07:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Jason Bau
b0f9fd0df5 Add link in lms legacy instructor dashboard to cms course_index 
A one-click way of getting to editing the course
 2013-08-31 01:07:34 -07:00
Sarina Canelake
e6bde93837 Change bulk email model field names and add migrations 2013-08-29 12:40:33 -04:00
Sarina Canelake
f98d6764b2 Disable bulk email for XML-backed courses 2013-08-29 12:40:32 -04:00
Sarina Canelake
65f7b098dd Bulk Email: Add design styling 
Switch to using decorators; refactor and cleanup tests.
 2013-08-29 12:40:32 -04:00
Kevin Luo
3b32d4216c Add delay to course bulk email task and use SITE_NAME for site url 
Delay for possible race condition with fetching course email object.
 Use settings.SITE_NAME for host name to generate email footer url.
 2013-08-29 12:40:32 -04:00
Kevin Luo
3ea2b24b98 Add HTML editor for authoring bulk email message (adopted from CMS) 2013-08-29 12:40:32 -04:00
Kevin Luo
907bf6e1b7 Add bulk email feature for instructors, with optout option 
Adds a new Email link to the instructor dashboard for frontend interface to send
email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this.
Creates a new djangoapp bulk_email that handles this action by getting the recipient
list and batching the emails to different celery tasks to do the actual sending.
Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by
retrying or falling through to the next email. Adds the option to opt out of course
specific emails in the user dashboard with an Email Settings link for each course.
Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL
specifies the from address for email. EMAILS_PER_TASK specifies the number of emails
each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER,
EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings.

Co-authored-by: Akshay Jagadeesh <akjags@gmail.com>
 2013-08-29 12:40:31 -04:00
David Ormsbee
0712464f50 Remove mock verify enrollment link 2013-08-26 16:02:56 -04:00
David Ormsbee
dd50ec4e82 Merge design and dev JS/UI for verify student 2013-08-26 15:32:40 -04:00
Felix Sun
199b632513 Crowdsourced hinter now supports formula responses. Tests still broken. 2013-08-26 09:40:03 -04:00
David Ormsbee
478fc376f7 Connect new button to mode selection 2013-08-22 17:50:50 -04:00
Jason Bau
5ae2289df0 about page changes, refactor processor reply handling 2013-08-22 15:39:55 -04:00
David Ormsbee
91fab4579b Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/envs/common.py
	lms/envs/dev.py
 2013-08-22 14:57:34 -04:00
David Ormsbee
1676fc31a5 Halfway state for course enrollment by mode 2013-08-21 16:21:53 -04:00
David Ormsbee
086f55643e Bare bones outline of ID verification templates 2013-08-21 16:21:52 -04:00
Jason Bau
a4f5f4e42f about page changes, refactor processor reply handling 2013-08-21 13:14:21 -04:00
Frances Botsford
445cf39f8b updated styling for marketing side register button to accommodate second line of text 2013-08-16 10:39:45 -04:00
Diana Huang
4946fbcd5b Change registration button based on number of modes. 2013-08-15 16:34:48 -04:00
Jay Zoldak
c09da60fe3 The enrollment_action value enroll should not be translated. 2013-08-13 08:43:09 -04:00
Adam Palay
b2b574ffb6 instructor dash fixes 2013-08-12 11:36:26 -04:00
Miles Steele
8f8d70aeae fix enroll multiple button, fix module_error report 2013-08-09 13:45:27 -04:00
Adam Palay
893f05976d make template string unicode 2013-08-09 12:25:14 -04:00
Adam Palay
d894600207 template fixes on instructor dash 2013-08-06 10:16:57 -04:00
chrisndodge
85267e6a73 Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum 
add display_coursenumber and display_organization fields on the CourseModule
 2013-08-04 18:00:29 -07:00
Chris Dodge
18458bd94b wrong accessor 2013-08-02 21:45:51 -04:00
Chris Dodge
eaeaf3a520 fix formatting error 2013-08-02 21:44:48 -04:00
Chris Dodge
192d51bf7a touch-ups per review feedback 2013-08-02 21:37:27 -04:00