Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 50dc4e80a3 adding askbot as a submodule of mitx John Jarvis 2012-07-31 15:49:11 -04:00
• c69a4728e7 Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-31 15:42:12 -04:00
• b12d887309 font sizing Brittany Cheng 2012-07-31 15:41:03 -04:00
• 5e8d132aad removing askbot-devel John Jarvis 2012-07-31 15:15:49 -04:00
• 3d389c099e new post control button and link styles Brittany Cheng 2012-07-31 15:05:07 -04:00
• aaeb0446d1 version is required http://gembundler.com/man/gemfile.5.html, this was causing rvm to return non-zero and thus causing the create-dev-env.sh script to fail John Jarvis 2012-07-31 14:58:07 -04:00
• 1279c86097 by default now stdout and stdin will appear on console, both are logged John Jarvis 2012-07-31 14:56:39 -04:00
• 202b18a3e0 Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates John Jarvis 2012-07-31 14:54:27 -04:00
• c46b232e19 oops missed a bracket Rocky Duan 2012-07-31 14:32:00 -04:00
• fafa86b413 Merge pull request #322 from MITx/feature/kfiedler/courseware-style David Ormsbee 2012-07-31 11:31:16 -07:00
• d30ae5389e Added fix for videos start to zero out colors and mit styles Kyle Fiedler 2012-07-31 14:18:42 -04:00
• b3474fbf10 Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-31 14:09:12 -04:00
• ff4d0637f5 merging styles Brittany Cheng 2012-07-31 14:09:06 -04:00
• 32c76d1351 bug fix search bar lol.. Rocky Duan 2012-07-31 14:08:31 -04:00
• 2e3c5de1a5 Remove hardcoding of LMS callback URL and default queuename kimth 2012-07-31 14:08:02 -04:00
• 643316a10b tag styles Brittany Cheng 2012-07-31 14:05:11 -04:00
• 20f958e6be bug fix: resize input for defaulttext (tagsinput) Rocky Duan 2012-07-31 14:03:55 -04:00
• c43d5d236a Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 Rocky Duan 2012-07-31 13:43:53 -04:00
• 836242706f buttons Brittany Cheng 2012-07-31 13:41:21 -04:00
• 401f57b81a show new post form after clicking button Rocky Duan 2012-07-31 13:40:26 -04:00
• ddce6d8cb6 Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-31 13:39:13 -04:00
• 799f66b776 make search bar configurable Rocky Duan 2012-07-31 13:26:36 -04:00
• 48674d6fa5 search button style Brittany Cheng 2012-07-31 13:23:35 -04:00
• c39b2db678 retrieve inline discussion by ajax Rocky Duan 2012-07-31 13:22:25 -04:00
• 0879f3e0a8 Use build_absolute_uri rather than hardcoded sandbox URL kimth 2012-07-31 13:21:45 -04:00
• a773df588a Merge branch 'master' into kimth/lms-coderesponse kimth 2012-07-31 13:02:48 -04:00
• 27e142dd2f Extra empty line kimth 2012-07-31 12:58:32 -04:00
• 607bc6b50b Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-31 12:51:17 -04:00
• b659846e1f Add askbot to lms staticfiles_dirs in test Calen Pennington 2012-07-31 12:46:47 -04:00
• 701f8716f7 only show edit button when user can edit Rocky Duan 2012-07-31 12:31:59 -04:00
• cf92f356c0 edit styles for tags, discussion votes, etc Brittany Cheng 2012-07-31 12:03:45 -04:00
• e301be4a80 modify anonymity handling; display comments count Rocky Duan 2012-07-31 11:54:02 -04:00
• 32cf7c6f66 Merge branch 'master' of github.com:MITx/mitx into discussion2 Brittany Cheng 2012-07-31 11:26:17 -04:00
• 7bfd21732a Merge pull request #321 from MITx/feature/kfiedler/courseware-style David Ormsbee 2012-07-31 08:22:46 -07:00
• 2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts Kyle Fiedler 2012-07-31 11:06:39 -04:00
• 9bd1aa94d8 Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-31 10:48:18 -04:00
• a08d4b808b fix raw tag data bug Rocky Duan 2012-07-31 10:47:42 -04:00
• 3968e117e1 Simplify dict load in xqueue_callback kimth 2012-07-31 10:42:32 -04:00
• 278483371b fix merge conflicts Brittany Cheng 2012-07-31 10:30:26 -04:00
• 6285f2a2be discussion styles Brittany Cheng 2012-07-31 10:27:14 -04:00
• ada66adff6 Merge branch 'master' of github.com:MITx/mitx Rocky Duan 2012-07-31 10:12:06 -04:00
• 6f44001813 basic editing functionality Rocky Duan 2012-07-31 10:11:51 -04:00
• 22af531b0b Hardcoded URL moved to LMS for now kimth 2012-07-31 10:09:47 -04:00
• 2f95a8e1d0 Re-add __init__.py for contentstore that was accidentally deleted in 05add5818b Calen Pennington 2012-07-31 09:29:14 -04:00
• e2f4995bc9 LMS provides fully qualified callback URL kimth 2012-07-31 08:57:28 -04:00
• 94e73936fc Merge pull request #319 from MITx/kimth/lms-coderesponse ichuang 2012-07-30 18:51:16 -07:00
• 6d600ecf2c Merge branch 'master' into kimth/lms-coderesponse kimth 2012-07-30 20:42:10 -04:00
• b9e5e9f0ee Read XML for queuename kimth 2012-07-30 20:18:25 -04:00
• 6244412c28 Simplify default linenumbers behavior kimth 2012-07-30 18:59:11 -04:00
• 6da690f692 Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-30 18:37:11 -04:00
• bba8e29733 Merge branch 'master' of github.com:MITx/mitx into discussion2 Brittany Cheng 2012-07-30 18:36:23 -04:00
• cc47de5135 Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-30 18:36:15 -04:00
• a98c505ba8 fix merge conflicts Brittany Cheng 2012-07-30 18:36:06 -04:00
• cef347226b Merge branch 'master' of github.com:MITx/mitx Rocky Duan 2012-07-30 18:35:11 -04:00
• 24610899cf fix accordion Rocky Duan 2012-07-30 18:34:47 -04:00
• 92cfded595 added color to error msg and borders to threads Brittany Cheng 2012-07-30 18:34:07 -04:00
• e5fd92630d Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors David Ormsbee 2012-07-30 15:24:12 -07:00
• 1baa306cfa Merge pull request #320 from MITx/feature/kfiedler/courseware-style David Ormsbee 2012-07-30 15:23:52 -07:00
• d6b7707725 refactored reply rendering by using mustache Rocky Duan 2012-07-30 18:19:04 -04:00
• e705bbb764 Merge branch 'discussion2' of github.com:dementrock/mitx Rocky Duan 2012-07-30 17:45:29 -04:00
• 8228bebc2a Merge branch 'master' of github.com:MITx/mitx Rocky Duan 2012-07-30 17:41:19 -04:00
• c611bd9228 added treeview Kyle Fiedler 2012-07-30 17:36:55 -04:00
• 257ce0430f Moved vendor sass files to css folder and included them in Kyle Fiedler 2012-07-30 16:18:22 -04:00
• 7ab5bbfaef Moved files and removed files Kyle Fiedler 2012-07-30 16:13:01 -04:00
• 6cad5459b3 Start to refactor courseware scss Kyle Fiedler 2012-07-30 15:24:59 -04:00
• 95291ef745 fix line 511 Brittany Cheng 2012-07-30 17:29:07 -04:00
• 2ad854abb7 Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-30 17:28:05 -04:00
• e6776682df ..and fix again bug caused by changing id Rocky Duan 2012-07-30 17:25:14 -04:00
• 554fc827f4 Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-07-30 17:22:12 -04:00
• 5fcc12136e fixed bug caused by rearranging stuff Rocky Duan 2012-07-30 17:20:30 -04:00
• 6c8214051f Merge branch 'discussion2' of github.com:dementrock/mitx Rocky Duan 2012-07-30 17:17:32 -04:00
• 8bf2eb17e8 middleware file forgot to include Rocky Duan 2012-07-30 17:17:09 -04:00
• 941ae0f068 basic error handling Rocky Duan 2012-07-30 17:16:44 -04:00
• 2869de16dd refactored thread.html Rocky Duan 2012-07-30 17:15:53 -04:00
• 91cb814ee0 merging with origin master Brittany Cheng 2012-07-30 16:28:49 -04:00
• 3bb82c41d2 Remove couse css file Kyle Fiedler 2012-07-30 16:21:03 -04:00
• 021e10ab4e Merge pull request #317 from MITx/feature/cale/cms-aws-cfg Calen Pennington 2012-07-30 13:11:48 -07:00
• 89b5f5b2be Minor review notes Calen Pennington 2012-07-30 16:11:35 -04:00
• bd66a28d32 Add TODO note kimth 2012-07-30 15:23:14 -04:00
• 1b7e2b356e edit layout of search box Brittany Cheng 2012-07-30 15:22:40 -04:00
• f500fac0ae Merge pull request #318 from MITx/pmitros/minidash David Ormsbee 2012-07-30 11:43:01 -07:00
• ab0055c201 Add update_schematic to window in schematic.js Calen Pennington 2012-07-27 16:17:06 -04:00
• 1fce1dbe34 Make sure that django-pipelined css and js don't collide between the cms and lms Calen Pennington 2012-07-27 15:46:11 -04:00
• 395cf147be Look up data_dir in the metadata, not in the top of the json object when loading from mongodb Calen Pennington 2012-07-27 15:24:24 -04:00
• 2caf1024f1 Force mongodb fs_root to be a path object Calen Pennington 2012-07-27 15:08:03 -04:00
• d0c99151f0 Continue during backcompat imports by replacing contents with error xml Calen Pennington 2012-07-27 15:00:57 -04:00
• 7ae0836f77 Add some more tests of github_sync Calen Pennington 2012-07-27 12:36:30 -04:00
• 66d5c8effd Add more detail to error messages during loading from xml Calen Pennington 2012-07-27 09:04:48 -04:00
• 6997fc579e Continue on errors when syncing with github Calen Pennington 2012-07-27 08:57:53 -04:00
• 833f5fdbe0 Merge branch 'master' of github.com:dementrock/mitx into discussion Brittany Cheng 2012-07-30 13:45:55 -04:00
• ab339239f8 use single js dependencies for discussion in forum / courseware Rocky Duan 2012-07-30 13:44:00 -04:00
• 96c2a34c95 dumb bug Rocky Duan 2012-07-30 13:43:28 -04:00
• bd0b20bb60 xqueue_callback uses 'xqueue_body' tag rather than 'response' tag for main message kimth 2012-07-30 13:35:13 -04:00
• 05add5818b Return a custom error for duplicate elements, and ignore it when loading into mongo Calen Pennington 2012-07-27 08:48:38 -04:00
• 4e43b662fa CodeResponse admits only one student response kimth 2012-07-30 13:10:24 -04:00
• 6bd9cd6c28 Add management command for syncing with github Calen Pennington 2012-07-26 15:31:51 -04:00
• cec2c893be Add AWS keys so that the CMS can send email Calen Pennington 2012-07-26 14:25:49 -04:00
• 818cb0d1e7 Separate cms and lms auth and env files, and have the LMS that runs with the CMS use the CMS modulestore Calen Pennington 2012-07-26 12:40:05 -04:00
• d86b72fc24 Split REPOS data into separate file on aws Calen Pennington 2012-07-26 12:37:38 -04:00
• 7e06c72e42 Add logsettings to CMS Calen Pennington 2012-07-26 12:27:42 -04:00