Commit Graph

953 Commits

Author SHA1 Message Date
ichuang
20720c91b9 add 7.00x to dev_ike.py 2012-07-02 18:29:42 -04:00
Calen Pennington
6612beab46 Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again 2012-07-02 11:15:37 -04:00
ichuang
8467aa0846 fix dev_edx4edx mako path - add EDX4EDX_ROOT 2012-07-01 17:44:04 +00:00
ichuang
5f4a27d6cc typo 2012-07-01 13:17:57 -04:00
ichuang
b3cc34c3d4 add debugging to courseware debug (tricky with https behind gunicorn) 2012-07-01 13:16:09 -04:00
ichuang
d28ad6ced8 lms/envs/edx4edx_aws update 2012-07-01 12:53:31 -04:00
ichuang
23128ced67 courseware views now goes to default chapter and section if unprovided
- uses multicourse settings (default_chapter and default_section)
  - it would be nice to use course_settings instead, but that is not
    currently compatible with multicourse
2012-07-01 12:51:14 -04:00
ichuang
14745893b7 add edx4edx root stuff from aws config to dev_ike config 2012-06-29 15:47:49 -04:00
Calen Pennington
23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken 2012-06-29 12:45:17 -04:00
Calen Pennington
de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js 2012-06-29 12:40:50 -04:00
Matthew Mongeau
cddf4cf6cf Wip on sign up form. 2012-06-28 15:38:39 -04:00
ichuang
8a6dd2f756 add 6.00x to dev_ike.py 2012-06-28 14:20:22 -04:00
John Jarvis
5c398b25da updating edx4edx_aws config 2012-06-28 11:15:03 -04:00
John Jarvis
03b6bd044e setting quickedit to true 2012-06-27 18:06:29 -04:00
ichuang
c0581f8c86 fix subject in activation email - now uses course_title 2012-06-26 23:07:24 -04:00
ichuang
200e188c09 add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation
- issue is that content machine isn't whitelisted for email
 - this also provides secondary filtering for user registration
2012-06-26 23:00:25 -04:00
pmitros
fee4ecf742 Merge pull request #149 from MITx/stable-edx4edx-aws
Stable edx4edx aws
We may need to switch quickedit, based on feedback from Ike.
2012-06-26 16:52:46 -07:00
John Jarvis
7b86caafad adding edx4edx_aws for edx4edx aws instance 2012-06-26 19:34:53 -04:00
ichuang
a1b53c3cd6 add 3.091x to multicourse 2012-06-26 18:40:07 -04:00
ichuang
9aeaaa72a9 configuration running on content server: lms/envs/dev_edx4edx 2012-06-26 14:07:14 +00:00
ichuang
caa14922bb edx4edx configuration running on content server. Notes:
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
  - email backend set
  - index page modified for edx4edx
2012-06-26 14:04:56 +00:00
ichuang
b59b80871a add edit link to module pages with filenames (html & problem)
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
2012-06-24 14:46:02 -04:00
ichuang
37539fdd4b revised 8.01x entry in dev_ike 2012-06-21 23:35:48 -04:00
ichuang
6566c45e6f use pipeline 2012-06-21 21:40:41 -04:00
ichuang
93b8ad3e4d Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-06-21 16:46:56 -04:00
David Ormsbee
bc8c077379 Add info page support with multiple courses 2012-06-21 10:59:48 -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
b6514fa5eb Make tests pass when running on cms 2012-06-21 10:59:44 -04:00
ichuang
9edc6bbd43 add MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] flag to settings 2012-06-21 10:59:38 -04:00
ichuang
d56e6e1a11 django pipeline working now (with new pip -e git+git...) 2012-06-21 10:59:37 -04:00
Calen Pennington
338547343e Get the cms up to the point of rendering a template 2012-06-21 10:59:36 -04:00
ichuang
a892752b89 add 18.06x to dev_ike.py 2012-06-20 22:16:35 -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
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -04:00
ichuang
748398fca1 for externalresponse - fallback to script code if <answer> code not provided 2012-06-17 22:36:39 -04:00
ichuang
923a47d761 add 7.03x to dev_ike.py 2012-06-15 14:54:26 -04:00
Matthew Mongeau
e00b7cb252 askbot stuff. 2012-06-14 16:46:07 -04:00
Matthew Mongeau
a08be52780 Skin settings. 2012-06-14 15:46:10 -04:00
Matthew Mongeau
47126dc686 wip 2012-06-13 14:50:25 -04:00
Calen Pennington
967a6ee2e7 Merge pull request #94 from MITx/capa-cleanup
Capa cleanup
2012-06-12 12:26:49 -07:00
Matthew Mongeau
d0819071c7 PROJECT_ROOT is needed for coffeescript paths 2012-06-11 13:57:37 -04:00
ichuang
6f14acee9e add MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] flag to settings 2012-06-10 22:34:30 -04:00
ichuang
989a74ba3f django pipeline working now (with new pip -e git+git...) 2012-06-10 20:05:33 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00
David Ormsbee
bd2a44ade9 Merge pull request #90 from MITx/cpennington/capa_django_deps
Removing references to django.conf.settings from capa/responsetypes.py
2012-06-07 16:18:08 -07:00
Calen Pennington
1d1af3be74 Move coverage report html into the reports directory 2012-06-07 17:00:03 -04:00
Bridger Maxwell
8a523997b1 Added setting for new changes to django-pipeline. Only sass is recompiled each time now. 2012-06-07 16:49:51 -04:00
Calen Pennington
c3e730a0a2 Add the capa module templates to the list of mako templates 2012-06-07 16:44:57 -04:00