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

103 Commits

Author SHA1 Message Date
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Vik Paruchuri
42b9a121fb Fix pillow requirement 2013-01-30 16:00:55 -05:00
Vik Paruchuri
9c5fe05689 Update reqs for pillow, work on file uploads 2013-01-29 21:29:10 -05:00
Ashley Penney
645cfbce21 Move this into the github requirements where it belongs. 2013-01-24 10:00:13 -05:00
Ashley Penney
c5979f8efa Stray % 2013-01-24 09:42:24 -05:00
Ashley Penney
60ae54b2e1 Actually, lets use Cale's fixes. 2013-01-24 09:42:24 -05:00
Ashley Penney
491dd408aa Add dogapi for datadog. 2013-01-24 09:42:24 -05:00
Ashley Penney
ced29a25ec Add paramiko to requirements. 2013-01-24 09:42:23 -05:00
Chris Dodge
44cfcb88a3 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-17 20:30:22 -05:00
Ashley Penney
2d55f871ee While this is a pain for content developer local environment updates it breaks the LMS in EC2 which is vastly more important. We'll jsut have to address helping individual content people with installing MySQL if needed. This is a real dependency in production and I think those belong in here. 2013-01-17 15:51:26 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Alexander Kryklia
30df77b9b2 added xmltodict to dependencies 2013-01-15 12:51:54 +02:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
John Jarvis
c7a00cd2ba pinning versions to what is currently on stage 2012-12-17 19:07:23 -05:00
David Ormsbee
eba4629f59 Our code breaks on requests >= 1.0, so locking in a version for dev 2012-12-17 13:35:33 -05:00
John Jarvis
8aebb14eea Adding ipython to requirements 
We had this before as a python dependency but it was dropped
when we switched to virtual environments
 2012-12-10 17:15:31 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
Александр
7fcf04eaf5 add shapely 2012-11-27 14:37:57 +02:00
Chris Dodge
62fa734c68 added factory_boy to requirements.txt 2012-11-26 13:36:35 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -05:00
Victor Shnayder
27cffb9387 Update requirements.txt 
Taking out MySQL-python for now because it requires mysql to be installed, so breaks updates on content folks' envs.
 2012-11-07 11:39:42 -05:00
Calen Pennington
9d92711d25 Merge pull request #1015 from MITx/feature/cdodge/mongo-perf-instrumenting 
add django performance metering
 2012-11-07 06:14:19 -08:00
Chris Dodge
918de8b4a9 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting 
Conflicts:
	requirements.txt
 2012-11-02 15:09:54 -04:00
Chris Dodge
b75a814f7a add django performance metering 2012-11-02 15:08:45 -04:00
Александр
8d40b19c94 adde sphinx to pip req 2012-11-02 15:27:49 +02:00
Ashley Penney
ab57c7d759 Add MySQL-python to the requirements. 2012-10-30 14:32:50 -04:00
Vik Paruchuri
e02d8403e7 updated requirements 2012-10-23 09:25:08 -04:00
Piotr Mitros
97233cf00e Work-around for bug in pip lookup 2012-10-14 10:33:11 -04:00
Victor Shnayder
66604fd0b7 add nltk to requirements 
- needed for chemical equation parsing, which is about to appear in capa
 2012-10-08 16:44:36 -04:00
Chris Dodge
a92a4df1bc Add PIL (Python Image Library) to the requirements.txt file 2012-09-28 11:22:35 -04:00
Arjun Singh
02e076b725 adding pygraphviz 2012-08-28 05:49:36 -07:00
Bridger Maxwell
390823bdea Added django-wiki's requirements to requirements.txt, because they weren't being included automatically. 2012-08-22 11:37:01 -04:00
Calen Pennington
be94e176ff Add pytz to requirements 2012-08-21 16:29:47 -04:00
David Ormsbee
356fac144b Remove pystache in favor of our custom version 2012-08-20 18:04:37 -04:00
John Jarvis
bb80c66ed7 ensuring pystache>=0.5.2 2012-08-20 16:41:48 -04:00
John Jarvis
55251039d9 updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles 2012-08-20 16:35:42 -04:00
John Jarvis
5f72e0c7a0 moving all requirements that use a repo to repo-requirements.txt including github requirements 2012-08-20 14:05:51 -04:00
David Ormsbee
e79d56376a Use -e in django-wiki requirement 2012-08-19 16:03:35 -04:00
Bridger Maxwell
24c0b5145d Updated django-wiki and plugin imports. 2012-08-19 14:41:49 -04:00
Bridger Maxwell
361e409d4e Got the tests passing! 2012-08-18 00:02:09 -04:00
Bridger Maxwell
68f3aabc15 Updated django-wiki requirement. 2012-08-17 17:42:23 -04:00
Bridger Maxwell
90eeaa0538 Updated django-wiki requirement. 2012-08-17 14:52:54 -04:00
Bridger Maxwell
385772373a Updated django-wiki requirement with fixed version. 2012-08-16 17:32:11 -04:00
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