Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

608 Commits

Author SHA1 Message Date
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
Ned Batchelder
e947218285 Merge master to here. 2013-05-16 14:21:51 -04:00
Arthur Barrett
1fbe43a650 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-16 13:23:12 -04:00
Will Daly
342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests 
Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile
 2013-05-16 11:21:59 -04:00
Jay Zoldak
e1481d93a8 Work on view test for comment client code. 2013-05-16 10:56:58 -04:00
Calen Pennington
0701e1a776 Use local node_modules as system_node_path if none is set 2013-05-15 15:25:42 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Will Daly
b3e959773d Disabled logging of warnings/errors for acceptance tests 
to make the logs readable
 2013-05-15 11:31:52 -04:00
Will Daly
36fb8f91e0 Acceptance tests now use the same mongo db as the unit test suite. 
The LMS/CMS acceptance tests both use the collection acceptance_modules
 2013-05-14 12:45:38 -04:00
Will Daly
daef910494 Mae mongo DB and collection names consistent for all 
acceptance tests.
 2013-05-14 12:34:15 -04:00
Chris Dodge
5df23d15f2 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
 2013-05-14 10:57:11 -04:00
Arthur Barrett
5e39971fcc merge master. resolved conflicts in component.py and course.py. 2013-05-14 10:54:21 -04:00
Will Daly
e2d7f6a027 Changed module store directory root to test_root/data 2013-05-14 10:45:27 -04:00
Will Daly
72a42413e2 Fixed database to work on Jenkins (now stored in test_root), 
moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.
 2013-05-14 10:33:25 -04:00
David Baumgold
d376cb52ca Forgot to update phantom-jasmine location for LMS 2013-05-13 17:31:57 -04:00
Ned Batchelder
b682e1c0d3 Put a feature flag around the staff-only debugging page. 2013-05-13 17:07:13 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
Chris Dodge
51809965fe Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-10 10:01:53 -04:00
Arthur Barrett
c7197cd567 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-08 18:04:24 -04:00
Jason Bau
1354cd412a Set SERVER_EMAIL so that mail_admins works 2013-05-08 14:16:20 -07:00