Commit Graph

  • b487003de7 change class of "msg" output in textbox to from "debug" to "message" ichuang 2012-05-27 21:12:27 -04:00
  • 30ee4d19ed fixed customresponse: when using cfn with multiple inputs fill in all values of correct_map ichuang 2012-05-27 21:11:12 -04:00
  • 0aab9eb887 README ichuang 2012-05-27 20:18:45 -04:00
  • 92aea035d9 add env for ike's multicourse development and testing ichuang 2012-05-27 20:16:04 -04:00
  • 2d96379c84 multicourse: remove obsolete is_dogfood flag ichuang 2012-05-27 20:15:45 -04:00
  • fa58406c1c templates/main.html patch: workaround for slow page load bug ichuang 2012-05-27 20:13:07 -04:00
  • 06910aaf8a urls: do admin autodiscover if settings.DEBUG ichuang 2012-05-27 20:12:47 -04:00
  • 4280c791a3 added (temporary?) debugging statements ichuang 2012-05-27 20:12:06 -04:00
  • 1548293821 dogfood.views: for edx4edx problems about edX problems ichuang 2012-05-27 20:10:23 -04:00
  • 8bbff1107f courseware.views - updated quickedit to allow calls from dogfood ichuang 2012-05-27 20:08:33 -04:00
  • 41a539ed1f html_module should render_to_string from namespace "course", not "main" ichuang 2012-05-27 20:07:38 -04:00
  • 6ad4a4f740 add textbox input type to customresponse ichuang 2012-05-27 20:05:19 -04:00
  • 213b53fcc2 fixed script evaluation in capa_problem: don't parse javascript or perl, and use "context" for both global and local frames ichuang 2012-05-27 20:04:20 -04:00
  • 6c8abf63d1 created dogfood template (for capa_problem) ichuang 2012-05-27 20:03:46 -04:00
  • 2298b995a9 updated quickedit template ichuang 2012-05-27 20:03:27 -04:00
  • 2c2072dae3 Converted to use more semantic tags. Working snapshot. Piotr Mitros 2012-05-27 07:39:09 -04:00
  • 2dd8bd48f7 fix textbox inputtypes to show default from problem if no student input available yet. ichuang 2012-05-26 23:04:06 -04:00
  • 472ef4a88e add codemirror.css back ; it is in static/css for now, until pipeline/coffee fixed. ichuang 2012-05-26 22:37:47 -04:00
  • b0c7786245 add dogfood library routine and view - for edx4edx ichuang 2012-05-26 22:37:06 -04:00
  • 4d9140e151 multicourse: display course in mitxhome only if active = True for course ichuang 2012-05-26 22:35:54 -04:00
  • d304261763 added function to check if is_dogfood in multicourse settings ichuang 2012-05-26 22:35:10 -04:00
  • dcc72a2a18 added csrf handling to quickedit ichuang 2012-05-26 22:34:19 -04:00
  • 22572bf87b fix multicourse to properly set COURSE_TITLE (navigation.html uses settings.COURSE_TITLE) ichuang 2012-05-26 17:05:52 -04:00
  • fbada1a964 Merge branch 'master' into pmitros/modular-refactor Piotr Mitros 2012-05-26 11:42:03 -04:00
  • d7d831b4af Helper script to run django-admin Piotr Mitros 2012-05-26 09:27:25 -04:00
  • ffb0bac130 updating gem install list John Jarvis 2012-05-25 16:37:22 -04:00
  • f6948d44ff mkdirs fail silently John Jarvis 2012-05-25 16:22:09 -04:00
  • 1736eb2125 first commit John Jarvis 2012-05-25 16:15:12 -04:00
  • 16046aa8e9 Be more specific when deleting mako template cache directory Calen Pennington 2012-05-25 15:37:50 -04:00
  • bd7f1c3ab2 Delete mako temp files during .deb install Calen Pennington 2012-05-25 15:27:56 -04:00
  • 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 Calen Pennington 2012-05-25 12:50:21 -04:00
  • cb033b44f2 Merge pull request #65 from MITx/safe-cache-key pmitros 2012-05-25 08:26:48 -07:00
  • 1b5a9bc547 Moving the 'id' prefix back into content_parser where it exists Calen Pennington 2012-05-25 11:04:05 -04:00
  • dea0d28ace Url encode memcache keys, rather than writing a new encoding scheme. Also use fasthash, rather than md5 Calen Pennington 2012-05-25 10:52:04 -04:00
  • 88ff84dd2e Use a key function that is safe for use w/ memcache Calen Pennington 2012-05-25 09:30:04 -04:00
  • f632db0e9d Use the coffee, sass, and yui-compressior binaries that are on the current path Calen Pennington 2012-05-24 15:11:38 -04:00
  • 4bea0f986e Merge pull request #64 from MITx/asset-pipeline David Ormsbee 2012-05-24 09:08:10 -07:00
  • c5a68f8363 Don't fail silently on errors Calen Pennington 2012-05-24 11:38:07 -04:00
  • 3fdb117d71 Use the correct command to get the directory name when running collectstatic Calen Pennington 2012-05-24 11:34:12 -04:00
  • 06e06c81ad Mark the collectstatic alias as executable Calen Pennington 2012-05-24 11:22:23 -04:00
  • 25e01799bb Add a script to doing the collectstatic run during apt configuration Calen Pennington 2012-05-24 10:56:26 -04:00
  • 1e9e8847d3 Split the pipeline_mako templates from the namespace used by actual django-pipeline django templates Calen Pennington 2012-05-24 10:28:41 -04:00
  • 4e59e163cf Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-23 16:20:24 -04:00
  • a46fecf379 add test suite output to gitignore Matt Jankowski 2012-05-23 13:39:39 -04:00
  • f0c98a939a Try and get fpm to match exclude patterns Calen Pennington 2012-05-23 11:50:06 -04:00
  • b84da37731 Make fpm run in verbose mode Calen Pennington 2012-05-23 11:47:16 -04:00
  • a0af847168 Switch to mako template syntax for inline_js template Calen Pennington 2012-05-23 11:40:47 -04:00
  • 5eae41ee70 Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-22 15:44:27 -04:00
  • 0af8502c6d Dirt-simple heartbeat page for use by AWS load balancers Calen Pennington 2012-05-22 15:24:28 -04:00
  • 32c50090eb Very draft/prototype edits. Moving CMS components in LMS. Piotr Mitros 2012-05-21 19:27:00 -04:00
  • 9906bd2b6b Moved code examples into snippets Piotr Mitros 2012-05-21 14:54:03 -04:00
  • 8a89309338 Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-21 14:53:16 -04:00
  • 431704ac88 Make courseware work with multicourse disabled Calen Pennington 2012-05-21 12:59:38 -04:00
  • 77edc4ceee Merge pull request #62 from MITx/newrelic-handler David Ormsbee 2012-05-21 09:19:06 -07:00
  • 03a9be7e78 Add newrelic handler, rather than custom function to log exceptions Calen Pennington 2012-05-21 11:56:20 -04:00
  • 7332a11394 Merge pull request #61 from MITx/el-add-aria-labels-to-nav Edward Loveall 2012-05-21 08:36:28 -07:00
  • 4b842e7ac8 Adds ARIA labels to page elements Edward Loveall 2012-05-17 16:31:34 -04:00
  • ed3f081701 Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-21 10:22:59 -04:00
  • 4fe22be501 Merge pull request #59 from MITx/pmitros/modular-refactor David Ormsbee 2012-05-21 06:21:43 -07:00
  • bb66cad68b Code review -- comments and better exceptions Piotr Mitros 2012-05-21 09:18:40 -04:00
  • fb146bf5c8 Merge pull request #58 from MITx/new-settings David Ormsbee 2012-05-21 05:35:35 -07:00
  • abdd696f7e Modular refactor: Fixed bugs. Tests work. Piotr Mitros 2012-05-20 16:08:10 -04:00
  • e9468a0e5e Modular refactor: Very minor changes (comments, etc.) Piotr Mitros 2012-05-20 15:22:39 -04:00
  • d95a5e462d Modular refactor: Better names (grade to get_score, etc. Piotr Mitros 2012-05-20 14:52:48 -04:00
  • da77cec954 Merge pull request #57 from MITx/fix-multicourse pmitros 2012-05-20 10:47:04 -07:00
  • 29f565dd6e Modular refactor: Input types register in SimpleInput with decorator Piotr Mitros 2012-05-20 13:38:02 -04:00
  • cd67ec8fc1 Modular refactor: Input types look more like x_module Piotr Mitros 2012-05-20 13:31:37 -04:00
  • fe4f7bb2e3 Compress sass and js, except in dev environments Calen Pennington 2012-05-18 17:00:43 -04:00
  • d2ec58c06e Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\! Calen Pennington 2012-05-18 15:37:57 -04:00
  • 6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard Calen Pennington 2012-05-18 15:10:10 -04:00
  • 8823346a0c Merge branch 'new-settings' into asset-pipeline Calen Pennington 2012-05-18 12:07:19 -04:00
  • a2eb8fcada Delete settings.py in favor of envs/*.py, and add a rake task to run a dev server locally from those settings Calen Pennington 2012-05-18 11:59:08 -04:00
  • 9d00bbf839 Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-18 11:29:16 -04:00
  • d0172d5d28 Correctly use the regex replacement function to substitute all urls in a particular chunk of text Calen Pennington 2012-05-18 11:26:42 -04:00
  • da64a16c23 cleaned up cruft in mathjax_include.html ichuang 2012-05-17 22:54:38 -04:00
  • 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 ichuang 2012-05-17 22:48:39 -04:00
  • 22c75cf748 make courseware/capa/util.py contextualize_text return gracefully if text = None ichuang 2012-05-17 22:39:20 -04:00
  • 5e8fbcdc8d fix multicourse; fix bug in I4xSystem - self.filestore not set when filestore not None. mitxhome.html now properly automatically lists all courses given in settings.COURSE_SETTINGS. mitxhome now served from multicourse.views. optioninput.html was missing; fixed. cleaned up access to request.session for coursename in courseware/views.py ichuang 2012-05-17 22:29:45 -04:00
  • b8b9928a09 Merge pull request #54 from MITx/pmitros/removing-fs-refs-pull David Ormsbee 2012-05-17 14:24:41 -07:00
  • 71f864b517 Merge pull request #55 from MITx/rl-comments Reda Lemeden 2012-05-17 13:57:13 -07:00
  • d6fbda39b4 Added comments to Askbot stylesheets Reda Lemeden 2012-05-17 16:34:01 -04:00
  • ba8fb95d72 added fix for lists in updates Kyle Fiedler 2012-05-17 16:47:28 -04:00
  • 092247fd2a Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-17 16:55:27 -04:00
  • 03c7b37b30 Bring envs/common.py up to par with settings.py Calen Pennington 2012-05-17 16:53:56 -04:00
  • 58693a6165 Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-17 16:51:05 -04:00
  • 156c4f1636 Renable debugging in envs/dev.py Calen Pennington 2012-05-17 16:50:36 -04:00
  • dd6637947b Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-17 16:50:03 -04:00
  • 411d822605 Remove references to the Accept middleware Calen Pennington 2012-05-17 16:49:44 -04:00
  • 1831ab4ea5 Merge remote-tracking branch 'origin/master' into asset-pipeline Calen Pennington 2012-05-17 16:48:17 -04:00
  • b80d1904ad Make scss urls relative to the directory that they are in Calen Pennington 2012-05-17 16:44:36 -04:00
  • 3632f6a748 Merge pull request #49 from MITx/specific-error-handling pmitros 2012-05-17 13:43:13 -07:00
  • bc823d3bfe Merge branch 'master' into asset-pipeline Calen Pennington 2012-05-17 15:58:47 -04:00
  • 0e3349706a Fix minor bugs, commenting out future code Piotr Mitros 2012-05-17 15:48:47 -04:00
  • 5c82af3a5c Update files after use guard to compile sources Prem Sichanugrist 2012-05-15 18:03:01 -04:00
  • 0a97979a0e Add Guard to aid sass/coffeescript compilation Prem Sichanugrist 2012-05-15 17:59:48 -04:00
  • cad13b30a1 Passing i4x system deeper into capa_problem Piotr Mitros 2012-05-17 15:37:08 -04:00
  • 9859e8546d Move accept header computations out of middleware Calen Pennington 2012-05-17 13:23:20 -04:00
  • 67061f1b25 Merge pull request #51 from MITx/el-courseware-bottom-border-alignment kylefiedler 2012-05-17 08:58:34 -07:00
  • cb8224cbcd cleans up visual style of accordion and sidebar links and fixes border alignment issues Galen Frechette 2012-05-17 11:47:28 -04:00
  • e7ab1aa9be Fixing typo from merge Calen Pennington 2012-05-17 11:42:56 -04:00