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

47 Commits

Author SHA1 Message Date
Calen Pennington
8a89309338 Merge branch 'master' into asset-pipeline 
Conflicts:
	static/js/application.js
 2012-05-21 14:53:16 -04:00
Calen Pennington
03a9be7e78 Add newrelic handler, rather than custom function to log exceptions 2012-05-21 12:12:16 -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
092247fd2a Merge branch 'master' into asset-pipeline 2012-05-17 16:55:27 -04:00
Calen Pennington
03c7b37b30 Bring envs/common.py up to par with settings.py 2012-05-17 16:53:56 -04:00
Calen Pennington
156c4f1636 Renable debugging in envs/dev.py 2012-05-17 16:50:36 -04:00
Calen Pennington
dd6637947b Merge branch 'master' into asset-pipeline 2012-05-17 16:50:03 -04:00
Calen Pennington
411d822605 Remove references to the Accept middleware 2012-05-17 16:49:44 -04:00
Calen Pennington
1831ab4ea5 Merge remote-tracking branch 'origin/master' into asset-pipeline 
Conflicts:
	envs/dev.py
	sass/README
	static/css
	static/css/application.css
	static/css/marketing-ie.css
	static/css/marketing.css
 2012-05-17 16:48:17 -04:00
Calen Pennington
bc823d3bfe Merge branch 'master' into asset-pipeline 
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
 2012-05-17 16:32:39 -04:00
Calen Pennington
f30596c499 Merge branch 'master' into specific-error-handling 
Conflicts:
	djangoapps/courseware/views.py
 2012-05-17 11:39:21 -04:00
Calen Pennington
cc6e0c55c4 Cleaning up the envs/* files so that they will work with gunicorn_django 2012-05-17 11:18:32 -04:00
Calen Pennington
a61cbab3d1 Make tests work by default, without having to create any extra directories 2012-05-17 11:02:54 -04:00
Calen Pennington
69321b4497 Display the appropriate type of error message depending on the type of the incoming request 2012-05-16 13:45:00 -04:00
Calen Pennington
c6c53be2c1 Migrate changes to settings.py to envs/*.py settings files 2012-05-16 11:01:23 -04:00
Calen Pennington
a7995df63c Use the django-nose test runner, for the coverage features 2012-05-14 16:36:50 -04:00
Calen Pennington
c6a6144ade Point at a test_data directory for testing 2012-05-14 13:16:14 -04:00
Calen Pennington
0856f5517b Disable askbot during tests 2012-05-14 11:21:17 -04:00
Calen Pennington
8e78f73d00 Adding a test environment with some debug stuff turned off 2012-05-14 11:14:55 -04:00
Calen Pennington
6b10c0760b Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/student/views.py
 2012-05-08 13:54:57 -04:00
Calen Pennington
fefcd8570f Remove the csrf domain from the default settings because we don't need it (we don't have requests going between multiple servers in the same domain). This will make it so that we can test servers from any url, rather than just a single url 2012-05-04 14:52:24 -04:00
Calen Pennington
2b7b9ada60 Make local file uploads work in dev environment 2012-05-04 14:44:50 -04:00
Calen Pennington
c981620fc2 Add a settings file for doing grabs for main_static 2012-05-03 15:14:02 -04:00
Calen Pennington
0871d95f98 Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository 2012-04-30 15:18:47 -04:00
Calen Pennington
9a0ff90a56 Adding configuration for the messages module 2012-04-25 11:20:14 -04:00
Calen Pennington
5a4d9691d4 Move sass files into a separate directory, for clarity 2012-04-20 14:58:46 -04:00
Calen Pennington
f4fa7436c6 Move bourbon back into the directory with scss so it can be imported properly 2012-04-20 14:37:40 -04:00
Calen Pennington
7dcc6b38ae Moving sass compilation to django-pipeline 2012-04-20 14:20:09 -04:00
David Ormsbee
efc057109e remove references to unused TEXTBOOK_DIR, add comments 2012-04-19 10:36:14 -04:00
David Ormsbee
0316d9718c enable mathjax in askbot 2012-04-19 10:26:26 -04:00
David Ormsbee
86b413ff8c fix syslogger errors 2012-04-09 17:17:03 -04:00
David Ormsbee
5afddedc94 add debug toolbar to content machines 2012-04-09 17:16:52 -04:00
David Ormsbee
a73ba49bef syslog address needs to be a server, port tuple 2012-04-09 17:07:00 -04:00
David Ormsbee
ddb425dae6 point aws settings to syslog server 2012-04-09 17:04:18 -04:00
David Ormsbee
8f4696a1ea add logging environment to ENV_TOKENS 2012-04-09 16:57:35 -04:00
David Ormsbee
29b3b0cfeb remove unnecessary comments 2012-04-09 16:39:04 -04:00
David Ormsbee
be0fdf0cbc add config for content machines 2012-04-09 16:32:54 -04:00
David Ormsbee
ef5b6f6537 remove LIB_URL from env config (it's always local) 2012-04-09 16:24:16 -04:00
David Ormsbee
f6509a6858 use ENV_ROOT instead of BASE_DIR 2012-04-09 16:13:37 -04:00
David Ormsbee
f0bec48c54 move more of our AWS config to tokens from JSON files 2012-04-09 16:11:54 -04:00
David Ormsbee
ab6ec55a83 Convert AWS settings to pull values from JSON files 2012-04-03 12:54:02 -04:00
David Ormsbee
d7131c8b13 Update requirements: add path.py (used in settings), remove flup (only necessary for FCGI) 2012-04-02 16:38:33 -04:00
David Ormsbee
55312bf7db show instructions for gunicorn 2012-04-02 14:58:04 -04:00
David Ormsbee
f0d80a0738 Flesh out the README.txt for the new settings arrangement 2012-04-02 14:20:00 -04:00
David Ormsbee
3a95e3f79f Moving settings2/ folder to envs/ 2012-04-02 14:15:44 -04:00