Bridger Maxwell
337f109af7
Moved django-wiki submodule to be a pip install from git.
2012-08-16 10:54:34 -04:00
Bridger Maxwell
8fb83ee33c
Added django-wiki as a submodule.
2012-08-15 23:01:06 -04:00
Bridger Maxwell
1f43ae6d3e
Renamed namespace to wiki_slug in course_module.py.
2012-08-14 13:49:53 -04:00
Bridger Maxwell
45baccae85
Added a django template loader that can return Mako templates. Started pulling in new wiki.
2012-08-10 11:31:29 -04:00
Bridger Maxwell
14a35b9605
Upgrading to django 1.4.
2012-08-08 11:57:15 -04:00
ichuang
10ebcefd54
add openid authentication
2012-08-01 14:59:55 -04:00
Calen Pennington
0bfcefd214
Merge pull request #327 from MITx/fix-beautifulsoup4
...
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
2012-08-01 08:39:38 -07:00
John Jarvis
71898e4869
removing matplotlib from requirements.txt
2012-08-01 10:54:50 -04:00
ichuang
381d247589
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
2012-07-31 21:43:29 -04:00
Calen Pennington
ebe67d2d7d
Merge remote-tracking branch 'origin/release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-23 13:55:20 -04:00
Victor Shnayder
42fa0806fe
Fix paths in create-dev-env.sh
...
* need to be in mitx/ to install common/lib/*
* create data dir if it doesn't exit
* add a few more log messages
* Change url for our fork of django-pipeline to stop the hanging checkouts.
It works either way on my machine, so not sure if this will fix it.
2012-07-19 16:13:56 -04:00
Matthew Mongeau
2bfe0cb92d
Add parsed rss entries to home page with caching
2012-07-17 12:56:28 -04:00
John Jarvis
07eeaf7573
-f should be -r in requirements.txt
2012-07-11 11:39:51 -04:00
John Jarvis
06edcc0f9b
adding repo-requirements for modules that are checked into the repo
2012-07-11 09:16:54 -04:00
David Ormsbee
8589a1d9a9
reorder requirements to make it a little easier to see django-related reqs
2012-07-10 14:36:18 -04:00
David Ormsbee
caad217ec2
add other django-* dependencies from my pip freeze results
2012-07-10 14:34:05 -04:00
David Ormsbee
15b0801ecb
add django-keyedcache dependency
2012-07-10 14:31:35 -04:00
David Ormsbee
23f0bee8a9
django-followit
2012-07-10 14:29:58 -04:00
David Ormsbee
9ec0ecdc6e
fix dependency for django-kombu
2012-07-10 14:26:55 -04:00
David Ormsbee
fd7eec72e6
add djkombu dependency
2012-07-10 14:23:55 -04:00
David Ormsbee
7867277611
add django-countries dependency
2012-07-10 14:18:52 -04:00
David Ormsbee
efba36eb20
add South dependency for migrations
2012-07-10 14:17:47 -04:00
Calen Pennington
fdd9663699
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/modulestore/xml.py
lms/djangoapps/courseware/views.py
lms/templates/index.html
lms/templates/info.html
lms/templates/main.html
lms/templates/navigation.html
requirements.txt
2012-07-10 13:39:19 -04:00
Calen Pennington
dbd82c4bc8
Install numpy before trying to install scipy from requirements.txt
2012-07-05 13:07:54 -04:00
Calen Pennington
e9ee1566d6
Modularize capa and mitxmako so that xmodule can properly depend on them
2012-07-05 12:48:18 -04:00
Calen Pennington
386acbe1ff
Add tests of the github_sync service hook view
2012-07-05 12:15:49 -04:00
Calen Pennington
ab851c0b1a
Add tests for the core github_sync functionality
2012-07-05 11:54:43 -04:00
Calen Pennington
10add56660
Add url to point git service hooks at in order to trigger an import from github
2012-07-03 13:43:56 -04:00
David Ormsbee
3859c2be19
Add scanning of data directory for courses.
...
These are then displayed at /courses.
2012-06-21 10:59:48 -04:00
Calen Pennington
4cb285f1f9
Switch the cms over to using django-pipeline
2012-06-21 10:59:46 -04:00
Calen Pennington
bb2910fce5
Read week headings from mongodb
2012-06-21 10:59:43 -04:00
Victor Shnayder
e527a6cf66
added rednose to requirements (adds color output to nose)
2012-06-21 10:59:43 -04:00
Matthew Mongeau
e56a19b4e8
Added django_nose and nosexcover to requirements.txt
2012-06-21 10:59:39 -04:00
Calen Pennington
cabcc0c1d9
Allow login in the cms, and read a particular course from mongo
2012-06-21 10:59:36 -04:00
Calen Pennington
cac53cf1a0
Switch the cms over to using django-pipeline
2012-06-19 14:30:19 -04:00
Calen Pennington
34a696cdf6
Merge branch 'master' into cpennington/cms
...
Conflicts:
rakefile
requirements.txt
2012-06-18 13:46:33 -04:00
Calen Pennington
fe45de3833
Read week headings from mongodb
2012-06-18 11:20:57 -04:00
Victor Shnayder
15ac575301
added rednose to requirements (adds color output to nose)
2012-06-15 18:29:03 -04:00
Matthew Mongeau
ef1954aa52
Added django_nose and nosexcover to requirements.txt
2012-06-12 11:44:54 -04:00
Calen Pennington
dc85e46315
Allow login in the cms, and read a particular course from mongo
2012-06-08 16:55:38 -04:00
Victor Shnayder
57d4dfb97f
Fix django-pipeline requirement url
...
* Add "git+" to start of django-pipeline url. Fixes dev install on my system.
2012-06-06 15:45:47 -04:00
Calen Pennington
8575ed439d
Merge branch 'master' into dogfood
...
Conflicts:
djangoapps/courseware/capa/responsetypes.py
djangoapps/courseware/module_render.py
djangoapps/courseware/modules/html_module.py
djangoapps/courseware/modules/seq_module.py
djangoapps/courseware/modules/x_module.py
djangoapps/courseware/views.py
templates/main.html
templates/problem.js
templates/textbox.html
2012-06-05 14:38:49 -04:00
ichuang
4ff3a8735c
add sympy to requirements.txt
2012-06-02 19:03:16 -04:00
Prem Sichanugrist
89194892e6
Move CoffeeScripts to asset pipeline
2012-05-31 13:24:25 -04:00
Prem Sichanugrist
e46426b196
Update requirement dependencies
...
* Make sure we're installing django-pipeline from our fork
* Bump rake to 0.9.2.2, as 0.8.3 is already outdated.
2012-05-30 14:22:36 -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
698d0a167e
Display specific error messages when parts of the courseware break, rather than returning a 500 indicating that the whole site is down
2012-05-16 11:46:09 -04:00
Calen Pennington
a7995df63c
Use the django-nose test runner, for the coverage features
2012-05-14 16:36:50 -04:00
Prem Sichanugrist
21c2007541
Update requirements file to include requests
2012-05-14 12:02:48 -03:00
