Commit Graph

3531 Commits

Author SHA1 Message Date
e0d
d2554909d8 Adding a new env to handle escalating privileges to run db migrations. 2013-06-11 14:42:39 -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
Don Mitchell
28f8910db4 Make pymongo tz_aware 2013-06-10 17:16:34 -04:00
Calen Pennington
6c24694a7c Fix tests that vary urls.py
Create a mixin class that can be used for tests that customize urls.py
to force django to reload it, so that they don't break other tests.
2013-06-10 10:56:50 -04:00
Juho Kim
98b978528b simplified analytics conf 2013-06-07 18:54:36 -04:00
Juho Kim
e161a0a65e simplified analyticserver settings 2013-06-06 18:58:20 -04:00
Juho Kim
665bc6e3db analytics server setup simplified 2013-06-06 13:48:20 -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
Piotr Mitros
af2416756e Moved from djanalytics to edinsights 2013-06-05 17:06:36 -04:00
Ned Batchelder
56385cdf32 Merge pull request #79 from edx/ned/private-settings
Developer-private settings files
2013-06-05 13:17:26 -07: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
chrisndodge
7fc994831f Merge pull request #75 from edx/feature/cdodge/allow-setting-of-session-cookie-name
seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be ...
2013-06-05 11:35:26 -07:00
Chris Dodge
ffdeac3dcd seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str() 2013-06-05 14:31:32 -04:00
Nate Hardison
96c4c53505 Use default PLATFORM_NAME in AWS settings
Rather than require the `PLATFORM_NAME` to be specified in the
`ENV_TOKENS`, allow the default setting in `common.py` to be used.
2013-06-05 10:56:24 -07:00
Nate Hardison
4031c193a1 Adjust available routes based on theme presence
Themes do not necessarily want all of the available LMS routes, such
as `/jobs` and `/university_profiles`. This change splits up the
`lms/urls.py` file and selectively enables/disables routes based on
whether or not a theme is enabled. This is a naive solution for now;
a better solution gives themes a way to selectively overrides such
routes.

Additionally, with the `MKTG_URL_LINK_MAP` setting that hits certain
routes immediately on each page render (whenever the `marketing_link`
helper function is called), themes may crash if they don't leave
all marketing link routes present in `lms/urls.py`. This change also
provides the ability to override the `MKTG_URL_LINK_MAP` in the
settings.

Finally, modify the mitxmako marketing URL middleware to not try to
reverse disabled URLs, which are those keys in the map whose values
are `None`.
2013-06-05 10:55:12 -07: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
Chris Dodge
6fb97d52c0 fix typos 2013-06-05 11:21:35 -04:00
Chris Dodge
3c9bd1ddf8 allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox) 2013-06-05 10:26:30 -04: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
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00
Ned Batchelder
ae2a507ec8 Remove test_ike.py, Ike says we don't need it, and it looks like a test. 2013-05-31 15:40:51 -04:00
Peter Fogg
6eeb12ad1c Add Lettuce tests for autoplay in Studio. 2013-05-30 11:34:15 -04:00
Calen Pennington
69beea854c Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports
Record junit reports of jasmine tests
2013-05-23 11:06:34 -07:00
Calen Pennington
b2b6ca5f7b Record junit reports of jasmine tests 2013-05-22 22:01:44 -04:00
Chris Dodge
3fceb46953 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 20:44:22 -04:00
Jason Bau
ce2cbb74a1 Merge pull request #2104 from edx/edx-West/enable-django-admin-site
add MITX Feature setting to enable django admin site
2013-05-22 12:43:45 -07:00
Nate Hardison
ea3506d2b9 Add general theming capabilities
This commit adds the requisite settings and startup features to
enable integration of themes into the edX platform. It does not
yet provide hooks in any of the templates, but it does cause the
main `lms/static/sass/application.scss` file to `@import` a theme's
base Sass. Template hooks will come down the road.

CHANGELOG
---------
Define a new `MITX_FEATURE`, `USE_CUSTOM_THEME`, that when enabled,
can be used in templates to determine whether or not custom theme
templates should be used instead of the defaults.

Also define a new setting, `THEME_NAME`, which will be used to
locate theme-specific files. Establish the convention that themes
will be stored outside of the `REPO_ROOT`, inside the `ENV_ROOT`,
in a directory named `themes/`. `themes/<THEME_NAME>` will store
the files for a particular theme.

Provide a function, `enable_theme`, that modifies the template and
static asset load paths appropriately to include the theme's files.

Move the main LMS Sass file to a Mako template that conditionally
`@import`s the theme's base Sass file when a theme is enabled.

Add logic to the assets Rakefile to properly preprocess any Sass/
Mako templates before compiling them.
2013-05-22 12:22:27 -07:00
Jason Bau
5fc8469a81 add example in lms/envs/common.py 2013-05-22 11:49:58 -07:00
Chris Dodge
9b88528b04 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 13:20:49 -04:00
Calen Pennington
cfe220a746 Add exceptions for unused imports in settings files 2013-05-21 13:07:04 -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
Chris Dodge
fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py
2013-05-20 10:22:36 -04:00
e0d
f8e9c4d4d1 Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name
Set the default celery queue name in addition to the default routing key
2013-05-17 15:02:31 -07:00
Carlos Andrés Rocha
34d39dde9a Set the default celery queue name in addition to the default routing key 2013-05-17 17:59:51 -04:00
Greg Price
372084e0b6 Merge branch 'drupal-new'
Conflicts:
	lms/envs/common.py
2013-05-17 16:17:35 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Carlos Andrés Rocha
0042988ea7 Merge pull request #2063 from edx/feature/rocha/lets-use-celery
Add Celery configuration to LMS and CMS
2013-05-17 12:36:23 -07:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing
Feature/zoldak/forum testing
2013-05-17 10:10:55 -07: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
Ned Batchelder
f856b69ab5 Merge branch 'feature/ned/sandboxed-python' 2013-05-17 10:28:06 -04:00
Greg Price
362736c4d1 Merge pull request #2060 from edx/fix/gprice/marketing-links
Fix marketing links in password reset pages
2013-05-16 14:24:13 -07:00
Greg Price
4e95aa053f Fix marketing links in password reset pages 2013-05-16 16:57:56 -04:00
Diana Huang
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -04:00
Arthur Barrett
adcd1dd886 update annotator.min.css with change to fix adder button and serve the minified one. 2013-05-16 14:48:06 -04:00
Arthur Barrett
52e5fe223c update annotator.js library and fix the annotator-adder button hover state in courseware. 2013-05-16 14:27:21 -04:00