Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• ebeee7a195 Merge pull request #1785 from MITx/fix/cdodge/xml_attribute-as-system-metadata Christina Roberts 2013-04-01 12:24:56 -07:00
• 8b26d3a8a1 Protect against no due property (as was there before). cahrens 2013-04-01 14:42:05 -04:00
• ee2b92ab02 Protect against no due property (as was there before). cahrens 2013-04-01 14:38:56 -04:00
• 845e86b8d1 Format timestamp. cahrens 2013-04-01 14:32:03 -04:00
• b7fba98e2a Merge pull request #1790 from MITx/fix/cdodge/certificates-db-perf-optimization jarv 2013-04-01 11:26:29 -07:00
• 140ad8bf61 Merge pull request #1791 from MITx/fix/brian/foldit-grading Victor Shnayder 2013-04-01 11:18:58 -07:00
• b1ee96b38e Format timestamp. cahrens 2013-04-01 14:18:15 -04:00
• 1abfff220e when grading, check for always-regrade at the section level too Brian Wilson 2013-04-01 14:14:12 -04:00
• 055538e213 Format timestamp. cahrens 2013-04-01 14:10:48 -04:00
• ba7d29b3e7 Merge pull request #1763 from MITx/fix/brian/single_section_grading Victor Shnayder 2013-04-01 11:06:44 -07:00
• 53cf8aa744 Merge pull request #1789 from MITx/fix/will/chem_customresponse_bug Victor Shnayder 2013-04-01 11:04:37 -07:00
• 8fef830740 optimize db round trips, by getting the course descriptor outside of the user loop Chris Dodge 2013-04-01 14:02:54 -04:00
• 1cba122dc0 Undid accidental commit of pylint fixes to responsetypes Will Daly 2013-04-01 13:47:59 -04:00
• 42b4ffdcf9 Cleanup. cahrens 2013-04-01 13:40:32 -04:00
• 87d8a56a93 CustomResponse now imports chem packages into the global context for scripts to access. This was removed accidentally during an earlier refactoring, which caused customresponse to raise an exception for chem problems. Unit tests verify the changes Will Daly 2013-04-01 13:27:31 -04:00
• 2f4310713b fix index Kevin Chugh 2013-04-01 13:22:56 -04:00
• ec06b36660 Merge pull request #1787 from MITx/fix/will/random_seed_not_saved Calen Pennington 2013-04-01 10:15:14 -07:00
• 98a717b6b2 Merge pull request #1771 from MITx/feature/rocha/enable-sass-source-maps brianhw 2013-04-01 09:44:57 -07:00
• 93b0fafea8 Merge branch 'master' into bug/christina/studio cahrens 2013-04-01 12:41:34 -04:00
• 8ace7fe57c Merge branch 'master' into bug/christina/studio cahrens 2013-04-01 12:30:07 -04:00
• fb97602442 Save randomization seed if it is not already set, so that the same problem loads when the user checks/saves/resets Will Daly 2013-04-01 12:08:53 -04:00
• fdc8a6fedf reverted rednose version James Tauber 2013-04-01 13:06:35 -03:00
• 7f00487203 Reverted last commit due to concerns about database writes. Will Daly 2013-04-01 11:48:10 -04:00
• 16f4a3f9c1 Convert due date to a Date (vs. a string with no year). cahrens 2013-04-01 11:37:05 -04:00
• a50f1ca630 Merge pull request #1784 from MITx/fix/zoldak/enable-jasmine-lms Calen Pennington 2013-04-01 08:33:35 -07:00
• 0e4369603e Merge pull request #1756 from MITx/fix/vik/oe-and-progress Calen Pennington 2013-04-01 08:31:58 -07:00
• dc17e93339 per Victor, one shouldn't change the default parameter to a function, since that change is global to the entire lifetime. Chris Dodge 2013-04-01 11:31:25 -04:00
• b76adb4b06 Updated tests to address on-going randomization bug. Capa problem state was not being copied to module state during module initialization. This meant that when check_problem was called the first time, the seed would be re-generated and saved. Will Daly 2013-04-01 11:22:42 -04:00
• ef267d9b89 list xml_attributes (new field since xblock integration) as system metadata which should not be edited in Studio Chris Dodge 2013-04-01 11:11:30 -04:00
• f6b6f16ba5 Update the comments explaining test execution Jay Zoldak 2013-04-01 10:58:00 -04:00
• 1679f1e31d Enable executing the lms jasmine tests as part of the build Jay Zoldak 2013-04-01 10:52:11 -04:00
• 9c2dbb91b4 studio - resolving a bug where JQUI sets the z-index of our datepickers to 1, which is less than our dynamic tooltips, causing visual display/access issues. Brian Talbot 2013-04-01 10:34:31 -04:00
• 9c4a88b570 Merge pull request #1743 from MITx/fix/will/bug_288 Victor Shnayder 2013-04-01 07:22:20 -07:00
• fd0dc92cba Merge pull request #1772 from MITx/fix/brian/subhist-order David Ormsbee 2013-04-01 06:38:47 -07:00
• 4322b83894 Added additional comments Will Daly 2013-04-01 09:02:04 -04:00
• f90e29ce96 Fixed a test error that occurred because the problem was not set to done before resetting it. To avoid to small chance that we'll get the same seed when we reset, try to get a new seed multiple times. Will Daly 2013-04-01 08:55:06 -04:00
• cac7f8a289 allow student state of module other than problem to be reset by instructor this makes it possible to reset open ended response problems ichuang 2013-03-31 16:44:43 +00:00
• 15d1bc372d clean up xqueue callback url generation; allow override from settings ichuang 2013-03-31 19:28:09 +00:00
• 1969a6633e if user course creation is disabled & if staff email given, add link to request course creation by email ichuang 2013-03-31 16:04:03 +00:00
• a0fab132a1 sort course index in studio my courses page ichuang 2013-03-31 15:50:00 +00:00
• de5fa56b19 add dump of description of grading configuration to instructor dashboard ichuang 2013-03-31 13:18:54 +00:00
• febcb51133 make psychometrics curve fitting more robust ichuang 2013-03-31 12:52:29 +00:00
• 26f14aaf6d fix psychoanalyze (compatibility with new xblock) ichuang 2013-03-31 12:21:22 +00:00
• f1cc6e8597 fix psychoanalyze - make compatible with xblock ichuang 2013-03-30 02:01:32 +00:00
• 14899b9066 fix lms migration to be compatible with xblock ichuang 2013-03-30 03:40:40 +00:00
• b3f00a6725 add default message to conditional ichuang 2013-03-31 12:22:00 +00:00
• 24e64e3946 Merge pull request #1773 from MITx/hotfix/dave/mult_choice_display David Ormsbee 2013-03-30 08:55:45 -07:00
• dfd3a699b9 Accept either a list of possible values, or a string as a value for comparison of correctness in multiple choice. David Ormsbee 2013-03-30 11:09:44 -04:00
• 23d96b2533 change submission history to be ordered by id Brian Wilson 2013-03-29 21:16:20 -04:00
• 29efa84205 Enable dev env support for sass source maps Carlos Andrés Rocha 2013-03-29 18:34:02 -04:00
• 1c47573bd7 Merge pull request #1669 from MITx/fix/vik/add-oe-tab chrisndodge 2013-03-29 13:55:58 -07:00
• 02f97858f6 move the provisioning seeding from LMS into Common. Add provisioning seeding calling from create new course view. Chris Dodge 2013-03-29 16:32:53 -04:00
• 033f5ce73c Make process to add open ended tab to studio reversible Vik Paruchuri 2013-03-29 15:53:28 -04:00
• c655c814e8 Merge pull request #1721 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint Don Mitchell 2013-03-29 12:38:42 -07:00
• 80f57db7c3 Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf Don Mitchell 2013-03-29 12:35:41 -07:00
• 599ca4d429 oops. I'm not programming in C# any longer Chris Dodge 2013-03-29 15:31:37 -04:00
• 60e295895e remove unused parameter Chris Dodge 2013-03-29 15:26:21 -04:00
• 29731ec40b management command to remove excess input_state entries Brian Wilson 2013-03-29 15:20:34 -04:00
• 6b1e1b1425 Merge pull request #1769 from MITx/fix/ned/cleanup-wacky-code brianhw 2013-03-29 12:10:23 -07:00
• 0cfcd183b2 No need to wrap comments that tightly. Ned Batchelder 2013-03-29 15:05:22 -04:00
• e8f8e9e197 Enough is enough. Ned Batchelder 2013-03-29 14:49:24 -04:00
• 3ce01882bb add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict metadata on sequentials Chris Dodge 2013-03-29 13:59:59 -04:00
• b8e6c94dd6 Add in a comment Vik Paruchuri 2013-03-29 13:57:16 -04:00
• a5b1428bba Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests Jay Zoldak 2013-03-29 10:53:10 -07:00
• 5aa357938d Minor fixes for things that broke in the merge Vik Paruchuri 2013-03-29 13:48:20 -04:00
• 65c2fd5f0c Fix some post-merge errors Vik Paruchuri 2013-03-29 13:22:13 -04:00
• d044d5c48d a few more pep8 fixes Jay Zoldak 2013-03-29 13:15:33 -04:00
• 20bbf75fba Merge remote-tracking branch 'origin/master' into fix/vik/add-oe-tab Vik Paruchuri 2013-03-29 13:10:47 -04:00
• f6e9b2edd7 Merge pull request #1767 from MITx/hotfix/diana/input-state-fix David Ormsbee 2013-03-29 09:29:09 -07:00
• 17adc986bd Remove the default and prevent input_state from keeping around unnecessary data. Diana Huang 2013-03-29 12:16:27 -04:00
• 50fd7ee7a4 fix test Brian Wilson 2013-03-29 12:01:10 -04:00
• 4f9d18df8c Wrote unit tests to verify bug fix in https://github.com/MITx/mitx/pull/1764 Will Daly 2013-03-29 11:59:08 -04:00
• d5376e71ff Add in a test for the weight field Vik Paruchuri 2013-03-29 11:46:44 -04:00
• 5391cefddc Add in tests to see if max score properly exposed and calculated in combinedopenended Vik Paruchuri 2013-03-29 11:17:35 -04:00
• 34899c20ba Merge pull request #1764 from MITx/hotfix/diana/random_check_bug David Ormsbee 2013-03-29 08:10:49 -07:00
• b63aae221e small pep8 pylint and superclass fixes Jay Zoldak 2013-03-29 10:41:27 -04:00
• f85e18ed3b studio - resolving local merge Brian Talbot 2013-03-29 10:20:08 -04:00
• f90dd49556 Fixed bug in parsing of urandom struct so that seed is set to an integer (and correctly saved) instead of a tuple. Will Daly 2013-03-29 10:18:11 -04:00
• 53620d7879 Merge remote-tracking branch 'origin/master' into fix/vik/oe-and-progress Vik Paruchuri 2013-03-29 10:16:00 -04:00
• bbb53a17f8 add some depth optimziations for edit subsection and unit pages as well Chris Dodge 2013-03-29 09:58:03 -04:00
• 5534d8bdce fix mega merge conflicts Kevin Chugh 2013-03-29 07:33:52 -04:00
• 39d666cd13 modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections Brian Wilson 2013-03-29 01:27:36 -04:00
• 5bf839c9a9 Guard against trying to load a template when checking pages. Will Daly 2013-03-28 16:55:20 -04:00
• d92533bb51 Test case now drops the mongo collection Will Daly 2013-03-28 16:41:55 -04:00
• 86bc70c3c2 Reverted cms changes back Will Daly 2013-03-28 15:00:19 -04:00
• ee5076bda9 fix incorrect comment Chris Dodge 2013-03-28 14:48:12 -04:00
• cdc353b61c add back dropped import Chris Dodge 2013-03-28 14:07:13 -04:00
• 8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements Chris Dodge 2013-03-28 13:27:29 -04:00
• 252f9364a6 Merge pull request #1761 from MITx/content/rocha/utaustinx-courses Ned Batchelder 2013-03-28 10:26:02 -07:00
• a15baa97c5 Add UTAustinX landing page Carlos Andrés Rocha 2013-03-28 12:57:47 -04:00
• 4050da6b4c Enable meta-universities (organizations that contain other) Carlos Andrés Rocha 2013-03-28 12:57:17 -04:00
• c55d54b071 also, we don't support metadata on chapters Chris Dodge 2013-03-28 13:03:34 -04:00
• f652fb5f73 Pylint and pep8 fixes Will Daly 2013-03-28 12:51:09 -04:00
• 2cd8f448f7 studio - resolving merge with tender widget branch Brian Talbot 2013-03-28 12:48:42 -04:00
• bc248a1d4a studio - tender widget: revised styling with spam protection back in place Brian Talbot 2013-03-28 12:47:08 -04:00
• 653369e3cf resolving local stash merge Brian Talbot 2013-03-28 12:37:58 -04:00
• 6f8c9b4a9f Optimized ModuleStoreTestCase to reload templates only once over all test runs. Will Daly 2013-03-28 12:31:46 -04:00
• 1c2a8a97cd remove unnecessary debug log message Chris Dodge 2013-03-28 11:38:22 -04:00
• 197f52539f add some unit tests Chris Dodge 2013-03-28 11:37:53 -04:00
• b2bda10435 Merge branch 'master' into bug/christina/studio cahrens 2013-03-28 11:17:47 -04:00