Brian Talbot
cbe8f0d303
studio - removes extraneous symbolset font files saved in FED file architecture
2013-05-22 15:55:47 -04:00
Brian Talbot
45b9155e4b
studio - adds in Font Awesome typeface, styling, and Sass import reference
2013-05-22 15:55:46 -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
Ned Batchelder
d7105ddf24
Merge branch 'master' of github.com:edx/edx-platform
2013-05-22 15:32:57 -04:00
Ned Batchelder
b9d134e3d1
Merge pull request #2101 from edx/ned/fix-code-import-for-check-functions
...
Check functions need access to course-local code also, so we need to sav...
2013-05-22 12:32:43 -07:00
Nate Hardison
8d69b10c8c
Merge pull request #1907 from edx/feature/nate/custom-header-footer
...
Add theming settings and simple base Sass preprocessing.
2013-05-22 12:26:15 -07:00
Nate Hardison
185ab4c35c
Make Mako preprocessing a Rake task
...
Per feedback from @cpennington. This way we'll only preprocess once,
even if the Sass compilation is invoked multiple times.
2013-05-22 12:22:28 -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
Greg Price
0843306731
Merge pull request #2103 from edx/fix/gprice/datadog-tags
...
Reviewed by cpennington: https://rbcommons.com/s/edx/r/2/
2013-05-22 11:35:16 -07:00
Greg Price
787366fe02
Remove tags for comment client request time histogram in Datadog
...
According to someone from Datadog, this was generating tags like "knowledgeable_
people_who_put_this_course_together._this_is_harvard._you_can_t_tell_us_there_s_
a_shortage_of_editorial_talent." They say that they can handle tens or hundreds
of unique tags but not thousands. Given that we have a unique URL for each
thread, we can't even use that as a tag. Thus, all tags are removed for now
until we can determine whether there is a useful set of tags with small enough
cardinality. In light of this, I did not investigate why the long tag mentioned
above was being generated.
2013-05-22 14:12:25 -04:00
Greg Price
d724223a4c
Merge pull request #2053 from edx/fix/gprice/modulestore-500-errors
...
Handle ItemNotFoundError from the modulestore to avoid 500 errors
2013-05-22 10:58:06 -07:00
Jason Bau
70c4af40f0
add MITX Feature setting to enable django admin site
2013-05-22 10:55:21 -07:00
Chris Dodge
470569545d
add a migrations to the new django_comment_common to keep things a bit more consistent with our normal useage.
2013-05-22 13:32:32 -04:00
Ned Batchelder
392de8d40e
Check functions need access to course-local code also, so we need to save the python path from the problem setup, and use it for the check function.
2013-05-22 13:27:24 -04: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
VikParuchuri
f8e68216a7
Merge pull request #2096 from edx/fix/vik/oe-cache
...
Fix/vik/oe cache
2013-05-22 09:59:33 -07:00
marco
c8d30b1cfe
Merge branch 'master' into ux/marco/forums-icons
2013-05-22 12:59:19 -04:00
Vik Paruchuri
e5dd1a935c
Update rubric template
2013-05-22 12:49:49 -04:00
e0d
0647a5b0a3
changes to refactor local requirements.
2013-05-22 12:25:29 -04:00
Ned Batchelder
534d67378b
Sandbox-installed packages will be really installed instead of -e installed.
2013-05-22 12:25:18 -04:00
Arthur Barrett
e52acbbf22
Fix advanced modules list.
2013-05-22 12:24:51 -04:00
Vik Paruchuri
2303500ce2
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-22 12:18:28 -04:00
Vik Paruchuri
e9f05640f8
Update comments
2013-05-22 12:16:23 -04:00
e0d
e4c3f92372
Merge pull request #2100 from edx/hotfix/e0d/code-jail
...
Sandbox-installed packages will be really installed instead of -e instal...
2013-05-22 09:05:03 -07:00
Vik Paruchuri
96f145b8f6
Update error message
2013-05-22 12:00:36 -04:00
Vik Paruchuri
3bd04290f5
Add tests, address review comments
2013-05-22 11:58:03 -04:00
Victor Shnayder
361faacc57
Merge pull request #2099 from edx/bugfix/abarrett/advanced_modules_list
...
Fix advanced components list in Studio.
2013-05-22 08:29:07 -07:00
Vik Paruchuri
a44eacd474
Make fields stringy, remove false dict
2013-05-22 10:54:52 -04:00
Vik Paruchuri
21f7e222f7
Fix exception clause
2013-05-22 10:51:11 -04:00
e0d
bf20760922
changes to refactor local requirements.
2013-05-22 10:19:30 -04:00
Christina Roberts
945fbe010f
Merge pull request #2093 from edx/feature/christina/acceptance-config
...
Use draft module store so we can test editing components (problems, html...
2013-05-21 17:19:51 -07:00
Ned Batchelder
ce005072b0
Sandbox-installed packages will be really installed instead of -e installed.
2013-05-21 19:21:39 -04:00
Arthur Barrett
cf502e2349
Fix advanced modules list.
2013-05-21 17:49:20 -04:00
Greg Price
caef8d272d
Merge pull request #2097 from edx/gprice/add-rb-config
...
Add Review Board config to repo
2013-05-21 12:39:54 -07:00
Peter Baratta
43395b70b7
Enable coverage for calc module; split off tests
2013-05-21 15:20:51 -04:00
Vik Paruchuri
9a52a17aab
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-21 14:54:45 -04:00
Greg Price
5bcae4e79f
Add Review Board config to repo
2013-05-21 14:52:28 -04:00
Christina Roberts
747dec07ae
Merge pull request #2091 from edx/feature/christina/xblock_version
...
Upgrade version of xblock.
2013-05-21 11:47:29 -07:00
Vik Paruchuri
c5f9d94cc4
Add in comments, fix behavior
2013-05-21 14:46:22 -04:00
Ned Batchelder
8b64d581f7
Merge pull request #2095 from edx/ned/fix-lazymod-test
...
Use a different arbitrary dotted module, which Christina doesn't already...
2013-05-21 11:39:02 -07:00
Ned Batchelder
9bf6281339
Merge pull request #2079 from edx/ned/fingerprint-site-packages
...
Fingerprint the filenames in site-packages to decide when to install req...
2013-05-21 11:37:57 -07:00
cahrens
f3bd9ab234
Get rid of empty, store ID.
2013-05-21 14:29:33 -04:00
Ned Batchelder
e59d345917
Use a different arbitrary dotted module, which Christina doesn't already have imported
2013-05-21 14:27:50 -04:00
Vik Paruchuri
c91fa2f45a
Add in some comments
2013-05-21 14:23:24 -04:00
Vik Paruchuri
956669de21
If location cannot be found, move on
2013-05-21 14:21:46 -04:00
Vik Paruchuri
0887383ca7
Don't show peer grading button unless there is a peer grading element in the course
2013-05-21 14:18:00 -04:00
Calen Pennington
158948336f
Merge pull request #2046 from edx/fix/cale/pylint-cleanup
...
Fix/cale/pylint cleanup
2013-05-21 10:27:13 -07:00
Nate Hardison
ea1bc6b875
Merge pull request #2080 from edx/feature/nate/handle-heroku-maintenance-mode
...
Handle Heroku's 503 maintenance mode response
2013-05-21 10:07:09 -07:00
Calen Pennington
cfe220a746
Add exceptions for unused imports in settings files
2013-05-21 13:07:04 -04:00
