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

1932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
c524ee7b88 Add enrollment link back to main page for development purposes, until we have the multicourse enrollment stuff worked out 2012-05-29 10:46:01 -04:00
ichuang
22572bf87b fix multicourse to properly set COURSE_TITLE (navigation.html uses settings.COURSE_TITLE) 2012-05-26 17:05:52 -04:00
Piotr Mitros
d7d831b4af Helper script to run django-admin 2012-05-26 09:27:25 -04:00
Calen Pennington
16046aa8e9 Be more specific when deleting mako template cache directory 2012-05-25 15:37:50 -04:00
Calen Pennington
bd7f1c3ab2 Delete mako temp files during .deb install 2012-05-25 15:27:56 -04:00
Calen Pennington
cdf6c87bb8 Exclude things during .deb packaging correctly, so that we don't have a bunch of build detritus left over. FPM still leaves the empty directories, unfortunately 2012-05-25 12:50:21 -04:00
pmitros
cb033b44f2 Merge pull request #65 from MITx/safe-cache-key 
Use a key function that is safe for use w/ memcache

This is needed for the asset-pipeline. The pipeline has to map a requested asset name ('css/application.css') to a string that encodes the file contents ('css/application.12323423abcf.css'). It caches these associations in memcache. We have the potential for filenames with spaces in them, which memcache can't handle, so we need to escape the cache keys in such a way that memcache can handle them.

It puts these in a cache named 'staticfiles' (http://django-staticfiles.readthedocs.org/en/latest/helpers/#cachedstaticfilesstorage). In the future, it may make sense to put that cache onto the filesystem, rather than memcache, but we should do that only after performance testing.
 2012-05-25 08:26:48 -07:00
Calen Pennington
1b5a9bc547 Moving the 'id' prefix back into content_parser where it exists 2012-05-25 11:04:05 -04:00
Calen Pennington
dea0d28ace Url encode memcache keys, rather than writing a new encoding scheme. Also use fasthash, rather than md5 2012-05-25 10:52:04 -04:00
Calen Pennington
88ff84dd2e Use a key function that is safe for use w/ memcache 2012-05-25 09:30:04 -04:00
Calen Pennington
f632db0e9d Use the coffee, sass, and yui-compressior binaries that are on the current path 2012-05-24 15:11:38 -04:00
David Ormsbee
4bea0f986e Merge pull request #64 from MITx/asset-pipeline 
Asset pipeline
 2012-05-24 09:08:10 -07:00
Calen Pennington
c5a68f8363 Don't fail silently on errors 2012-05-24 11:38:07 -04:00
Calen Pennington
3fdb117d71 Use the correct command to get the directory name when running collectstatic 2012-05-24 11:34:12 -04:00
Calen Pennington
06e06c81ad Mark the collectstatic alias as executable 2012-05-24 11:22:23 -04:00
Calen Pennington
25e01799bb Add a script to doing the collectstatic run during apt configuration 2012-05-24 10:56:26 -04:00
Calen Pennington
1e9e8847d3 Split the pipeline_mako templates from the namespace used by actual django-pipeline django templates 2012-05-24 10:28:41 -04:00
Calen Pennington
4e59e163cf Merge branch 'master' into asset-pipeline 2012-05-23 16:20:24 -04:00
Matt Jankowski
a46fecf379 add test suite output to gitignore 2012-05-23 13:39:39 -04:00
Calen Pennington
f0c98a939a Try and get fpm to match exclude patterns 2012-05-23 11:50:06 -04:00
Calen Pennington
b84da37731 Make fpm run in verbose mode 2012-05-23 11:47:16 -04:00
Calen Pennington
a0af847168 Switch to mako template syntax for inline_js template 2012-05-23 11:40:47 -04:00
Calen Pennington
5eae41ee70 Merge branch 'master' into asset-pipeline 2012-05-22 15:44:27 -04:00
Calen Pennington
0af8502c6d Dirt-simple heartbeat page for use by AWS load balancers 2012-05-22 15:39:40 -04:00
Calen Pennington
8a89309338 Merge branch 'master' into asset-pipeline 
Conflicts:
	static/js/application.js
 2012-05-21 14:53:16 -04:00
Calen Pennington
431704ac88 Make courseware work with multicourse disabled 2012-05-21 12:59:51 -04:00
David Ormsbee
77edc4ceee Merge pull request #62 from MITx/newrelic-handler 
Add newrelic handler, rather than custom function to log exceptions
 2012-05-21 09:19:06 -07:00
Calen Pennington
03a9be7e78 Add newrelic handler, rather than custom function to log exceptions 2012-05-21 12:12:16 -04:00
Edward Loveall
7332a11394 Merge pull request #61 from MITx/el-add-aria-labels-to-nav 
Adds ARIA labels to navigation
 2012-05-21 08:36:28 -07:00
Edward Loveall
4b842e7ac8 Adds ARIA labels to page elements 
This includes calculator open/close button, navigation, profile, and
book's table of content.
 2012-05-21 11:23:55 -04:00
Calen Pennington
ed3f081701 Merge branch 'master' into asset-pipeline 2012-05-21 10:22:59 -04:00
David Ormsbee
4fe22be501 Merge pull request #59 from MITx/pmitros/modular-refactor 
First part of courseware refactor
 2012-05-21 06:21:43 -07:00
Piotr Mitros
bb66cad68b Code review -- comments and better exceptions 2012-05-21 09:18:40 -04:00
David Ormsbee
fb146bf5c8 Merge pull request #58 from MITx/new-settings 
Delete settings.py in favor of envs/*.py, and add a rake task to run a d...
 2012-05-21 05:35:35 -07:00
Piotr Mitros
abdd696f7e Modular refactor: Fixed bugs. Tests work. 2012-05-20 16:08:10 -04:00
Piotr Mitros
e9468a0e5e Modular refactor: Very minor changes (comments, etc.) 2012-05-20 15:22:39 -04:00
Piotr Mitros
d95a5e462d Modular refactor: Better names (grade to get_score, etc. 2012-05-20 14:52:48 -04:00
pmitros
da77cec954 Merge pull request #57 from MITx/fix-multicourse 
fix multicourse; fix bug in I4xSystem - self.filestore not set when
 2012-05-20 10:47:04 -07:00
Piotr Mitros
29f565dd6e Modular refactor: Input types register in SimpleInput with decorator 2012-05-20 13:38:02 -04:00
Piotr Mitros
cd67ec8fc1 Modular refactor: Input types look more like x_module 2012-05-20 13:31:37 -04:00
Calen Pennington
fe4f7bb2e3 Compress sass and js, except in dev environments 2012-05-18 17:00:43 -04:00
Calen Pennington
d2ec58c06e Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\! 2012-05-18 15:37:57 -04:00
Calen Pennington
6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard 2012-05-18 15:10:10 -04:00
Calen Pennington
8823346a0c Merge branch 'new-settings' into asset-pipeline 2012-05-18 12:07:19 -04:00
Calen Pennington
a2eb8fcada Delete settings.py in favor of envs/*.py, and add a rake task to run a dev server locally from those settings 2012-05-18 11:59:08 -04:00
Calen Pennington
9d00bbf839 Merge branch 'master' into asset-pipeline 
Conflicts:
	static/css
	static/css/application.css
 2012-05-18 11:29:36 -04:00
Calen Pennington
d0172d5d28 Correctly use the regex replacement function to substitute all urls in a particular chunk of text 2012-05-18 11:26:42 -04:00
ichuang
da64a16c23 cleaned up cruft in mathjax_include.html 2012-05-17 22:54:38 -04:00
ichuang
a76248251a fix quickedit (request.user_is_staff is not a function); small edit to problem.html 
to show quickedit when settings.QUICKEDIT is True.  add
mathjax_include.html because that is needed by quickedit.html
 2012-05-17 22:48:39 -04:00
ichuang
22c75cf748 make courseware/capa/util.py contextualize_text return gracefully if text = None 2012-05-17 22:39:20 -04:00