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

2813 Commits

Author SHA1 Message Date
Sarina Canelake
9fb1d9ecf2 Remove 'Email Settings' link on student dashboard for unauth courses 2013-10-17 15:10:47 -04:00
Sarina Canelake
582e21b92d Course Auth tests for legacy dash 2013-10-17 13:49:42 -04:00
Sarina Canelake
86c4a03eba admin-console support for enabling email per course 2013-10-16 13:02:41 -04:00
Brian Wilson
b8239068cb Check that email subtasks are known to the InstructorTask before executing. 2013-10-16 13:02:41 -04:00
Brian Wilson
9861c935dd Change calls in beta instructor dash. 2013-10-16 13:02:41 -04:00
Brian Wilson
87a72b7e99 Rename some constants, and refactor bulk email task flow. 2013-10-16 13:02:40 -04:00
Brian Wilson
bc599a0662 Update tests with more complete coverage. 2013-10-16 13:02:40 -04:00
Brian Wilson
e75dd4654b Move subtask update logic that was only needed for tests into the tests that needed it. 2013-10-16 13:02:40 -04:00
Brian Wilson
4505fb4e2c Update InstructorTask before performing a retry. 2013-10-16 13:02:40 -04:00
Brian Wilson
c5debc22e7 Add settings to cap infinite retries. 2013-10-16 13:02:36 -04:00
Brian Wilson
41fcd9627b Don't send emails to students who haven't activated. 2013-10-16 13:02:00 -04:00
Brian Wilson
eaec962de9 Internationalize task progress. 2013-10-16 13:01:59 -04:00
Brian Wilson
df0fba9db8 Add more task-level tests for retries and other errors. Respond to initial comments. 2013-10-16 13:01:59 -04:00
Brian Wilson
04f90fee41 Fix subtask code to handle (tests) running in eager mode. 2013-10-16 13:01:59 -04:00
Brian Wilson
a4c35ac4ff Use separate retry count for calculating retry delay. 2013-10-16 13:01:59 -04:00
Brian Wilson
7b7afd472d Incorporate changes in max_retry logic, adding subtask_status as bulk_email arg. 2013-10-16 13:01:59 -04:00
Brian Wilson
08a08448ee Add some handling for SES exceptions. 2013-10-16 13:01:59 -04:00
Brian Wilson
c133fd9168 Use HIGH_PRIORITY_QUEUE for send_course_email. 2013-10-16 13:01:59 -04:00
Brian Wilson
0fd75181e3 Update handling of bulk-email retries to update InstructorTask before each retry. 2013-10-16 13:01:58 -04:00
Brian Wilson
7988b71b09 Move updates for InstructorTask into BaseInstructorTask abstract class. 2013-10-16 13:01:58 -04:00
Brian Wilson
5c29530db9 Factor out subtask-specific code into subtasks.py. 2013-10-16 13:01:58 -04:00
Brian Wilson
01611c33a6 Refactor instructor_task tests, and add handling for general errors in bulk_email subtasks. 2013-10-16 13:01:58 -04:00
Brian Wilson
2f4774f47c Pass status into course_email for tracking retry status. 2013-10-16 13:01:58 -04:00
Brian Wilson
ffbb228acb Add support for counting and reporting skips in background tasks. 2013-10-16 13:01:58 -04:00
Brian Wilson
8fddcdffcd Initial refactoring for bulk_email monitoring. 2013-10-16 13:01:57 -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
Julia Hansbrough
fd54b060d8 added self to authors style, changed GET to POST 2013-10-16 13:01:57 -04:00
Julia Hansbrough
c7d4270ad4 API tests, email tests, working notifications 2013-10-16 13:01:57 -04:00
Will Daly
3f88b87916 Added acceptance tests for bulk email (through beta dashboard) 2013-10-16 13:01:57 -04:00
Julia Hansbrough
d8a857dba2 Changed GET to POST and xmodule HTML editor call, section CSS 2013-10-16 13:01:52 -04:00
Julia Hansbrough
867d3ba1da Implemented bulk email interface for new dashboard 
Responses to Adam's comments; reset common.py, i18n compliance, deleted extraneous email.html file, fixed an HttpResponse, deleted unnecessary commented-out code, some small style tweaks
 2013-10-16 13:01:14 -04:00
Julia Hansbrough
91c31e12d5 Implemented bulk email interface for new dashboard 2013-10-16 13:01:14 -04:00
Valera Rozuvan
e1e0cba033 Added acceptance tests. 2013-10-16 15:44:21 +03:00
marco
81a2ac413d Merge branch 'release' 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2013-10-01 17:05:02 -04:00
Jason Bau
829d0d5dd0 Merge pull request #1174 from edx/jbau/fix/optional-enable-shopping-cart 
make ENABLE_SHOPPING_CART truly optional
 2013-09-30 11:05:38 -07: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
Carlos Andrés Rocha
2e7e354076 Fix course enrollment count in instructor dashboard 
Fix AN-115
 2013-09-30 11:41:49 -04:00
Vik Paruchuri
9a6ae8f740 Clean up open ended problems view and fix error. 2013-09-27 16:02:12 -04:00
Usman Khalid
316b4eee95 Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional 
Added setting to disable 'find courses' links
 2013-09-27 12:40:07 -07:00
Sarina Canelake
91d85f5c2a Enable alerts when a task succeeds. 
Note: Alerts are pop-up boxes. Not sure if this is desireable, but I couldn't figure out
how to make a success message show up in the same place that error messages do.
 2013-09-27 12:17:53 -04:00
Sarina Canelake
086f544a1a Fix, and add more, tests 2013-09-27 12:17:45 -04:00
Sarina Canelake
07e76b3b2f Enable use of student usernames on student admin page 
This is in addition to email addresses, which also work.
 2013-09-27 12:17:35 -04:00
Sarina Canelake
8a2bd25b7c Visual rearrangement of new dash "Student Admin" page 2013-09-27 12:17:24 -04:00
Calen Pennington
f500b72290 Make sure that we have the right set of fields available during xml parsing 
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.

The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
 2013-09-27 10:57:39 -04:00
Calen Pennington
813795ddf4 Add a management command to dump xml courses 
This command loads the courses with the XMLModuleStore, and then exports
the fields contents as json in a diff-friendly way. This can then be
used to validate against regressions in the xml parsing code.
 2013-09-27 10:57:39 -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
Will Daly
9385b5764c Merge pull request #1143 from edx/will/skip-tests-with-comments 
Use comments to skip tests instead of a tag
 2013-09-27 05:33:49 -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
Will Daly
3c88ccb4ff Use comments to skip tests instead of a tag 2013-09-26 16:37:25 -04:00