Commit Graph

384 Commits

Author SHA1 Message Date
Diana Huang
4005b3bd79 Merge pull request #554 from edx/diana/django-ratelimit
Limit the rate of logins
2013-08-02 11:02:04 -07:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
Miles Steele
2760938e15 fix analytics distribution with no data, add unit test, cleanup 2013-08-02 09:53:21 -04:00
Miles Steele
e05d0f97d8 fix permissions, fix ENABLE_INSTRUCTOR_BACKGROUND_TASKS usage, fix csv download 2013-08-02 09:53:19 -04:00
Miles Steele
a727959d18 add feature switch for beta dashboard 2013-08-02 09:52:15 -04:00
John Jarvis
b93e1985fb changing default ADMINS to an empty tuple
https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-ADMINS
https://docs.djangoproject.com/en/dev/howto/error-reporting/
2013-08-01 12:50:23 -04:00
Will Daly
cadb81355e Merge pull request #548 from edx/will/fix-auto-auth-csrf-2
Ensure auto-auth feature flag actually disables CSRF
2013-08-01 08:20:32 -07:00
Will Daly
39030c6683 Remove CSRF middleware/processor in aws and dev settings,
not common.  This ensures that we load the MITX_FEATURES
token BEFORE deciding to disable CSRF.
2013-07-31 23:59:25 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
e0d
b9d762a0b8 changing the default in common.py 2013-07-30 16:20:35 -04:00
David Ormsbee
b65200c2a8 Merge branch 'master' into rc/2013-07-30 2013-07-30 08:34:21 -04:00
Jim Abramson
77a796e2c7 Merge pull request #520 from edx/feature/kevin/email_notifications_panel
Feature/kevin/email notifications panel
2013-07-30 05:30:56 -07:00
jsa
0207255e1f fix strange comment typo 2013-07-30 00:14:10 -04:00
jsa
33d4ae69dd add feature flag to enable/disable discussion home panel 2013-07-29 18:13:12 -04:00
David Ormsbee
3d8b32bb69 Reverting 89c48f4a30 to unbreak codejail for this release. 2013-07-29 17:18:52 -04:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
ihoover
aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth
Ihoover/feature flag auto auth
2013-07-25 08:11:22 -07:00
Greg Price
47b51e9329 Add endpoints to set user notification preference
Two endpoints are intended to be used by AJAX calls from the web UI with an
authenticated user. When enabled, the value of the preference is an encryption
of the username, to be used as a token for one-click unsubscribe links. The
third endpoint is the target of unsubscribe links, which displays a page with
an appropriate message to the user.
2013-07-22 11:50:26 -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
ihoover
3d669eabe0 fix merge conflicts with master 2013-07-19 16:03:13 -04:00
Nate Hardison
3aec9fdb77 Add setting to enable/disable chat site-wide
To protect against chat blowing things up, we include a way to
enable and disable it on an entire site-wide basis.
2013-07-18 15:00:54 -07:00
Ned Batchelder
89c48f4a30 Use CodeJail with FSIZE support, and default to 50k 2013-07-18 17:25:05 -04:00
ihoover
b42eacaa8f moved MAX_AUTO_AUTH_USERS to ENV_TOKENS 2013-07-17 10:00:24 -04:00
ihoover
ee4bc424ce remove depracated feature flag GENERATE_RANDOM_USER_CREDENTIALS 2013-07-17 09:12:07 -04:00
ihoover
ceacc3b4b5 moved auto_auth view to students.view and fixed flag conflicts 2013-07-16 17:43:32 -04:00
ihoover
e5f44165f8 Made activation flag and ENV_TOKEN 2013-07-16 15:29:38 -04:00
ihoover
9eb1cce352 maximum number of random users 2013-07-16 14:05:41 -04:00
ihoover
66eb47fb0d Disabled csrf and made auto_login page toggleable with setting 2013-07-16 11:54:50 -04:00
Felix Sun
f219228e4a Made the hint management instructor view off by default. 2013-07-01 10:25:04 -04:00
Juho Kim
ae960ccf5a analytics service update 2013-06-21 17:40:54 -04:00
Juho Kim
513c01b166 bringing up to master 2013-06-21 17:39:38 -04:00
Jason Bau
07e56ac43b Merge pull request #67 from edx/features/jbau/stanford-shib
Shibboleth Auth
2013-06-21 09:32:30 -07:00
Jason Bau
aa4e27f775 Shib PR responses to @cpennington and @ormsbee comments
* Changed unicode test cases to ascii encoding
* Removed 'stanford' hardcoding in TOS logic in lieu of
  'SHIB_DISABLE_TOS' MIT_FEATURES flag
* made 'external_auth' always an installed_app in lms
* log.exception changd to log.error where appropriate

But: did not change skipping tests to changing settings, for
reasons stated here:
https://github.com/edx/edx-platform/pull/67#issuecomment-19790330
2013-06-20 18:12:20 -07:00
Ned Batchelder
3eec09b87a Merge pull request #216 from edx/ned/remove-unused-imports
Ned/remove unused imports
2013-06-20 14:15:31 -07:00
Calen Pennington
d06a9a2043 Merge pull request #219 from edx/cale/remove-simplewiki
Remove simplewiki from the codebase
2013-06-20 13:43:38 -07:00
Calen Pennington
448ca26cdf Remove simplewiki from the codebase 2013-06-20 09:06:29 -04:00
Ned Batchelder
e775852ee4 Make lms and cms more similar. 2013-06-19 22:44:55 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Renzo Lucioni
7c048fb243 Merge pull request #181 from edx/renzo/segment-io-sequentials
Instrument sequentials with segment-io
2013-06-19 08:07:37 -07: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
Brian Wilson
c48dabc383 Move code to instructor_task Django app. 2013-06-18 11:17:15 -04:00
Brian Wilson
003c9ba5d9 Define MITX_FEATURES['ENABLE_COURSE_BACKGROUND_TASKS'] to allow background tasks to be removed from instructor dash. 2013-06-18 11:13:17 -04:00
Renzo Lucioni
c30d2d2f52 Incorporate Segment.io into Logger.log with whitelist 2013-06-17 13:48:50 -04:00
Don Mitchell
168cb306d3 Move tz_aware into connection config rather than settings.
Make django use_tz
2013-06-10 17:16:35 -04: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
Nate Hardison
07511e20be Add settings for contact and bugs emails
Allow themes to override contact and bugs email addresses via the
settings.
2013-06-05 10:27:24 -07:00
Nate Hardison
41a6a352de Add setting for technical support email config
Configure the technical support email address in the settings so that
themes can override with an email of their own in the appropriate
env.json file in production.
2013-06-05 10:27:24 -07:00
Nate Hardison
3934770d05 Add the PLATFORM_NAME setting for display config
This setting is used to control the display name of the platform. The
default is "edX", but themes may wish to override. For example,
Stanford will use "Stanford Online" for the time being.
2013-06-05 10:27:22 -07:00
Nate Hardison
a3ca0843ae Use a setting for the favicon path
The `FAVICON_PATH` setting determines the location of the favicon for
the site. It's automatically adjusted when a theme is enabled,
establishing the convention that themes will place their favicon in
`static/images/favicon.ico`.
2013-06-05 10:17:15 -07:00
Nate Hardison
1001b315a3 Preprocess assets as Django management command
Rather than directly invoke command-line Python (and Mako) from the
assets Rakefile, or call an external Python script, use a Django
management command to preprocess all asset template files.

An "asset template file" is defined as a static asset file with a
file extension indicating that it needs to be run through a template
engine prior to Sass/CoffeeScript compilation or packaging with other
assets. The preprocess_assets management command will look through
all of the files listed in the `STATICFILES_DIRS`, preprocessing each
as needed. Preprocessing strips off the special template file
extension, creating a new file in the process.

Currently, the only variable accessible in an asset template file is
the `THEME_NAME`, defined in the settings.
2013-06-03 09:58:01 -07:00