Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 725e9a2a7b Add facility for fixed number of problem attempts Sarina Canelake 2012-08-16 14:27:28 -04:00
• 147bd5eb3d add initial docs on xml format and policy files Victor Shnayder 2012-08-16 14:04:41 -04:00
• 56fc4e2fe8 Merge pull request #433 from MITx/feature/kfiedler/courseware-style Calen Pennington 2012-08-16 10:52:27 -07:00
• 4e9e65e0e1 Merge pull request #432 from MITx/feature/cale/fix-tests Calen Pennington 2012-08-16 10:52:12 -07:00
• c2ee844704 Made video go to the center of the screen in full screen Kyle Fiedler 2012-08-16 13:47:15 -04:00
• 4798a46948 Add docstring for load_function Calen Pennington 2012-08-16 13:08:10 -04:00
• 9411bdaaa2 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-16 13:02:00 -04:00
• 034bd7308e The django/mako template loader now caches mako templates by loading them from file. Bridger Maxwell 2012-08-16 13:01:04 -04:00
• 3b36fbf914 Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore Calen Pennington 2012-08-16 12:49:42 -04:00
• 9118e585cc Merge pull request #426 from MITx/feature/halogenandtoast/multiple_textbooks Calen Pennington 2012-08-16 09:47:53 -07:00
• 73623ed92b Merge pull request #431 from MITx/feature/kfiedler/askbot Calen Pennington 2012-08-16 09:10:02 -07:00
• ae3cb4ec7b Nest textbooks under data Matthew Mongeau 2012-08-16 12:06:37 -04:00
• 24ed4a4dae MAnage images Kyle Fiedler 2012-08-16 12:06:20 -04:00
• 6bca6cdc28 Merge pull request #430 from MITx/feature/ichuang/fix-modulestore-etree-parser Calen Pennington 2012-08-16 09:06:14 -07:00
• 919b3e2137 Merge pull request #429 from MITx/feature/victor/strip-metadata Calen Pennington 2012-08-16 08:52:23 -07:00
• 4ff80287f7 Remove TextbookDescriptor from setup. Matthew Mongeau 2012-08-16 11:52:10 -04:00
• 7553dac2f3 etree parser needs to be set on each call in modulestore load_course ichuang 2012-08-16 11:50:04 -04:00
• 945632362b Get rid of TextbookModule and TextbookDescriptor. Matthew Mongeau 2012-08-16 11:49:03 -04:00
• 61478f4ba0 fix string format bug Victor Shnayder 2012-08-16 11:46:56 -04:00
• c02313a099 hackish cleanup script Victor Shnayder 2012-08-16 11:43:40 -04:00
• 00d9ecd600 New policy organization: Victor Shnayder 2012-08-16 11:41:19 -04:00
• 691744e359 Use .display_name instead of metadata['display_name'] Victor Shnayder 2012-08-16 11:37:54 -04:00
• 5e2f676153 backcompat warnings Victor Shnayder 2012-08-16 11:36:05 -04:00
• 053d52e893 Merge pull request #420 from MITx/feature/kfiedler/courseware-style Calen Pennington 2012-08-16 08:33:29 -07:00
• 7f72004b50 Fix conflicts Kyle Fiedler 2012-08-15 15:53:37 -04:00
• ad7061e41f Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav Kyle Fiedler 2012-08-15 15:44:19 -04:00
• 4653eebdc3 Merge pull request #428 from MITx/kimth/xqueue_callback_blocking Calen Pennington 2012-08-16 08:31:22 -07:00
• 909a368f4a Merge branch 'master' into kimth/xqueue_callback_blocking kimth 2012-08-16 11:27:56 -04:00
• 1bb8d9366d Xqueue URL is https not http kimth 2012-08-16 11:27:29 -04:00
• a3b144045c Merge pull request #427 from MITx/feature/bridger/new_wiki Calen Pennington 2012-08-16 08:01:39 -07:00
• c4b362ca71 Removed old path include for django-wiki. Bridger Maxwell 2012-08-16 10:56:33 -04:00
• 337f109af7 Moved django-wiki submodule to be a pip install from git. Bridger Maxwell 2012-08-16 10:52:15 -04:00
• 3efea9cbb0 Merge pull request #425 from MITx/feature/bridger/new_wiki Calen Pennington 2012-08-16 07:31:56 -07:00
• 4a7b163ce3 Keep textbooks out of displayable items. Matthew Mongeau 2012-08-15 11:37:44 -04:00
• 34010a38a8 Fix textbook module. Matthew Mongeau 2012-08-15 11:35:39 -04:00
• ae09598d9a Display textbooks in course navigation, handle in urls and views. Matthew Mongeau 2012-08-12 20:10:34 -04:00
• 884f33c932 Merge pull request #423 from MITx/feature/ichuang/fix-capa-answers-static-urls Calen Pennington 2012-08-16 07:15:14 -07:00
• e60f2e3d3d Merge pull request #422 from MITx/kimth/sjsu Calen Pennington 2012-08-16 07:14:28 -07:00
• 1a8e5485eb Merge pull request #416 from MITx/feature/kfiedler/askbot thomasxiii 2012-08-16 07:02:39 -07:00
• da9a4710ce Merge branch 'master' into kimth/xqueue_callback_blocking kimth 2012-08-16 09:38:25 -04:00
• 326a0f61c1 Updated django-wiki submodule. Bridger Maxwell 2012-08-15 23:43:05 -04:00
• d064d29cd8 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Bridger Maxwell 2012-08-15 23:01:27 -04:00
• 8fb83ee33c Added django-wiki as a submodule. Bridger Maxwell 2012-08-15 22:55:26 -04:00
• 033211a5d1 doc update - LMS migrate reload ichuang 2012-08-15 22:03:00 -04:00
• f39e589625 do replace_urls within capa_module get_answer (eg for img in <solution>s) ichuang 2012-08-15 21:57:33 -04:00
• 2b29c95266 Added template for inline preview. Bridger Maxwell 2012-08-15 21:47:26 -04:00
• 262a49a6da Permissions on root article no longer allow students to edit it. Bridger Maxwell 2012-08-15 21:47:08 -04:00
• f717b0421f fix bug in backcompat section replacement Victor Shnayder 2012-08-15 21:39:10 -04:00
• 449da71cd9 fixed vote permission Rocky Duan 2012-08-15 18:04:56 -07:00
• 48e9dc8031 Added bootstrap-modal for the wiki preview modals. Bridger Maxwell 2012-08-15 20:07:05 -04:00
• a163b486ac Fixed up course_nav to swizzle url reversing too. Bridger Maxwell 2012-08-15 19:34:42 -04:00
• e76be095e9 Middleware for changing redirects to stay in course wiki. Bridger Maxwell 2012-08-15 18:54:22 -04:00
• 0d28d286e2 Added creation of Site() object on wiki load. Bridger Maxwell 2012-08-15 18:54:01 -04:00
• 051afcca6a Merge branch 'ccp0101/performance' of github.com:dementrock/mitx Rocky Duan 2012-08-15 15:47:25 -07:00
• 1a92cc5c3f callback for models Rocky Duan 2012-08-15 15:46:58 -07:00
• d56ac9a71b added comment Mike Chen 2012-08-15 17:22:09 -04:00
• 158e978a7e added naive caching. not sure how to expire. Mike Chen 2012-08-15 17:15:08 -04:00
• 3519ea6b2f Don't display 'None points' on problem rendering kimth 2012-08-15 17:14:27 -04:00
• 2454c06b08 Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance Mike Chen 2012-08-15 16:14:17 -04:00
• ce29b5aec2 Special case handling of course url_names in policy.json Victor Shnayder 2012-08-15 16:06:42 -04:00
• 13c2bb588e added styles for main article, sidebar and breadcrumb Tom Giannattasio 2012-08-15 15:59:46 -04:00
• be1b063805 Merge pull request #417 from MITx/kimth/sjsu Calen Pennington 2012-08-15 12:56:28 -07:00
• 72c3ad2acc updated doc Rocky Duan 2012-08-15 12:50:30 -07:00
• 58932bb2f7 Drop import of re kimth 2012-08-15 15:23:14 -04:00
• 3c1e67e339 Merge master kimth 2012-08-15 15:19:08 -04:00
• 13b9e58f8f Merge pull request #419 from MITx/feature/url_based_course_lists Calen Pennington 2012-08-15 12:07:02 -07:00
• 213e3cdc7c Merge pull request #418 from MITx/feature/victor/strip-metadata Calen Pennington 2012-08-15 12:01:58 -07:00
• 02d970c31e Map '/course/' urls to the course's root in the multicourse hierarchy kimth 2012-08-15 14:45:12 -04:00
• 1c2b6e8088 Remove stuff that I should have deleted during the rebase David Ormsbee 2012-08-15 14:39:56 -04:00
• f7f6164351 slight styling adjustment Rocky Duan 2012-08-15 11:36:14 -07:00
• a4d67bab33 Add support metadata in policy.json Victor Shnayder 2012-08-15 14:36:06 -04:00
• f535f44e62 Fix typo that caused two classes to not get loaded David Ormsbee 2012-08-15 14:32:36 -04:00
• f5251249a6 updated documentation Rocky Duan 2012-08-15 11:32:05 -07:00
• f1f80cb1f4 Drop HttpResponseRedirect import kimth 2012-08-15 14:26:41 -04:00
• 7335c1529e show all content in a course in the forum view Rocky Duan 2012-08-15 11:21:31 -07:00
• 0b4b8ecfdc courseware.get_module passes down course_id triplet (org, course, run) kimth 2012-08-15 14:20:35 -04:00
• e524f3bf6c Point at the new urls for the sandbox queue server LB Calen Pennington 2012-08-15 14:12:32 -04:00
• 573c58d02b Fix broken docstring Calen Pennington 2012-08-15 13:59:25 -04:00
• 6d7225bebb Added some final touches to askbot Kyle Fiedler 2012-08-15 13:50:37 -04:00
• ff1f090737 Added more fixes for askbot also fixed some of the extra padding Kyle Fiedler 2012-08-15 12:48:14 -04:00
• 0804ff7a75 Added styles for single question and profile view Kyle Fiedler 2012-08-14 15:33:55 -04:00
• bbe9432508 Lots of askbot fixes Kyle Fiedler 2012-08-14 13:58:18 -04:00
• 8daea9c465 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Tom Giannattasio 2012-08-15 13:11:00 -04:00
• abf26dced9 started styles Tom Giannattasio 2012-08-15 13:10:47 -04:00
• 4463542159 Merge pull request #415 from MITx/feature/victor/start-dates Calen Pennington 2012-08-15 10:00:58 -07:00
• 099f499efa Fixed access methods for wiki nav. Added tests. Bridger Maxwell 2012-08-15 13:00:17 -04:00
• c4afddfd38 Fix staff access check in simplewiki Victor Shnayder 2012-08-15 12:56:01 -04:00
• 7c6b9eba1c Note that 'load' access does not check for enrollment Victor Shnayder 2012-08-15 12:55:13 -04:00
• 7d90617c5e Merge with master David Ormsbee 2012-08-15 12:21:59 -04:00
• 7f8f702971 Fix silly error that was pulling the wrong info from COURSE_LISTINGS David Ormsbee 2012-08-15 11:21:15 -04:00
• d0f2641890 Account for the fact that sometimes we don't get HTTP_HOST (like for tests) David Ormsbee 2012-08-15 11:12:44 -04:00
• 7386d66c0f Add dev_int.py config for testing course listings by subdomain David Ormsbee 2012-08-15 11:11:54 -04:00
• 346d5b91a1 implement subdomain-based course displays David Ormsbee 2012-08-15 10:58:20 -04:00
• a2057f9ea4 fix docstring Victor Shnayder 2012-08-15 11:47:01 -04:00
• b4621d0562 added QueryCountDebugMiddleware Mike Chen 2012-08-15 11:21:11 -04:00
• 4bc4e87a4e Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-15 11:15:21 -04:00
• 102dcc08e0 Added a test for the wiki course redirection. Bridger Maxwell 2012-08-15 11:14:57 -04:00
• 7c22a39aca Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance Mike Chen 2012-08-15 11:05:20 -04:00
• 9805b41655 row --> rows kimth 2012-08-15 10:46:33 -04:00
• 4b2c4e71d2 Merge pull request #414 from MITx/kimth/xqueue_callback_blocking Calen Pennington 2012-08-15 07:44:50 -07:00