Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 1742775262 added configuration parameter to turn on / off discussion service Rocky Duan 2012-08-13 15:35:19 -07:00
• a111a44da0 when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work ichuang 2012-08-13 18:09:14 -04:00
• 9324ae3485 Merge branch 'master' into kimth/generic-coderesponse kimth 2012-08-13 17:56:06 -04:00
• 1b06f51fd8 fix customresponse be consistent with "no answer entered" behavior ichuang 2012-08-13 17:41:24 -04:00
• 0a9ad1a5f9 Added settings template. Bridger Maxwell 2012-08-13 16:42:57 -04:00
• 9b7dd91997 Merge pull request #403 from MITx/jarv/update-create-dev jarv 2012-08-13 13:42:49 -07:00
• 99f26e4ea8 adding maya to supported distro list for create-dev-env.sh John Jarvis 2012-08-13 16:40:46 -04:00
• 666c0bd56c Merge branch 'master' into kimth/generic-coderesponse kimth 2012-08-13 16:26:27 -04:00
• 99e7711aca Generic CodeResponse XML (+ support for old ExternalResponse XML) kimth 2012-08-13 15:48:33 -04:00
• 276f22b965 remove debugging print stmt Victor Shnayder 2012-08-13 15:32:04 -04:00
• a7b88550c7 Merge pull request #401 from MITx/feature/kfiedler/courseware-style Calen Pennington 2012-08-13 12:29:48 -07:00
• 0297aff761 Merge pull request #400 from MITx/feature/victor/enrollment-windows Calen Pennington 2012-08-13 12:29:14 -07:00
• 76c4259c15 Merge pull request #399 from MITx/feature/fix_replication_side_effects Calen Pennington 2012-08-13 12:25:42 -07:00
• 731f1cd7a8 Added tooltip styles, made all buttons the same, and other small changes throughout the courseware Kyle Fiedler 2012-08-13 15:05:43 -04:00
• 8716f88155 add course enrollment windows Victor Shnayder 2012-08-13 15:03:46 -04:00
• ff1a0ba274 Added wiki create and create_root. Fixed some mitxmako bugs. Bridger Maxwell 2012-08-13 14:25:11 -04:00
• add050593a address comment on #392 Victor Shnayder 2012-08-13 14:23:41 -04:00
• 706fd99cab Address comments on #394 Victor Shnayder 2012-08-13 14:21:19 -04:00
• c4d89cd535 One more test to make sure users are really being copied David Ormsbee 2012-08-13 13:34:24 -04:00
• a25f289ca7 re-enable User save signal handler David Ormsbee 2012-08-13 13:16:33 -04:00
• 301695a5c4 Remove outdated comment David Ormsbee 2012-08-13 13:11:27 -04:00
• b5beb13964 Fix side-effect related problems with User replication. David Ormsbee 2012-08-13 13:06:35 -04:00
• fe954ca1c7 Unbreak frontend polling kimth 2012-08-13 10:46:01 -04:00
• ecffe3e088 Merge pull request #389 from MITx/feature/tomg/fall-design Calen Pennington 2012-08-13 07:35:45 -07:00
• d5ef8d7c31 Merge branch 'feature/tomg/fall-design' of github.com:MITx/mitx into feature/tomg/fall-design Tom Giannattasio 2012-08-13 10:27:59 -04:00
• 6a50da3d16 Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-13 10:26:28 -04:00
• 7b4cd3e4b3 added additional processing class Tom Giannattasio 2012-08-10 15:54:00 -04:00
• 32924d8bfe Merge pull request #398 from MITx/kimth/partialgrading Calen Pennington 2012-08-13 07:19:50 -07:00
• ee0cbf66f9 added a cleaner arrow implementation Tom Giannattasio 2012-08-10 15:48:58 -04:00
• 4eefa73336 changed field border color Tom Giannattasio 2012-08-10 14:17:59 -04:00
• 8b79d811d4 added spinner gif Tom Giannattasio 2012-08-10 14:08:58 -04:00
• 95b7957491 Merge pull request #350 from MITx/arjun/javascript_response Calen Pennington 2012-08-13 07:14:44 -07:00
• 1ff8e271f5 Partial scoring kimth 2012-08-13 10:14:29 -04:00
• 801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response Calen Pennington 2012-08-13 10:13:21 -04:00
• bd95c03d9b Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches Calen Pennington 2012-08-13 06:55:05 -07:00
• a3d7c4892d Merge pull request #397 from MITx/feature/server_split Calen Pennington 2012-08-13 06:39:03 -07:00
• 4ac7862975 Merge branch 'master' into feature/server_split David Ormsbee 2012-08-13 09:21:02 -04:00
• a984fbb65f Merge pull request #394 from MITx/feature/victor/hide-error-modules Calen Pennington 2012-08-13 06:17:13 -07:00
• fdee13e4c0 Merge pull request #393 from MITx/feature/victor/bad-content-warn-not-error Calen Pennington 2012-08-13 06:13:19 -07:00
• 8402d26901 Merge pull request #392 from MITx/feature/victor/dark-launch Calen Pennington 2012-08-13 06:11:45 -07:00
• d6f3492975 replaced comment client sym link Rocky Duan 2012-08-12 22:55:55 -07:00
• 12897ffff0 added title & tag for new post & fixed error handling; reply button in generated thread doesn't work Rocky Duan 2012-08-12 22:54:02 -07:00
• 3cabb2dea6 Remove the no-longer-used is_valid_course_id code David Ormsbee 2012-08-13 01:00:55 -04:00
• d24ee25615 Remove debug checking for UserProfile David Ormsbee 2012-08-13 00:57:33 -04:00
• 0aad62d6a8 Remove extra braces that were causing mako syntax errors David Ormsbee 2012-08-13 00:48:35 -04:00
• c6ed6fc066 Merge branch 'master' into feature/server_split David Ormsbee 2012-08-13 00:36:31 -04:00
• 510435ada5 Sketchy adding of test dbs to the cms test.py config file -- these are required for the Student (shared django app) tests to run David Ormsbee 2012-08-13 00:35:51 -04:00
• 7711f81303 Add nginx.conf file for running a multi-server dev env David Ormsbee 2012-08-12 23:35:50 -04:00
• 7b7164a101 fixed unicode bug Rocky Duan 2012-08-12 17:12:16 -07:00
• 322828fbff removed unnecessary template Rocky Duan 2012-08-12 16:41:16 -07:00
• 47c48e9c66 fix student.views.create_account to handle errors from _do_create_account ichuang 2012-08-12 19:07:31 -04:00
• f072979a6c fix error in student views - js was undefined in _do_create_account ichuang 2012-08-12 18:45:24 -04:00
• da9742a88a reroute email on AWS test machine (dev_ike) ichuang 2012-08-12 18:39:39 -04:00
• 2c9652ab74 change xqa server location to suburl ichuang 2012-08-12 18:29:48 -04:00
• 3455f8f64d Hide errors from non-staff users Victor Shnayder 2012-08-12 18:03:12 -04:00
• af7e70a979 Log content problems as warnings, not errors Victor Shnayder 2012-08-12 17:21:40 -04:00
• e980f8b296 add notes on how to run individual tests Victor Shnayder 2012-08-12 16:59:07 -04:00
• d7f94a05b7 Add DARK_LAUNCH functionality Victor Shnayder 2012-08-12 16:23:31 -04:00
• 622eebc473 Don't error on missing static files Victor Shnayder 2012-08-12 16:21:38 -04:00
• 54b0a465fa Ugly hack so that an LMS-specific test of the shared Student djangoapp doesn't break CMS test runs David Ormsbee 2012-08-12 16:10:08 -04:00
• 44f7b37bfb refactored comment_client working Rocky Duan 2012-08-12 12:56:55 -07:00
• 656a162aba allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER'] ichuang 2012-08-12 12:43:08 -04:00
• 453d623b43 use mitx content-qa central server for staff_problem_info ichuang 2012-08-11 23:42:39 -04:00
• b7d3361894 Merge branch 'mergedtom' into refactor Rocky Duan 2012-08-11 17:43:16 -07:00
• de8c828fb3 changed comment_client module to be imported as cc Rocky Duan 2012-08-11 17:42:08 -07:00
• 2848c1fe38 switched to refactored comment_client Rocky Duan 2012-08-11 17:36:58 -07:00
• da64c8f0a1 add xqa interface to staff_problem_info, make staff_debug a modal window, add xqa modal window, add xqa_key to course metadata ichuang 2012-08-11 20:12:37 -04:00
• 2d256dfe1d attempt to fix sort Rocky Duan 2012-08-11 16:35:34 -07:00
• 7030d1f1a2 fixed endorse&edit&delete Rocky Duan 2012-08-11 14:38:37 -07:00
• 2f469f0f29 Merge branch 'brittany' of github.com:dementrock/mitx into mergedtom Rocky Duan 2012-08-10 18:51:18 -07:00
• 39590116f7 make some indentation Rocky Duan 2012-08-10 18:51:12 -07:00
• 78ca885b05 fix comment styles Brittany Cheng 2012-08-10 18:42:07 -07:00
• 9a54295ea1 Merge pull request #391 from MITx/feature/cale/allow-broken-content-links ichuang 2012-08-10 18:36:52 -07:00
• 14bfbb06a5 If there is a missing static file, don't break the server, just leave a dead url Calen Pennington 2012-08-10 21:22:12 -04:00
• 66beb54739 Merge branch 'brittany' of github.com:dementrock/mitx into lol Rocky Duan 2012-08-10 17:59:28 -07:00
• ab6cf914a0 Merge branch 'brittany' of github.com:dementrock/mitx into lol Rocky Duan 2012-08-10 17:59:19 -07:00
• 5b6e3997af fixed ul courseware Brittany Cheng 2012-08-10 17:58:18 -07:00
• 86b53bb248 uh Rocky Duan 2012-08-10 17:53:22 -07:00
• f44358ab78 merge tom's styles Brittany Cheng 2012-08-10 17:52:07 -07:00
• b5d377adb5 Merge pull request #388 from MITx/kimth/lms-coderesponse Calen Pennington 2012-08-10 17:48:54 -07:00
• 241d445f30 changes to xml_module to allow problem metadata to be added via <meta> ichuang 2012-08-10 19:00:50 -04:00
• e8ac66fce2 Merge branch 'feature/server_split' of https://github.com/MITx/mitx into feature/server_split kimth 2012-08-10 18:52:04 -04:00
• d41f709c92 Moved xqueue_callback URLs into the course kimth 2012-08-10 18:51:35 -04:00
• e462fad367 Converted wiki edit page and breadcrumbs. Bridger Maxwell 2012-08-10 18:15:21 -04:00
• 689c761bbc Remove comment in Rakefile I was just testing. David Ormsbee 2012-08-10 17:07:03 -04:00
• cbfdf59760 Fix test error regarding UserProfiles (a UserProfile must exist before a CourseEnrollment) David Ormsbee 2012-08-10 16:41:46 -04:00
• f6e84e84da SECURE_PROXY_SSL_HEADER for django-1.4 in envs/dev_ike for nginx ssl proxy ichuang 2012-08-10 16:24:32 -04:00
• b159eb4825 add feature flag to disable login button (for systems which autologin) ichuang 2012-08-10 15:57:41 -04:00
• f4db9c0199 added additional processing class Tom Giannattasio 2012-08-10 15:54:00 -04:00
• 52c49f2b9a added a cleaner arrow implementation Tom Giannattasio 2012-08-10 15:48:58 -04:00
• f556e3f7d9 revert double-mangling patch in xmodule_modifiers; cale fixed in replace_urls ichuang 2012-08-10 10:35:08 -04:00
• b6c38d3c59 replace_static_urls should only be run once (currently twice, eg if html is in a veritical) ichuang 2012-08-07 19:39:57 -04:00
• f99eb930ac new static/admin files for django 1.4 admin ichuang 2012-08-10 15:18:33 -04:00
• 881f07f3c3 revert double-mangling patch in xmodule_modifiers; cale fixed in replace_urls ichuang 2012-08-10 10:35:08 -04:00
• dade6dd182 askbot template loader is broken - breaks admin view; disable in dev_ike.py ichuang 2012-08-10 09:36:11 -04:00
• c0a4ff3717 more useful debugging message for capa problem script errors ichuang 2012-08-09 19:12:53 -04:00
• 411e77e19d ModuleSystem should get its DEBUG set from settings.DEBUG in module_render ichuang 2012-08-09 19:03:11 -04:00
• d2c1df88d1 update utility script to create course groups ichuang 2012-08-08 23:08:05 -04:00
• 27cd9ef986 minor change to allow github url to be overridden by metadata ichuang 2012-08-08 22:41:19 -04:00
• 4240830e68 cms also needs replace_static_urls call fixed ichuang 2012-08-07 19:47:14 -04:00