Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• a6b35853f9 Merge pull request #1455 from MITx/hotfix/dave/youtube_object David Ormsbee 2013-02-06 19:47:25 -08:00
• 976776643b Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue. David Ormsbee 2013-02-06 22:46:22 -05:00
• 37b735d708 Merge pull request #1454 from MITx/hotfix/dave/youtube_object Victor Shnayder 2013-02-06 19:41:12 -08:00
• a470a62d12 Hack to disable YouTube <iframe> API when they break it. David Ormsbee 2013-02-06 22:37:41 -05:00
• d047d826c7 update coffeescript to hide cohort choice if first commmentable is not cohorted Kevin Chugh 2013-02-06 22:00:03 -05:00
• 18ddd1ee56 Merge pull request #1453 from MITx/victor/protex Victor Shnayder 2013-02-06 18:03:53 -08:00
• a770e34bec Adding multiple-choice loncapa integration. Julian Arni 2013-02-06 20:36:44 -05:00
• 2627a2f12c Protex now loads correctly in every scenario jmclaus 2013-02-07 01:13:59 +01:00
• 98865bb7c0 Loading bug fixed by ugly hack jmclaus 2013-02-07 00:25:04 +01:00
• 85b92f30de GWT now does no set any target shape in onModuleLoad() jmclaus 2013-02-06 22:03:40 +01:00
• e27b1e04a7 Fixed small alighment pb, decreased font size of text box jmclaus 2013-02-05 20:51:01 +01:00
• 3bd7e1b703 Crisper AA letters, canvases non-selectable jmclaus 2013-02-05 18:55:17 +01:00
• ef232c5976 Few bug fixes jmclaus 2013-02-04 16:51:49 +01:00
• f6dacff41e Fixed layout, increased size of markers on proteins jmclaus 2013-01-31 16:37:26 +01:00
• 5737f58b95 Added GWT Protex - reads target shape from xml writes answer to hidden input field jmclaus 2013-01-30 18:35:12 +01:00
• e4819a1b55 Merge pull request #1452 from MITx/silly/victor/revert-forums-merge Victor Shnayder 2013-02-06 17:41:14 -08:00
• 2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" Victor Shnayder 2013-02-06 20:29:17 -05:00
• 884a7a61b9 Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes" Victor Shnayder 2013-02-06 20:27:01 -05:00
• b6ec41cae0 Merge pull request #1432 from MITx/7012x-clean Victor Shnayder 2013-02-06 15:58:29 -08:00
• 0141f31d33 add warning message to sample-post.py Victor Shnayder 2013-02-06 18:57:25 -05:00
• edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean Victor Shnayder 2013-02-06 18:53:14 -05:00
• 2c1f3bd470 Merge pull request #1449 from MITx/fix/rocha/7012x-clean Victor Shnayder 2013-02-06 15:50:27 -08:00
• 965e3b4c49 Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes Victor Shnayder 2013-02-06 15:40:33 -08:00
• 536333cbb5 Refactor how editamolecule displays messages Carlos Andrés Rocha 2013-02-06 18:31:00 -05:00
• 1dd0ef274d addressed somme comments in pull request and instructor fixes and blank group fix Kevin Chugh 2013-02-06 18:26:41 -05:00
• 1a7d2a06a8 Merge pull request #1442 from MITx/marketing/reg-tweak Victor Shnayder 2013-02-06 15:26:26 -08:00
• 4b54e849ad Merge pull request #1448 from MITx/feature/ichuang/conditional-xmodule-icon-and-errortracker Victor Shnayder 2013-02-06 15:25:48 -08:00
• b5ba88f0af Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker ichuang 2013-02-06 18:15:36 -05:00
• c16f688802 conditional xmod: add errortracker msg and inherit icon from child ichuang 2013-02-06 18:10:25 -05:00
• 1e68834e03 Remove from to-be-deleted list any readded keys w/ same name. Don Mitchell 2013-02-06 17:42:00 -05:00
• 66889b8724 Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes Victor Shnayder 2013-02-06 14:41:41 -08:00
• d4afa02b12 Modify editamolecule to load GWT scripts dynamically Carlos Andrés Rocha 2013-02-06 17:40:44 -05:00
• 253bc10d9f did other test cleanups which Christina mentioned (should have read the note first) Don Mitchell 2013-02-06 17:31:17 -05:00
• 7b3c81ca53 blacklist violations now properly trigger violation error delete keys only after save completes Don Mitchell 2013-02-06 17:25:12 -05:00
• 0dd9c24e74 Merge pull request #1447 from MITx/debug/dave/pearson_js_error Victor Shnayder 2013-02-06 14:16:44 -08:00
• 55c205b9b4 merged master Kevin Chugh 2013-02-06 17:13:52 -05:00
• e5fda33eff Throw the error back up if we don't have a console to log it to. David Ormsbee 2013-02-06 17:13:22 -05:00
• 92eb88d464 Merge pull request #1444 from MITx/feature/cale/dev-staticfiles Victor Shnayder 2013-02-06 14:02:04 -08:00
• 7668c70f62 Update test now updates existing attrs Don Mitchell 2013-02-06 17:01:00 -05:00
• 83608fd983 Restyle lists Vik Paruchuri 2013-02-06 16:58:59 -05:00
• 28a0e44120 Quick rubric restyle Vik Paruchuri 2013-02-06 16:57:10 -05:00
• bbf37ef9d0 Merge pull request #1446 from MITx/fix/vik/peer-grading-images Diana Huang 2013-02-06 13:51:05 -08:00
• 463f31618d Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images Vik Paruchuri 2013-02-06 16:37:52 -05:00
• c68b0d3cd0 Merge pull request #1439 from MITx/feature/vik/oe-versioning VikParuchuri 2013-02-06 13:36:06 -08:00
• 8bc98b2ff8 Fix sass Vik Paruchuri 2013-02-06 16:32:16 -05:00
• 48719a7a45 Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui Vik Paruchuri 2013-02-06 16:04:01 -05:00
• cf81fb27e8 Add in close date to metadata Vik Paruchuri 2013-02-06 15:55:39 -05:00
• cb9d960a28 studio - soft landing: style dropdown arrows Brian Talbot 2013-02-06 15:46:10 -05:00
• 3f15b3b8ff Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy cahrens 2013-02-06 15:29:36 -05:00
• c243eec604 Move to view file. cahrens 2013-02-06 15:29:17 -05:00
• 733faebaf0 Fix git issue Vik Paruchuri 2013-02-06 15:28:05 -05:00
• 5a51d142bb Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning Vik Paruchuri 2013-02-06 15:26:01 -05:00
• aae5c7ca23 remove unneeded files Brian Wilson 2013-02-06 15:25:25 -05:00
• bfc4527590 Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages. Brian Wilson 2013-02-06 15:23:11 -05:00
• f568e49265 Fix oe version tests Vik Paruchuri 2013-02-06 15:20:02 -05:00
• 114d800c6a need to make path_to_location a dictionary since it needs to be keyed by the location Chris Dodge 2013-02-06 15:17:47 -05:00
• 9e4e98ef74 Fix some css to get things to properly close/open Vik Paruchuri 2013-02-06 15:13:56 -05:00
• d8a6010d0f studio - manual policy editor: added in example messages for confirm, error, warning Brian Talbot 2013-02-06 15:13:44 -05:00
• d00a1f35c7 studio - soft landing: resolved not signed in header nav length issue Brian Talbot 2013-02-06 15:00:40 -05:00
• 04f6d6d0ff Improve documentation Diana Huang 2013-02-06 15:00:08 -05:00
• 571e1106a4 studio - manual policy editor: styled error states to appear inline with row actions visually Brian Talbot 2013-02-06 14:57:18 -05:00
• d11f10cc66 studio - course nav: corrected JS behavior of dropdowns to hide all others and self-hide appropriately Brian Talbot 2013-02-06 14:37:09 -05:00
• 946d1617e7 studio - resolving merge conflict in header widget Brian Talbot 2013-02-06 14:18:55 -05:00
• 1dae21e969 studio - course nav: styled dropdown navigation Brian Talbot 2013-02-06 14:16:49 -05:00
• 6f147df7f7 Merge branch 'master' into feature/diana/close-oe-problems Diana Huang 2013-02-06 14:16:18 -05:00
• 5a25d7fa6e Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-discussion-modules Chris Dodge 2013-02-06 14:05:56 -05:00
• f42f84d9e8 Merge pull request #1440 from MITx/diana/rubric-ui-improvements Diana Huang 2013-02-06 11:04:44 -08:00
• 62dcd09bdd Merge pull request #1428 from MITx/feature/diana/close-oe-problems VikParuchuri 2013-02-06 10:56:30 -08:00
• 02ac72d0af Doing some restyling on peer grading Vik Paruchuri 2013-02-06 13:49:59 -05:00
• 31d541e5ad Wire up settings to menu (3 different ways just b/c it's possible) Don Mitchell 2013-02-06 13:42:51 -05:00
• 6ed2737c36 make LMS forum subsystem more robust in case of orphaned discussion modules. Given our draft/non-draft duality, we don't currently have a means to always do proper housekeeping at this point in time. However, we have to stop the LMS Forums from blowing up when encoutering one of these. Chris Dodge 2013-02-06 13:29:48 -05:00
• f3fa438018 Merge branch 'master' into feature/diana/close-oe-problems Diana Huang 2013-02-06 13:26:22 -05:00
• f565d17b4f Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images Vik Paruchuri 2013-02-06 13:23:31 -05:00
• a0febd35a0 Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images Vik Paruchuri 2013-02-06 13:22:12 -05:00
• ddda9ba55d Try to fix tests Vik Paruchuri 2013-02-06 13:19:37 -05:00
• 4adf2f6180 Merge branch 'master' into diana/rubric-ui-improvements Diana Huang 2013-02-06 13:16:24 -05:00
• 96636681e9 Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning Vik Paruchuri 2013-02-06 13:16:02 -05:00
• 1f5beba383 Merge branch 'master' into diana/rubric-ui-improvements Diana Huang 2013-02-06 13:12:04 -05:00
• 6b4a1dfd34 minor tweaks after testing Your Name 2013-02-06 12:54:06 -05:00
• 042ae2da29 Fix some bugs with the grading module and make the 'closed' page a little nicer Diana Huang 2013-02-06 12:51:52 -05:00
• 8f18522d58 Unit tests for edit metadata Don Mitchell 2013-02-06 12:01:22 -05:00
• 533127136e Merge pull request #1429 from MITx/feature/cale/pep8-autofix Ned Batchelder 2013-02-06 08:57:55 -08:00
• e8d01a0882 Merge branch 'master' into feature/diana/close-oe-problems Diana Huang 2013-02-06 11:52:40 -05:00
• 78948210b8 Use different template when peer grading is closed. Diana Huang 2013-02-06 11:50:35 -05:00
• b0be1cd3dc studio - soft landing: revised app nav flexible grid Brian Talbot 2013-02-06 11:36:08 -05:00
• 977e1904f9 Refactor out time parsing logic into its own class. Diana Huang 2013-02-06 11:25:06 -05:00
• cfae1cdf62 Pep8 autofixes Calen Pennington 2013-02-06 11:13:50 -05:00
• 7fc4081495 Make pylint work on bare .py files from rake Calen Pennington 2013-02-05 11:17:40 -05:00
• 0b650122fb Config changes to make pep8 autofixes easier Calen Pennington 2013-02-05 07:39:53 -05:00
• b98c643aaf studio - merging soft landing local work with rebased branch Brian Talbot 2013-02-06 10:59:59 -05:00
• e89948a5c6 Merge pull request #1415 from MITx/feature/zoldak/cms-unit-tests Calen Pennington 2013-02-06 07:49:52 -08:00
• 72023cb5d2 Improve docstring wording for ModuleStoreTestCase class. Jay Zoldak 2013-02-04 17:15:54 -05:00
• abf4ad36f4 Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class. Jay Zoldak 2013-02-04 17:01:38 -05:00
• fde6d1ba1c Refactor tests for cms contentstore. Jay Zoldak 2013-02-04 10:57:20 -05:00
• 3324615270 Reorganize test cases Jay Zoldak 2013-02-04 08:26:21 -05:00
• 5a6b039208 Reorganize the CmsTestCase subclass Jay Zoldak 2013-02-02 22:29:40 -05:00
• 2c5a7ccdf7 Rearrange factories and clean up imports Jay Zoldak 2013-02-02 16:39:46 -05:00
• b329b0ea42 Remove toy dbs from CMS test settings.py file as they are not used. Jay Zoldak 2013-02-02 15:53:30 -05:00
• b63c3c5a67 Change modulestore name and subclass TestCase Jay Zoldak 2013-02-01 17:09:37 -05:00
• 08ce212bd5 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy cahrens 2013-02-06 10:35:12 -05:00