Commit Graph

  • 848e4e5801 Pull clean codemirror.css from master kimth 2012-07-26 10:27:59 -04:00
  • 08fd19c3b4 Merge branch 'master' of github.com:dementrock/mitx into discussion Brittany Cheng 2012-07-26 10:24:11 -04:00
  • 8e8ac35d46 restored responsetypes.py from master kimth 2012-07-26 10:11:49 -04:00
  • 07de2d9903 Merging master kimth 2012-07-26 10:08:55 -04:00
  • 1255ed130f Adjust comments kimth 2012-07-26 09:15:07 -04:00
  • 73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' Calen Pennington 2012-07-26 09:05:57 -04:00
  • 9b032f08b8 Removing stray print statement Arjun Singh 2012-07-25 21:46:01 -04:00
  • 3002260de5 Compiling coffee files in course data directories on startup. Arjun Singh 2012-07-25 21:36:52 -04:00
  • 1d851713a0 Compiling coffee files in course data directories on startup. Arjun Singh 2012-07-25 21:36:52 -04:00
  • 7103bd0071 moved vendor js files to common Rocky Duan 2012-07-25 20:57:38 -04:00
  • 63633ae1d3 files for wmd editor Rocky Duan 2012-07-25 20:47:11 -04:00
  • 9f1353b027 removed nonexisted scss links Rocky Duan 2012-07-25 20:42:27 -04:00
  • e4073663e2 Have Bloomberg link point to Bloomberg article :-P David Ormsbee 2012-07-25 18:47:26 -04:00
  • 52c7136493 Merge branch 'lol' Rocky Duan 2012-07-25 18:41:24 -04:00
  • 3757e9757c fixed discussion & news styling Rocky Duan 2012-07-25 18:36:36 -04:00
  • dd7b1374eb Merge pull request #305 from MITx/feature/dormsbee/press_copy_updates David Ormsbee 2012-07-25 15:35:30 -07:00
  • 5ad1791433 add a few items to the press links at the bottom of the front page David Ormsbee 2012-07-25 18:31:57 -04:00
  • 02a73a945f move comment client in place Rocky Duan 2012-07-25 18:26:41 -04:00
  • d1277ff32b moved datehelper in place Rocky Duan 2012-07-25 18:25:40 -04:00
  • 9e3271e3cb fixed eager Rocky Duan 2012-07-25 18:25:28 -04:00
  • 9671df3e25 minor typo fixes David Ormsbee 2012-07-25 18:22:46 -04:00
  • 8c079c8a72 Added styles for course images to always the right dimentions Kyle Fiedler 2012-07-24 16:54:31 -04:00
  • 048deaa87f show news & options when submit comment Rocky Duan 2012-07-25 15:30:05 -04:00
  • aab9f8dc1c make course id available in xmodule Rocky Duan 2012-07-24 18:51:56 -04:00
  • 6a816e453f watch/unwatch, vote status enabled in all views Rocky Duan 2012-07-24 16:50:21 -04:00
  • e6d437b66e get user_id in discussion module Rocky Duan 2012-07-24 16:49:53 -04:00
  • b2da6eef9f provide user_id for xmodules Rocky Duan 2012-07-24 16:49:27 -04:00
  • 4b8c3b9b12 watch/unwatch threads; display current vote Rocky Duan 2012-07-24 15:34:17 -04:00
  • 0ee1b0c5d0 removed unnecessary args Rocky Duan 2012-07-23 19:24:28 -04:00
  • 5e5dda2dfb refactored out thread rendering; vote Rocky Duan 2012-07-23 19:03:36 -04:00
  • 28113d8b43 moved django_comment_client into edx Rocky Duan 2012-07-23 16:20:45 -04:00
  • d49338c948 integrated search; refactored some frontend code Rocky Duan 2012-07-23 15:41:09 -04:00
  • a8610c3889 fixed twitter link to Berkeley Press Release David Ormsbee 2012-07-25 18:15:37 -04:00
  • 3267aa1737 forum view for discussions Rocky Duan 2012-07-22 19:05:32 -04:00
  • 619d4cd989 fixed twitter link for course about pages David Ormsbee 2012-07-25 18:14:05 -04:00
  • 846a488ef2 create new post Rocky Duan 2012-07-20 13:27:18 -04:00
  • d393481b21 some basic functionalities of discussion Rocky Duan 2012-07-20 12:19:20 -04:00
  • fb408a99b5 add discussion app & url conf Rocky Duan 2012-07-19 17:08:29 -04:00
  • 9abc888340 display simple threaded comment Rocky Duan 2012-07-19 14:46:08 -04:00
  • 0373096c8d initial setup for the discussion module Rocky Duan 2012-07-18 12:00:42 -04:00
  • a86938ee93 New press articles David Ormsbee 2012-07-25 18:09:26 -04:00
  • 3a933aeab8 Update About Page text with new intro paragraph David Ormsbee 2012-07-25 17:40:58 -04:00
  • 26a14fd2c3 Merge pull request #304 from MITx/feature/halogenandtoast/press-page David Ormsbee 2012-07-25 14:35:42 -07:00
  • bd9da89fe9 Move press articles to json. Matthew Mongeau 2012-07-25 11:53:33 -04:00
  • 57810bb564 Consolidate textbox styling into codemirror.css kimth 2012-07-25 16:53:07 -04:00
  • c7648bc484 Merge pull request #297 from MITx/arjun/minor_css_fixes kylefiedler 2012-07-25 13:49:52 -07:00
  • 4680b9f9e5 Fix cursor/text mismatch in Code/External-Response styling kimth 2012-07-25 16:11:21 -04:00
  • 34a32ce15a Merge pull request #302 from MITx/feature/fix-courseware Calen Pennington 2012-07-25 12:58:21 -07:00
  • cdea9488ef Fixing up bracket indentation Arjun Singh 2012-07-25 15:57:50 -04:00
  • bb3dfc5c08 fix courseware css file so it imports the right files in the right order Kyle Fiedler 2012-07-25 15:54:18 -04:00
  • 54ea3dba22 show news & options when submit comment Rocky Duan 2012-07-25 15:30:05 -04:00
  • 5918cccdfb Merge pull request #293 from MITx/arjun/add_data_watcher jarv 2012-07-25 12:28:50 -07:00
  • 94a8421195 Merge pull request #295 from MITx/courseware-css Calen Pennington 2012-07-25 12:01:18 -07:00
  • 18dc689d4d Added fix for where the course.css is being brought in Kyle Fiedler 2012-07-24 16:36:29 -04:00
  • 00596d2f20 Added courseware css back into the main template Kyle Fiedler 2012-07-24 15:31:44 -04:00
  • 388ddc5365 change activation complete green and add styles for faq Brittany Cheng 2012-07-24 18:04:54 -04:00
  • d1482e19ee Merge pull request #294 from MITx/jarv/wiki_enabled Calen Pennington 2012-07-25 11:18:41 -07:00
  • dab92102d1 reading WIKI_ENABLED from env.json John Jarvis 2012-07-25 14:15:49 -04:00
  • 60365a6446 Using /usr/bin/env rather than defaulting to ../python/bin/python Arjun Singh 2012-07-25 13:40:47 -04:00
  • e6ee3d50ba Simplified server restart to just touching lms/__init__.py rather than killing and restarting the server. Arjun Singh 2012-07-25 13:39:30 -04:00
  • 31641252e7 Typos in and some additional comments kimth 2012-07-25 13:28:52 -04:00
  • c9a36a7085 Adding an option to watch all extensions; useful for a VIM user where the filesystem events aren't triggered when saving a file without disabling backups. Arjun Singh 2012-07-25 13:25:03 -04:00
  • 6376516568 Adding script that restarts django when content in the data directories changes. Arjun Singh 2012-07-25 13:07:24 -04:00
  • dde48f122e Merge pull request #247 from MITx/feature/cms-problem-preview Calen Pennington 2012-07-25 07:10:45 -07:00
  • 8b1bab75bd Fixing up comments on xmodule components Calen Pennington 2012-07-25 10:10:17 -04:00
  • 29cf09763f Fixing up cms tests to only use data in common/test/data Calen Pennington 2012-07-25 10:09:25 -04:00
  • 7371b444bf Merge pull request #291 from MITx/jarv/enabled-features Calen Pennington 2012-07-25 06:47:56 -07:00
  • 18b05fe78f enabled_features changed mitx_features John Jarvis 2012-07-24 21:50:45 -04:00
  • bedeac3a55 make course id available in xmodule Rocky Duan 2012-07-24 18:51:56 -04:00
  • f485167bd4 watch/unwatch, vote status enabled in all views Rocky Duan 2012-07-24 16:50:21 -04:00
  • 577599d505 get user_id in discussion module Rocky Duan 2012-07-24 16:49:53 -04:00
  • 856156a141 provide user_id for xmodules Rocky Duan 2012-07-24 16:49:27 -04:00
  • 85adfde1f2 Update previews after a module is saved Calen Pennington 2012-07-20 16:24:07 -04:00
  • bdf964a305 Modularize video css Calen Pennington 2012-07-20 16:01:54 -04:00
  • 6029c28695 Modularize sequence css Calen Pennington 2012-07-20 15:40:50 -04:00
  • 8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test Calen Pennington 2012-07-20 15:20:39 -04:00
  • 0a79130b11 Make problem previews work by saving problem state in the current request session Calen Pennington 2012-07-20 13:29:18 -04:00
  • 408726e678 Standardize how JS XModules are instantiated Calen Pennington 2012-07-20 11:54:58 -04:00
  • 50f27bcfb7 Eagerly load all modules when reading the course from xml, so that users who are already on a problem page can check their answers Calen Pennington 2012-07-20 11:21:34 -04:00
  • 0fcaa01484 Allow anonymous users to check problems, but don't save any instance state for them Calen Pennington 2012-07-20 11:17:09 -04:00
  • ebb737b94a Add better logging to capa_module during problem checking Calen Pennington 2012-07-20 11:16:41 -04:00
  • 8481937f59 Move Logger and *withPrefix javascript into a common location Calen Pennington 2012-07-19 14:06:53 -04:00
  • 87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware Calen Pennington 2012-07-19 11:58:55 -04:00
  • 1924609b10 Move schematic.js into capa_module js includes Calen Pennington 2012-07-19 11:34:33 -04:00
  • 6ea5f6a493 Move imageinput.js to capa_module js includes Calen Pennington 2012-07-19 11:29:29 -04:00
  • 7e4d3c8b35 Modularize sequence coffeescript in prepration for CMS preview Calen Pennington 2012-07-19 10:41:22 -04:00
  • a8c70d3531 add todo Victor Shnayder 2012-07-18 16:23:29 -04:00
  • 5988d1f47f Organize and de-duplicate imports in mongo.py Victor Shnayder 2012-07-18 16:21:28 -04:00
  • ba733fa5d1 add options to dev_mongo env Victor Shnayder 2012-07-18 16:14:34 -04:00
  • 49e8d08c1e Add get_courses() to mongo modulestore Victor Shnayder 2012-07-18 14:43:25 -04:00
  • 51ae0d5484 improve docstrings and formating in mongo.py Victor Shnayder 2012-07-16 16:42:39 -04:00
  • 61446b0544 Make javascript for video previews work correctly Calen Pennington 2012-07-18 16:48:36 -04:00
  • cb6c7640c8 Get the video module pointing to the correct static files directory, without relying on get_html replacement Calen Pennington 2012-07-18 15:50:12 -04:00
  • 19a3c14ab9 Split out code to replace /static urls in get_html into a separate module so that it can be used in CMS previews Calen Pennington 2012-07-18 15:24:42 -04:00
  • 4c82f35e2d Put data_dir into metadata for all XModuleDescriptors loaded from xml Calen Pennington 2012-07-18 15:23:19 -04:00
  • 5f86fcfbff Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane Calen Pennington 2012-07-18 14:15:36 -04:00
  • 5a9ba65571 Add youtube api to CMS for video module Calen Pennington 2012-07-18 09:54:56 -04:00
  • 4798c596f0 Load preview modules with actual preview elements Calen Pennington 2012-07-18 09:52:48 -04:00
  • 230dd88afd Add global methods used by video module to CMS Calen Pennington 2012-07-18 09:52:28 -04:00
  • 2d570f7c54 Load preview modules when a cms edit page is opened Calen Pennington 2012-07-18 09:01:14 -04:00