Commit Graph

750 Commits

Author SHA1 Message Date
Chris Dodge
352e56eb4e address some pylint violations in the mixedmodulestore build report 2013-08-19 23:40:46 -04:00
Jonah Stanley
73ad057eff Merge pull request #710 from edx/jonahstanley/help-acceptance-test
Jonahstanley/help acceptance test
2013-08-19 14:02:29 -07:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore
Feature/cdodge/add a mixed modulestore
2013-08-17 07:32:51 -07:00
Carlos Andrés Rocha
4e0f3d0791 Merge pull request #706 from rocha/enable-django-nose-for-all
Enable the django_nose app by default
2013-08-16 11:29:43 -07:00
JonahStanley
fc67c2ee6b Wrote preliminary help modal acceptance tests 2013-08-16 10:36:12 -04:00
Adam Palay
8aee225136 in grading, if problem cannot be created, return score as none 2013-08-16 10:25:38 -04:00
Chris Dodge
cf715cb727 fix pylint violations 2013-08-15 22:58:04 -04:00
Chris Dodge
cff93d324b WIP 2013-08-15 22:58:02 -04:00
Chris Dodge
6f11b98b4f initial commit for a mixed module store which can interoperate with both XML and Mongo module stores 2013-08-15 22:56:32 -04:00
Carlos Andrés Rocha
bbfe3662e2 Enable the django_nose app by default
The django_nose it is very useful, even outside the test
environment. For example, it lets you to easily run test from
manage.py without additional changes to the test packages.
2013-08-15 19:31:30 -04:00
JonahStanley
a067fb58d6 Workaround for issue
Better wording of commit

Workaround for issue

Better wording of commit

Fixed spacing
2013-08-15 16:59:30 -04:00
Adam Palay
4855fd5af4 turn off i18n 2013-08-14 17:03:21 -04:00
Diana Huang
6c6ba54e84 Create Course Modes django app 2013-08-14 14:40:17 -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
Lyla Fischer
e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video
Migration videoalpha module to one main video module
2013-08-12 10:56:12 -07:00
Anton Stupak
74f3595d54 Add acceptance tests for checking rendering. 2013-08-12 14:32:15 +03:00
Miles Steele
e9aca13636 enable beta dashboard 2013-08-09 14:22:56 -04:00
Jay Zoldak
8414ef022f Modify lms acceptance test to use auto_auth. 2013-08-08 12:08:25 -04:00
Jay Zoldak
e78edf8ef9 Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also. 2013-08-08 12:08:25 -04:00
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
7392a888ce cleanup, fix permissions, rename functions, add more api tests 2013-08-02 09:53:20 -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
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