Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• eb62b80fca Updated django-wiki with another deletion bug fix. Bridger Maxwell 2012-08-21 23:46:26 -04:00
• 9162bdb1b9 Changed wiki setting so article owners can't change permissions. Bridger Maxwell 2012-08-21 23:06:45 -04:00
• c77d718703 Updated django-wiki with delete article bug. Bridger Maxwell 2012-08-21 22:58:07 -04:00
• 9e81ea3981 Added instructor tabs to wiki course nav. Bridger Maxwell 2012-08-21 22:31:13 -04:00
• e655b4a3b3 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-21 22:25:21 -04:00
• 82d414690b Updated to latest version of django-wiki with lots of deletion fixes. Removed child article list until it can be styled. Bridger Maxwell 2012-08-21 22:23:40 -04:00
• 11e3276e80 update comment count based on operations Rocky Duan 2012-08-21 17:43:20 -07:00
• 273af4a5ba make delete work Rocky Duan 2012-08-21 17:15:52 -07:00
• fd0eff46e7 Merge branch 'feature/rocky/discussion_api_key' into refactor Rocky Duan 2012-08-21 17:14:25 -07:00
• 4b97e70a4c fixed bug when no data is transmitted otherwise Rocky Duan 2012-08-21 17:10:29 -07:00
• 9bcd3cd495 Merge pull request #490 from MITx/feature/rocky/discussion_api_key David Ormsbee 2012-08-21 17:09:26 -07:00
• de4b477649 make edit working Rocky Duan 2012-08-21 17:02:17 -07:00
• 202eb7b1e9 Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-21 19:26:10 -04:00
• bbc95cb589 fixed accordion nav glitch Tom Giannattasio 2012-08-21 19:25:32 -04:00
• f7539e8bce Merge pull request #488 from MITx/kimth/fix-choiceresponse David Ormsbee 2012-08-21 15:46:32 -07:00
• e3a3f7094a added shared key authentication Rocky Duan 2012-08-21 15:45:41 -07:00
• fe091b7bc1 Merge branch 'master' of github.com:MITx/mitx into feature/rocky/discussion_api_key Rocky Duan 2012-08-21 15:45:24 -07:00
• 214fb9185d Disabling anonymous wiki access until styling supports it. Bridger Maxwell 2012-08-21 18:42:20 -04:00
• 88505b3948 fixed discussion sidebar Tom Giannattasio 2012-08-21 18:41:06 -04:00
• 47b4f2c45a Merge branch 'master' of github.com:MITx/mitx Rocky Duan 2012-08-21 15:39:56 -07:00
• fdf92d68f6 more refactoring; enabled partial re-rendering for votes, endorse, and closed Rocky Duan 2012-08-21 15:26:50 -07:00
• bd536f8aec Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-21 18:13:40 -04:00
• f9d27fd760 Merge pull request #489 from MITx/feature/bridger/disable_wiki_attachments David Ormsbee 2012-08-21 15:13:29 -07:00
• e762844c35 new sequence nav functionality - accommodates an infinite number of items Tom Giannattasio 2012-08-21 18:12:59 -04:00
• 1e068b6a4a Disabled wiki attachments. Bridger Maxwell 2012-08-21 18:01:51 -04:00
• f83169f12d Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x kimth 2012-08-21 17:54:21 -04:00
• 41831654ee Added link to see wiki attachment history. Bridger Maxwell 2012-08-21 17:44:38 -04:00
• 2c19d01441 Merge pull request #479 from MITx/feature/arjun/syllabus Victor Shnayder 2012-08-21 14:33:07 -07:00
• cfa2ba95bc Merge pull request #485 from MITx/feature/kfiedler/courseware-style kimth 2012-08-21 14:17:20 -07:00
• 954ee6ab1f Added link to list children of an article. Upgraded django-wiki version. Bridger Maxwell 2012-08-21 17:09:24 -04:00
• 8be7d90c85 Address comments on #484. Victor Shnayder 2012-08-21 17:00:26 -04:00
• 72e6588be4 Merge branch 'master' into refactor Rocky Duan 2012-08-21 13:34:20 -07:00
• be94e176ff Add pytz to requirements Calen Pennington 2012-08-21 16:29:47 -04:00
• 02ecfb4730 Adding comments about removing the syllabus tab ASAP. Arjun Singh 2012-08-21 13:25:29 -07:00
• b86fbdbd10 Adding comments about removing the syllabus tab ASAP. Arjun Singh 2012-08-21 13:23:00 -07:00
• 2265713028 added shared key authentication Rocky Duan 2012-08-21 13:22:48 -07:00
• 38d713cb07 Merge pull request #487 from MITx/feature/cale/sjsu-subdomain David Ormsbee 2012-08-21 13:22:28 -07:00
• 188584c77d Allow puppet to set COURSE_LISTINGS Calen Pennington 2012-08-21 16:21:43 -04:00
• 2a8f5a475c Merge pull request #486 from MITx/feature/victor/create-test-courses Calen Pennington 2012-08-21 13:21:05 -07:00
• a7a9abab44 add a course to test start dates Victor Shnayder 2012-08-21 16:21:01 -04:00
• d3f1f0f8b6 comment out debug messages Victor Shnayder 2012-08-21 16:09:48 -04:00
• 1dc31ceb8b fix toylab html Victor Shnayder 2012-08-21 16:09:35 -04:00
• 3273de93fe make tutorial headers normal size Kyle Fiedler 2012-08-21 15:29:53 -04:00
• 8a112b0cca Added fix for cms sass Kyle Fiedler 2012-08-21 14:04:50 -04:00
• 6ce69e28ae Moved the wiki 404 page into the django-wiki project. Bridger Maxwell 2012-08-21 15:58:35 -04:00
• cf28dbea60 Merge branch 'feature/bk_forum_int' Rocky Duan 2012-08-21 12:56:56 -07:00
• dca434ad34 Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate Calen Pennington 2012-08-21 12:52:52 -07:00
• 61192e5280 Merge pull request #484 from MITx/feature/victor/links-to-test-dirs Calen Pennington 2012-08-21 12:46:46 -07:00
• 2aa154c903 Initial pass at script to create links to test dirs. Victor Shnayder 2012-08-21 15:42:47 -04:00
• 99f94b0a6b Merge pull request #472 from MITx/feature/victor/per-course-progress Calen Pennington 2012-08-21 12:29:03 -07:00
• 2106d621c8 Merge pull request #476 from MITx/arjun/fix_choiceresponse Calen Pennington 2012-08-21 12:11:47 -07:00
• 1a8a3e7a40 Merge pull request #480 from MITx/feature/victor/policy-dirs Calen Pennington 2012-08-21 12:08:50 -07:00
• 9cc72c4965 Victor's fixes only apply to sqlite. Added a conditional and now they run on mysql. Bridger Maxwell 2012-08-21 07:59:51 -04:00
• d13998a135 add docstring comment Victor Shnayder 2012-08-20 17:55:43 -04:00
• ec90200b81 fix migration to remove out of date index Victor Shnayder 2012-08-20 17:41:10 -04:00
• d9c753e7ef add test output files to gitignore Victor Shnayder 2012-08-20 16:41:01 -04:00
• f44d794e63 Add course_id to StudentModule Victor Shnayder 2012-08-20 16:39:52 -04:00
• 2f9b2f19fc s/[]/{}/ Victor Shnayder 2012-08-21 15:01:10 -04:00
• 99703761b0 Merge master Arjun Singh 2012-08-21 12:01:09 -07:00
• ccf2cff2ba bugfix: set errored_courses in default case Victor Shnayder 2012-08-21 13:04:33 -04:00
• b97a2af2a2 Show policy, grading policy, and top-level errors Victor Shnayder 2012-08-21 11:09:58 -04:00
• f866854411 Load grading policy from policy/{url_name}/grading_policy.json Victor Shnayder 2012-08-20 20:00:32 -04:00
• eeadf0ba87 Let policies be stored in policies/{url_name}/policy.json Victor Shnayder 2012-08-20 19:28:07 -04:00
• 9f23e4378e Merge remote-tracking branch 'origin/hotfix/1.0.4' Calen Pennington 2012-08-21 14:56:35 -04:00
• 557975458c Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-21 14:50:15 -04:00
• adf2d44d05 Merge pull request #482 from MITx/feature/dave/nav_fixes Calen Pennington 2012-08-21 11:47:01 -07:00
• ad5fcbe784 new header styles Tom Giannattasio 2012-08-21 14:46:35 -04:00
• 86f20cc15d Merge pull request #478 from MITx/kimth/fix-sequence-modx Calen Pennington 2012-08-21 11:39:17 -07:00
• 3f0fba71d9 Remove non-functioning News tab. Enable Instructor tab from Discussion page David Ormsbee 2012-08-21 14:29:30 -04:00
• 8b01334a05 re-add pystache_custom requirement David Ormsbee 2012-08-21 14:09:16 -04:00
• 57586caaff Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Kyle Fiedler 2012-08-21 13:55:14 -04:00
• f68a97a63f Added changes to wiki 404 and fixed CMS Sass Kyle Fiedler 2012-08-21 13:54:58 -04:00
• 7d1fd538f2 Use data(...) rather than hidden span kimth 2012-08-21 13:36:49 -04:00
• 9b3f560c98 Fix MathJax in sequentials kimth 2012-08-21 13:32:55 -04:00
• 0475f4cc44 new sequence nav; tweaked video box Tom Giannattasio 2012-08-21 13:31:15 -04:00
• 32723cabc0 Merge pull request #458 from MITx/feature/bk_forum_int David Ormsbee 2012-08-21 10:30:03 -07:00
• f1d670f9a8 remove no-longer-need < escape. Re #466 Victor Shnayder 2012-08-21 13:29:11 -04:00
• 08e892ce9e Add command to seed forum permissions to existing users David Ormsbee 2012-08-21 13:22:32 -04:00
• 1c84f8e2dd Remove student removal (we shouldn't ever delete users) David Ormsbee 2012-08-21 13:00:06 -04:00
• 4e6d7babcc fixed wiki bugs; started sequence nav bugs Tom Giannattasio 2012-08-21 12:51:33 -04:00
• b0894c3973 Fix tests for other courses - create default discussion roles on demand if they don't exist David Ormsbee 2012-08-21 12:38:39 -04:00
• 1666858c09 Merge pull request #477 from MITx/feature/arjun/check_filesubmission_names Calen Pennington 2012-08-21 09:17:13 -07:00
• b31722bcff Merge branch 'master' into feature/bk_forum_int David Ormsbee 2012-08-21 12:05:06 -04:00
• 6d371640d4 Removed signal removal in django_comment_client test (we're no longer doing user replication) David Ormsbee 2012-08-21 12:04:24 -04:00
• cb5e277422 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Bridger Maxwell 2012-08-21 12:00:13 -04:00
• cfe553304c Removed link to wiki settings until we have a better integration with notifications. Bridger Maxwell 2012-08-21 12:00:05 -04:00
• e0173d71a7 Merge pull request #471 from MITx/feature/bridger/new_wiki Calen Pennington 2012-08-21 08:58:59 -07:00
• 63900ef425 Added new wiki 404 page Kyle Fiedler 2012-08-21 11:55:30 -04:00
• 783a3905a4 disable user replication and associated tests David Ormsbee 2012-08-21 11:39:36 -04:00
• fafb443484 fixed wiki styles Tom Giannattasio 2012-08-21 09:24:55 -04:00
• 1cfed46d06 Adding a syllabus page (accessible via course navigation) Arjun Singh 2012-08-21 05:47:26 -07:00
• 231aa4674c Sequential modx/goto_position hits correct multicourse URL kimth 2012-08-21 08:39:08 -04:00
• ed1bac7629 fixed container padding and sidebar fades Tom Giannattasio 2012-08-21 08:28:24 -04:00
• fa3734b6fc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-21 08:24:29 -04:00
• 11ffc6bb88 Allowing filesubmissions to specify which files are allowed and require that certain files are present. Arjun Singh 2012-08-21 02:40:21 -07:00
• 07f818da5a got reply working under backbone framework Rocky Duan 2012-08-21 02:12:21 -07:00
• 0874369dc3 Minor change in extract_choices in choicegroup to allow for html in choice text Arjun Singh 2012-08-21 01:59:01 -07:00
• 9dedd532c4 some progress Rocky Duan 2012-08-20 23:43:47 -07:00
• 9ac26715a6 Merge branch 'feature/bk_forum_int' into refactor Rocky Duan 2012-08-20 22:42:32 -07:00
• bca6699b58 updated seed_permissions_and_roles to accept course_id as a parameter Rocky Duan 2012-08-20 22:37:26 -07:00