Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

115 Commits

Author SHA1 Message Date
Sarina Canelake
9330ef65a8 Enable Pending Tasks section on new dash 
Add Pending Tasks section to the following tabs:
* Course Info
* Student Email
* Data Download
* Email

LMS-1242
 2013-10-30 13:43:39 -04:00
Julia Hansbrough
e325317bde Changed GET to POST and xmodule HTML editor call, section CSS 2013-10-10 17:06:37 +00:00
David Baumgold
16ca0252b3 Clarify USE_I18N settings 
@jzoldak showed me that setting `USE_I18N = DEBUG` didn't actually accomplish
what I had hoped it would -- changing DEBUG didn't also change USE_I18N.
This pull request accomplishes what I was trying to accomplish, without being
quite so clever about it.
 2013-10-09 09:04:12 -04:00
David Ormsbee
634da27347 Add AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING flag so that acceptance tests can run through certificate identity verification flow. 2013-10-02 18:09:00 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Adam Palay
7ff4397e81 change disable_start_dates to False in lms.dev to mirror more closely a production environment 2013-09-11 18:33:43 -04:00
Frances Botsford
ccc3589ecb removing test code from dev.py 2013-09-04 14:53:36 -04: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
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
Jason Bau
5fbb12cb61 make PaidCourseRegistration mode aware 2013-08-22 15:39:55 -04:00
Diana Huang
5a90a6590f Put shopping cart views behind flags 2013-08-22 15:39:55 -04:00
Diana Huang
23a15aed57 Pull CyberSource values from environment variables 
when in a dev environment.
 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
086f55643e Bare bones outline of ID verification templates 2013-08-21 16:21:52 -04:00
Jason Bau
65f2814d73 make PaidCourseRegistration mode aware 2013-08-21 13:14:22 -04:00
Diana Huang
88f54fff20 Put shopping cart views behind flags 2013-08-21 13:14:21 -04:00
Diana Huang
cff5491f8c Pull CyberSource values from environment variables 
when in a dev environment.
 2013-08-21 13:14:21 -04:00
Adam Palay
8aee225136 in grading, if problem cannot be created, return score as none 2013-08-16 10:25:38 -04:00
Jay Zoldak
6416a21aa5 Merge branch 'release' 2013-08-14 12:11:52 -04:00
Adam Palay
72fdc414ca change FEEDBACK_SUBMISSION_EMAIL to @example.com in dev settings 2013-08-14 10:57:03 -04:00
Adam Palay
5fd09ca1ee add dummy FEEDBACK_SUBMISSION_EMAIL for debugging 2013-08-14 10:09:01 -04:00
Adam Palay
172d415929 add dummy FEEDBACK_SUBMISSION_EMAIL for debugging 2013-08-13 16:13:42 -04:00
Miles Steele
47ae2f6429 enable instructor dashboard in lms/envs/dev 2013-08-13 11:05:20 -04:00
Miles Steele
a727959d18 add feature switch for beta dashboard 2013-08-02 09:52:15 -04:00
Greg Price
6418a1cf5b Allow user API access in dev environments 
This is achieved by allowing access if settings.DEBUG is True and
settings.EDX_API_KEY is not set or None (which is true for dev.py)
 2013-07-25 14:02:43 -04:00
Greg Price
6a97ddf53c Add an API to interact with users and preferences 
The new API uses Django REST Framework. For now, it is designed specifically
to support the use cases required by the forum digest notifier (not yet built),
with a goal of making it more generally useful over time.
 2013-07-22 10:57:18 -04:00
Felix Sun
b6760cebca Fixed a small, but dangerous, string-to-integer casting bug in hint_manager. 
Expanded tests of hint_manager.

Enabled the hint_manager by default in development environments.
 2013-07-01 10:25:04 -04:00
Ned Batchelder
5a5d425eb3 Files that may not exist need F0401 suppressed during import. 2013-06-21 17:33:23 -04:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00
Victor Shnayder
4ffe3c51b5 Adds segment-io integration into the LMS 
Tell segment IO whenever a page is loaded.  Once this works, we
can add more detailed instrumentation for events we care about.

Will be turned off in prod until the SEGMENT_IO_LMS feature flag is
set to True and a SEGMENT_IO_LMS_KEY is set.
 2013-06-06 11:34:03 -04:00
Ned Batchelder
7e8c06caf3 Developer-private settings files 
Developers can have private settings files by creating
lms/envs/private.py or cms/envs/private.py.  They are imported
at the end of dev.py.  Note that they won't be imported if you
are using one of the other dev*.py variants.
 2013-06-05 16:07:17 -04:00
Calen Pennington
241ef68f4f Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location 2013-05-21 09:34:12 -04:00
Carlos Andrés Rocha
35bd38d677 Add status app with simple view to check celery workers 2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
c05efbc31e Added base Celery settings 2013-05-17 11:33:14 -04:00
Carlos Andrés Rocha
95496b5c50 Cleanup dev settings a little bit 2013-05-17 11:33:14 -04:00
Diana Huang
886e74342d Move the testcenter login to external_auth 
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
 2013-04-25 11:12:19 -04:00
Carlos Andrés Rocha
29efa84205 Enable dev env support for sass source maps 
Change the parameters of the sass compiler to output source
maps. Google Chrome uses the maps in the debugger to show the sass or
scss file that originated the style for a particular element.

More information here:

http://fonicmonkey.net/2013/03/25/native-sass-scss-source-map-support-in-chrome-and-rails/
 2013-03-29 18:34:02 -04:00
Carlos Andrés Rocha
4050da6b4c Enable meta-universities (organizations that contain other) 2013-03-28 13:23:50 -04:00
Calen Pennington
fb8352e2cc Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-15 10:33:54 -04:00
Chris Dodge
d2f216615f move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled 2013-03-14 13:57:48 -04:00
David Ormsbee
8d4e0f8386 Add ANALYTICS_API_KEY to config files and dashboard analytics call 2013-03-13 16:55:40 -04:00
David Ormsbee
33c2507abc Guard against connection errors to the Analytics service. 2013-03-13 15:27:33 -04:00
David Ormsbee
3bb3cf3ca3 Consolidate some of the analytic fetching logic in the instructor dashboard. 2013-03-09 18:52:20 -05:00
David Ormsbee
d0bff1ed3c Merge branch 'master' into jmpm-analytics 
Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
 2013-03-06 17:09:09 -05:00
Vik Paruchuri
aca5e2300b Fix dev settings 2013-02-11 17:33:16 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Calen Pennington
d132f2e18a Only put data repos in STATICFILES_DIRS if we're serving them from django (which is only in dev) 2013-01-30 09:12:50 -05:00
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00