Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 091ca9c3f0 Add a private-requirements.txt for personal changes to how things are installed. Good for installing libs as working dirs. Ned Batchelder 2013-04-30 15:55:30 -04:00
• 3e314a2c9e Merge pull request #1915 from MITx/feature/christina/xblock-version Christina Roberts 2013-04-30 13:03:15 -07:00
• aa4e29d2f1 Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs Jay Zoldak 2013-04-30 15:21:23 -04:00
• 6a1a907339 Fix pep8 violations. dcadams 2013-04-30 11:48:23 -07:00
• 7c7471d31c Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement dcadams 2013-04-30 11:40:09 -07:00
• 76599863e6 Compile all coffee and sass before running jasmine tests Calen Pennington 2013-04-30 14:09:58 -04:00
• 771937b3da Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor) Calen Pennington 2013-04-30 14:09:42 -04:00
• dfd369b9e9 Make ordering of js bundles during jasmine tests consistant Calen Pennington 2013-04-30 14:09:17 -04:00
• aa895cbc6b Adding mktg_iframe.html John Jarvis 2013-04-30 13:13:31 -04:00
• 4c97f92245 Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images Christina Roberts 2013-04-30 09:50:41 -07:00
• c5d520574d also move the MIT dome image in Latex to be in our source pack Chris Dodge 2013-04-30 12:02:58 -04:00
• 1f1a6e3ec5 add more images to support templates Chris Dodge 2013-04-30 11:46:49 -04:00
• 63371135e5 Change xblock version. cahrens 2013-04-30 11:24:45 -04:00
• 95a224fcea Fix pep8 violations Sarina Canelake 2013-04-30 11:21:20 -04:00
• a9a234f018 Change xblock version. cahrens 2013-04-30 11:19:20 -04:00
• 573116073e Add error message when factorial given non-integral value Sarina Canelake 2013-04-30 11:16:14 -04:00
• 1e8619288a Merge pull request #1912 from MITx/fix/cdodge/broken-template-image Christina Roberts 2013-04-30 08:11:11 -07:00
• 02ed9f26c4 add dependent image for the image response template Chris Dodge 2013-04-30 10:07:42 -04:00
• 01f8c4c816 Adding iframe view John Jarvis 2013-04-30 09:44:21 -04:00
• 30240ff01a non revision marco 2013-04-29 19:53:16 -04:00
• 44bdea0044 Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement dcadams 2013-04-29 14:35:45 -07:00
• 886205dec3 revised placeholder course overview HTML value Brian Talbot 2013-04-29 17:23:14 -04:00
• d4ec592a58 Merge pull request #1910 from MITx/bug/straz/i18n Steve Strassmann 2013-04-29 14:19:08 -07:00
• cdfd7c807f fix bad url for jsi18n Steve Strassmann 2013-04-29 17:13:24 -04:00
• 32b30cef92 Merge pull request #1909 from MITx/diana/accessibility-update Diana Huang 2013-04-29 13:58:43 -07:00
• 85ebdff7c2 Merge pull request #1905 from MITx/fix/sarina/new_formularesponse_defaults Diana Huang 2013-04-29 13:56:43 -07:00
• befe7beccb Add accessibility text to the Contact page. Diana Huang 2013-04-29 16:55:29 -04:00
• 33aada6d22 fix broken test. Since we're pre-populating the course overview when creating a course, the clone_course fails because it asserts that the destination course that it clones into is empty. Need to check that the course is basically empty (e.g. a course module and a overview module) Chris Dodge 2013-04-29 16:43:32 -04:00
• 8705ff8805 Remove system_metadata_fields. cahrens 2013-04-29 16:41:07 -04:00
• cbf9acfefb Merge pull request #1896 from MITx/feature/straz/i18n Don Mitchell 2013-04-29 13:32:44 -07:00
• a861c8b310 revised placeholder course and faculty images - more opacity to reinforce placeholderness Brian Talbot 2013-04-29 16:03:00 -04:00
• 680e932b8b use default staff images that is in /common/static/... Chris Dodge 2013-04-29 15:42:58 -04:00
• 4e251a3b19 adding in placeholder images for a course and its faculty Brian Talbot 2013-04-29 15:38:55 -04:00
• 39dd251b02 add "rake test_i18n" to rakefile; tests pass Steve Strassmann 2013-04-29 15:30:18 -04:00
• f95331dcc1 fix more pep8 violations Sarina Canelake 2013-04-29 14:22:10 -04:00
• 6993daf116 Fix pep8 violations Sarina Canelake 2013-04-29 10:48:25 -04:00
• 46792c82de Remove debugging print statements Sarina Canelake 2013-04-29 00:56:07 -04:00
• ed43afb08f Add additional unit test comment Sarina Canelake 2013-04-29 00:44:04 -04:00
• 696879bd26 Add unit tests for formularesponse type Sarina Canelake 2013-04-29 00:40:23 -04:00
• c79843c541 Add factorial as a default function for formula response Sarina Canelake 2013-04-26 15:24:04 -04:00
• 72dfd4995e Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete Christina Roberts 2013-04-29 11:58:22 -07:00
• c28647be2d lms - cleared document flow for .teacher elements within a course's about view to coincide with Studio's default HTML for the course overview settings field Brian Talbot 2013-04-29 14:47:57 -04:00
• 94390e4314 aria tabs v1 marco 2013-04-29 14:20:37 -04:00
• aa4b61180c Some cleanup. dcadams 2013-04-29 10:03:11 -07:00
• 8358e866cf more robust cleanup of default po files Steve Strassmann 2013-04-29 12:45:07 -04:00
• b62b4ac267 Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement dcadams 2013-04-29 09:38:32 -07:00
• c64f0b1a18 Modifications to instructor dashboard - enrollment tab: dcadams 2013-04-29 09:38:10 -07:00
• e287244151 rm test dir (replaced by tests dir) Steve Strassmann 2013-04-29 11:49:51 -04:00
• cd53dd222b Merge branch 'master' into feature/christina/fields cahrens 2013-04-29 11:48:41 -04:00
• d63a37c252 rename test dir to tests; add SkipTest for test_extract.py Steve Strassmann 2013-04-29 11:47:56 -04:00
• 393e6ffc23 added test cases for converter and dummy Steve Strassmann 2013-04-29 11:35:01 -04:00
• c00d71d422 integrate dummy string tools; added rake tasks and unit tests Steve Strassmann 2013-04-29 11:32:22 -04:00
• 80d46401bf Merge branch 'master' into ux/marco/studio-componentsettings marco 2013-04-29 10:19:22 -04:00
• 45a665c7c7 added mode bar up top marco 2013-04-29 10:18:56 -04:00
• 2e81fc5152 sync with master Steve Strassmann 2013-04-29 09:55:12 -04:00
• d55d5c9351 addressed Don\'s comments on pull request Steve Strassmann 2013-04-29 09:54:32 -04:00
• 143ad0ca4b Merge pull request #1893 from MITx/fix/cale/assets-order Christina Roberts 2013-04-29 06:46:45 -07:00
• d7693d96b7 unit test should just use direct store. Also remove unused import and logging. Chris Dodge 2013-04-29 09:18:49 -04:00
• 8c4526ed07 Fix coffeescript error in video spec file Calen Pennington 2013-04-26 16:52:39 -04:00
• 436d95bfab Make tests install coffee locally Calen Pennington 2013-04-26 15:25:13 -04:00
• b4e9de67e0 Add docs to the prereqs rake commands Calen Pennington 2013-04-26 15:24:46 -04:00
• a2aacce244 Fail hard if one of the asset compilation steps fails Calen Pennington 2013-04-26 15:24:33 -04:00
• 8dc0df3e6b Don't ignore the old directories for xmodule sass and coffeescript Calen Pennington 2013-04-26 15:24:16 -04:00
• 7e07b951b0 Ignore the node_modules directory Calen Pennington 2013-04-26 13:42:41 -04:00
• fb28384de7 Use local install of coffee Calen Pennington 2013-04-26 13:17:45 -04:00
• 4a397972fa Sort the css and js assets by numerical index Calen Pennington 2013-04-26 10:33:42 -04:00
• 3fd004e2fe rake tasks Steve Strassmann 2013-04-26 16:54:23 -04:00
• 7d206e020d remove comment which is no longer valid as well as debug log messages Chris Dodge 2013-04-26 16:13:26 -04:00
• 36a2f337bf pull from master Steve Strassmann 2013-04-26 15:50:56 -04:00
• fdaa708f80 Merge pull request #1895 from MITx/bug/straz/gitignore Steve Strassmann 2013-04-26 12:48:18 -07:00
• 38e232f56f Merge branch 'master' into feature/christina/fields cahrens 2013-04-26 15:42:05 -04:00
• 30b7f0ab09 undo adding .gitignore to itself Steve Strassmann 2013-04-26 15:40:53 -04:00
• bbea8eb9f3 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-verticals-on-delete Chris Dodge 2013-04-26 15:25:47 -04:00
• 1ca763844b testing Steve Strassmann 2013-04-26 15:25:00 -04:00
• d9381eccf2 test_generate and test_extract Steve Strassmann 2013-04-26 15:01:59 -04:00
• 55266f6e96 add a overview.yaml template and also clone that template into a newly created course Chris Dodge 2013-04-26 13:39:22 -04:00
• 87205e23da git pull master Steve Strassmann 2013-04-26 13:29:14 -04:00
• 87e0b85363 implement extract and generate Steve Strassmann 2013-04-26 13:20:29 -04:00
• 2df3fe9344 Revert "fix merge conflict" Diana Huang 2013-04-26 12:40:35 -04:00
• 5560a4add4 Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs" Diana Huang 2013-04-26 12:40:02 -04:00
• 2e64bc33ff make sure delete_item always uses the draft store Chris Dodge 2013-04-26 12:37:37 -04:00
• 8c54d5d610 Fix accidental force push that reset master Calen Pennington 2013-04-26 10:50:53 -04:00
• ead18f9fbb undo the unit test, as per Jeh, the tests really aren't supposed to run the CMS with 'draft awareness' Chris Dodge 2013-04-26 10:30:39 -04:00
• 1b344ff06e Merge pull request #1889 from MITx/diana/clean-login-methods Diana Huang 2013-04-25 12:51:21 -07:00
• f6417b4f71 add a delete-all-versions flag to the delete_item method in the modulestores. Extend tests to verify. Still wip Chris Dodge 2013-04-25 15:24:31 -04:00
• 05c5a9401a changed class to course Mark L. Chang 2013-04-25 13:44:14 -04:00
• 4d2ebdce8f Upgrade version of xblocks to get Field display_name property. cahrens 2013-04-25 11:44:52 -04:00
• 886e74342d Move the testcenter login to external_auth Diana Huang 2013-04-25 10:39:20 -04:00
• a7ccbb174b merge cahrens 2013-04-24 17:05:08 -04:00
• c7962cf07b Don't explicitly declare display_name. cahrens 2013-04-24 16:41:58 -04:00
• e43c2bd410 Merge pull request #1886 from MITx/fix/cale/pre-test-tasks Calen Pennington 2013-04-24 13:13:51 -07:00
• 1371fe0308 Make sure to run :predjango before gather_assets so that the xmodule_assets command is set up Calen Pennington 2013-04-24 15:30:16 -04:00
• 9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server Calen Pennington 2013-04-24 12:12:05 -07:00
• 45f86b662a Delete unused file. cahrens 2013-04-24 14:46:35 -04:00
• cc2d06975e Remove duplicated StringyX definitions. cahrens 2013-04-24 14:40:55 -04:00
• 9e9886339a Refer to inherited field. cahrens 2013-04-24 11:04:45 -04:00
• e874de1249 Some cleanup TODOs. cahrens 2013-04-18 17:08:58 -04:00
• 5681f94a96 studio - commented in the static HTML boilerplate for the course overview field - needs wiring to CodeMirror with a setVal() method Brian Talbot 2013-04-24 14:55:04 -04:00
• 378b2ba7f7 Delete unused file. cahrens 2013-04-24 14:46:35 -04:00
• 9d04908ad1 Remove duplicated StringyX definitions. cahrens 2013-04-24 14:40:55 -04:00