Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,147 Commits 1 Branch 0 Tags
8bd686d63cbd46775f35faddddcf0baaffcba310
Commit Graph

720 Commits

Author SHA1 Message Date
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
Adam
933935a887 Merge pull request #433 from edx/tsinghuax/lms-i18n 
Tsinghuax/lms i18n
 2013-08-01 07:00:00 -07:00
Will Daly
b78f6f7a3d Added pylint exceptions to load test settings. 2013-08-01 09:42:31 -04:00
Will Daly
9e5d64b8df Removed check for AUTOMATIC_AUTH_FOR_LOAD_TESTING because 
it's already implied that you're using load testing settings.
 2013-08-01 09:29:58 -04:00
Will Daly
ab1461542d Moved CSRF override into its own settings file 2013-08-01 09:27:46 -04: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
8abd7bb6fe these values are set implicitly at :147, setting them here clobbers them 2013-07-31 16:40:54 -04:00
e0d
b9d762a0b8 changing the default in common.py 2013-07-30 16:20:35 -04:00
e0d
f1962a7bd7 removing an unneeded line that does damage 2013-07-30 16:20:18 -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
Diana Huang
0d10a872c8 Merge pull request #499 from edx/diana/login-redirect 
Only redirect when redirect url is an internal page.
 2013-07-30 05:29:39 -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
Jim Abramson
8ccaf623f1 add EDX_API_KEY to aws.py 2013-07-29 15:16:37 -04:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -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
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
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
Greg Price
790328dfa8 Add acceptance test for one-click unsubscribe page 2013-07-22 11:50:26 -04: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
Jason Bau
034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME 
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
 2013-07-19 17:43:37 -07: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
Chris Dodge
db7434fa18 add comment as to why we are turning off this feature flag 2013-07-12 20:02:23 -04:00
Chris Dodge
1060cf5cec Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRATION feature flag. So when running as mongo-backed, set that to False 2013-07-12 11:51:57 -04:00
John Jarvis
67f8d48840 Merge pull request #367 from edx/jarv/gce-email-backend 
adding option for file based backend
 2013-07-11 08:02:47 -07:00
Jason Bau
4b59a85dae Merge pull request #336 from edx/fix/jbau/parameterize-s3-upload-bucket-name 
Parameterize aws s3 bucket name for forum uploads
 2013-07-10 14:51:08 -07:00
Jonah Stanley
786f422ffa Merge pull request #298 from edx/jonahstanley/acceptance-tests-unique-database 
Jonahstanley/acceptance tests unique database
 2013-07-10 14:09:28 -07:00
John Jarvis
5b16fbe369 adding option for file based backend 2013-07-10 16:05:37 -04:00
JonahStanley
4685cacc7b Databases are now cleaned properly 
Acceptance_static is used to prevent collect static from using a seed
test.py had its seed removed due to redundancy
 2013-07-10 15:28:23 -04:00
Adam Palay
d056c8a8f2 replace test setting changes with test-specific mock.patch.dicts 2013-07-10 10:18:58 -04:00
Ned Batchelder
1dbbbb104f Merge pull request #351 from edx/ned/make-tests-quieter 
Provide a null log function for OpenID to keep it from spewing during tests
 2013-07-09 11:17:44 -07:00
JonahStanley
0bd1e78e03 Acceptance tests use random ports 2013-07-09 12:18:30 -04:00
JonahStanley
a21303ba96 Found some other places where the name should be unique 2013-07-09 10:49:19 -04:00
JonahStanley
a2020aad03 Changed the lms database name to be different for the acceptance tests 2013-07-09 09:31:37 -04:00
JonahStanley
1eaa0317c4 Using parent process id for random number 
This is to allow acceptance tests to properly link and know the names of its other parts
 2013-07-09 08:57:05 -04:00
JonahStanley
789b711023 Acceptance tests now pull from their own unique database 
These databases/collections are cleared after harvest
 2013-07-09 08:54:19 -04:00
Carlos Andrés Rocha
1fbab8e9fa Merge pull request #295 from edx/rocha/celery-virtual-host 
Add setting to set the virtual host of a Celery broker
 2013-07-08 06:58:31 -07:00
Jason Bau
7bc52394ad Parameterize aws s3 bucket name for forum uploads 
especially since s3 namespace is _global_
 2013-07-03 15:26:32 -07:00