Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• f5589a2c15 Merge pull request #242 from MITx/dormsbee/copy_edits_2 David Ormsbee 2012-07-20 11:53:36 -07:00
• 8671238da4 Merge branch 'release/1.0' into dormsbee/copy_edits_2 David Ormsbee 2012-07-20 14:52:50 -04:00
• 4dc527d119 fixed school images and edited the contact page Kyle Fiedler 2012-07-20 14:48:28 -04:00
• f5cc037658 Update about info from aboutedX_7.20.12.docx David Ormsbee 2012-07-20 14:41:50 -04:00
• 96b41e93d1 Removed old todo comment. Bridger Maxwell 2012-07-20 14:33:30 -04:00
• a7caa464b7 Updates to the FAQ, removed 'objectives' subsection David Ormsbee 2012-07-20 14:22:15 -04:00
• 7d8ded7bf3 Removed UpdateCacheMiddleware, which wasn't doing anything. Bridger Maxwell 2012-07-20 14:06:49 -04:00
• 50a362a223 Merge pull request #241 from MITx/kf-multicourse-design David Ormsbee 2012-07-20 10:56:40 -07:00
• 148e20359e Added social links and fixed header bug Kyle Fiedler 2012-07-20 13:42:28 -04:00
• 28aaa88923 Make site fluid, add new homepage image Kyle Fiedler 2012-07-20 12:07:47 -04:00
• 11dae2758b Change some numbers Kyle Fiedler 2012-07-20 11:27:03 -04:00
• 639641a167 Merge branch 'master' of github.com:MITx/mitx Rocky Duan 2012-07-20 13:27:38 -04:00
• 9189fae31e create new post Rocky Duan 2012-07-20 13:27:18 -04:00
• cdc2ff04f8 Added a datetime stamp to course enrollments. Bridger Maxwell 2012-07-20 13:14:59 -04:00
• 36373bb457 Added an unenroll link (and confirmation) to the dashboard. Enrolling is now a POST of a form. Bridger Maxwell 2012-07-20 12:21:35 -04:00
• 3d43ba81ce some basic functionalities of discussion Rocky Duan 2012-07-20 12:19:20 -04:00
• bcbf352886 Removed BosInno article David Ormsbee 2012-07-20 11:28:14 -04:00
• 9c90592d82 Merge pull request #238 from MITx/kf-multicourse-design David Ormsbee 2012-07-20 08:21:52 -07:00
• c7e43d98dc Rearranged more images, made some smaller, made some slight changes to the design on the homepage and made all edX proper case Kyle Fiedler 2012-07-20 11:15:44 -04:00
• cb8d08c85d Remove lowercase edX in all caps Kyle Fiedler 2012-07-19 17:16:01 -04:00
• 90d6cee672 Made the whole course container a link Kyle Fiedler 2012-07-19 16:59:04 -04:00
• 4d63b58619 Added more social links and took the pointer off the media thats not a link Kyle Fiedler 2012-07-19 16:35:09 -04:00
• 47892b8950 Merge pull request #237 from MITx/cpennington/rss-feed-fix Calen Pennington 2012-07-20 07:22:06 -07:00
• 43cd2c2190 Merge pull request #216 from MITx/victor/fix_dev_script Calen Pennington 2012-07-20 07:16:04 -07:00
• 2017138f6c Don't start the rss feed with a blank line, as that causes some versions of sax parser to fail Calen Pennington 2012-07-20 09:31:29 -04:00
• 67ae7dee1a Merge pull request #236 from MITx/dormsbee/copy_edits_1 David Ormsbee 2012-07-20 05:20:54 -07:00
• 8907b1210d Initial commit of press release material. We'll move it after it's styled properly. David Ormsbee 2012-07-20 08:18:49 -04:00
• b717b0efd0 Add real news and announcements at the bottom of the homepage via internal RSS for now. David Ormsbee 2012-07-20 07:21:11 -04:00
• 6d63b852dd fix typo in course registration modal, re-add the course number in the annoymous case David Ormsbee 2012-07-19 18:52:01 -04:00
• a7491516dd Merge pull request #234 from MITx/mm-month-names David Ormsbee 2012-07-19 14:35:47 -07:00
• be450e6864 Add month names Matthew Mongeau 2012-07-19 17:33:07 -04:00
• be369938ae Merge branch 'master' of github.com:MITx/mitx Rocky Duan 2012-07-19 17:08:46 -04:00
• 2b89a82ac2 add discussion app & url conf Rocky Duan 2012-07-19 17:08:29 -04:00
• bb0ae695b0 Merge pull request #233 from MITx/mm-more-copy David Ormsbee 2012-07-19 13:47:19 -07:00
• b51dc5aec2 Link faq to courses page. Matthew Mongeau 2012-07-19 16:32:42 -04:00
• 0cfd915161 Link faq to be able to sign up from corresponding question. Matthew Mongeau 2012-07-19 16:31:23 -04:00
• 5a81f819d9 Remove honor code summary from sign up form. Matthew Mongeau 2012-07-19 16:20:16 -04:00
• 7a7d09113f Strip help page down. Matthew Mongeau 2012-07-19 16:19:25 -04:00
• 1d7203ef98 Link university on dashboard. Matthew Mongeau 2012-07-19 16:16:22 -04:00
• 16f4ed27bf Change default gender option to be blank. Matthew Mongeau 2012-07-19 16:13:57 -04:00
• 0e76c4a9d7 Fix faq titles. Matthew Mongeau 2012-07-19 14:42:25 -04:00
• 18dd26a9e6 Update honor code title. Matthew Mongeau 2012-07-19 14:36:51 -04:00
• 703c7a95a8 Merge pull request #226 from MITx/arjun/choiceresponse ichuang 2012-07-19 13:36:29 -07:00
• e247239b69 Merge pull request #231 from MITx/dormsbee/no_org_fix bridger 2012-07-19 13:27:39 -07:00
• 25b6db762f Replacing startouttext/endouttext with text in examples. Arjun Singh 2012-07-19 13:24:19 -07:00
• 17263dcd1b Keep courses and front page from erroring when we're missing an org in the data. David Ormsbee 2012-07-19 16:19:16 -04:00
• 42fa0806fe Fix paths in create-dev-env.sh Victor Shnayder 2012-07-19 16:13:56 -04:00
• c87f9cd523 Added tests for ChoiceResponses. Arjun Singh 2012-07-19 13:07:00 -07:00
• 739b981820 Merge pull request #229 from MITx/release_fixes David Ormsbee 2012-07-19 12:53:25 -07:00
• 287cfd7dcc university_profile didn't have the ensure_csrf_cookie decorator. course_about and university_profile didn't have the cache_if_anonymous decorator. Bridger Maxwell 2012-07-19 15:47:19 -04:00
• 6871326001 Adding information and an example for ChoiceResponse Arjun Singh 2012-07-19 12:41:28 -07:00
• f1ca467863 Added some organization to the images and started to make them smaller, replace the homepage image Kyle Fiedler 2012-07-19 15:18:47 -04:00
• 2b61eebf51 Added some style for the university blurbs and made the course boxes a little higher Kyle Fiedler 2012-07-19 13:54:00 -04:00
• 6f74c9577d display simple threaded comment Rocky Duan 2012-07-19 14:46:08 -04:00
• af4813a78b Merge pull request #227 from MITx/mm-copy David Ormsbee 2012-07-19 10:53:53 -07:00
• 21bc4a432f Fix email addresses on help page. Matthew Mongeau 2012-07-19 13:45:29 -04:00
• 90d27751c4 Fix copy on contact page. Matthew Mongeau 2012-07-19 13:45:16 -04:00
• 1b4460360d Update harvard image. Matthew Mongeau 2012-07-19 13:32:03 -04:00
• e9d8cbb80b Updated jobs copy Matthew Mongeau 2012-07-19 13:31:39 -04:00
• ab910c048e Fix mispellings and alternate spellings on inquiries. Matthew Mongeau 2012-07-19 11:28:52 -04:00
• e32f322aac Point blog to http://edxonline.tumblr.com/ Matthew Mongeau 2012-07-19 11:26:11 -04:00
• 13e8e99273 Lowercase "the" in The Massachusetts Institute of Technology in about section Matthew Mongeau 2012-07-19 11:23:16 -04:00
• 85f5c93d92 Added MultipleChoiceResponse, TrueFalseResponse, and choicegroup back in. Arjun Singh 2012-07-19 10:25:26 -07:00
• a23c51e39c Merged two multiple-choice-like response types into a single response; created inputtypes for checkboxes and radio buttons adn cleaned up the code a bit. Fixed checkbox responses. Arjun Singh 2012-07-19 08:26:48 -07:00
• ab11a5f7ed Allowing for form fields to submit more than one value; e.g. checkbox inputs. Arjun Singh 2012-07-18 23:41:44 -04:00
• 77dfc2ade7 Merge pull request #224 from MITx/fix_optioninput ichuang 2012-07-19 10:16:02 -07:00
• f1406953e0 adding prod-requirements to match puppet configuration John Jarvis 2012-07-19 12:42:10 -04:00
• 2eba466d62 Added style for 404 and other error pages Kyle Fiedler 2012-07-19 12:12:06 -04:00
• 88444939b1 Change email to edx.org Kyle Fiedler 2012-07-19 11:57:03 -04:00
• a8377922a4 Added .env to ignore Kyle Fiedler 2012-07-19 11:54:46 -04:00
• b814e6a08d Merge pull request #221 from MITx/kimth/lms-coderesponse ichuang 2012-07-19 08:25:03 -07:00
• 6ce2ab6025 fix for py2.6 compatbility ichuang 2012-07-19 11:19:42 -04:00
• f542bf4d9e Merge pull request #223 from MITx/release_fixes David Ormsbee 2012-07-19 08:19:21 -07:00
• 0903ba9c1f fix optioninput to preserve author's ordering of options ichuang 2012-07-19 11:15:14 -04:00
• 9fd99016a9 Removed duplicate index on simplewiki_namespace. Re-added migration that was exposing South 0.7.4 bug. Bridger Maxwell 2012-07-19 11:12:10 -04:00
• 58348a98da Revert "Kill simplewiki migration (there was already a unique index, adding another causes errors)" Bridger Maxwell 2012-07-19 11:00:39 -04:00
• ff4716ef76 Further simplification after restricting to one answer field kimth 2012-07-19 10:57:14 -04:00
• db5c187a3c Merge pull request #220 from MITx/mm-university-profile-courses-display David Ormsbee 2012-07-19 07:56:23 -07:00
• a8e7f12b9f Fix display of courses on university profile pages. Matthew Mongeau 2012-07-19 10:48:35 -04:00
• bff86c32ca CodeResponse restricted to only one answer field kimth 2012-07-19 10:47:12 -04:00
• 2d71a71657 Merge pull request #219 from MITx/mm-course-page-ordering David Ormsbee 2012-07-19 07:41:07 -07:00
• 1f595ef401 Order courses according to univesity on courses page. Matthew Mongeau 2012-07-19 10:26:39 -04:00
• 1c88c5a1bd Merge pull request #218 from MITx/jarv/edx-email-update Calen Pennington 2012-07-19 06:30:56 -07:00
• 49ee12963f Merge pull request #185 from MITx/kimth/lms-coderesponse Calen Pennington 2012-07-19 06:29:48 -07:00
• 8cd9dd3161 Created email forwards to jobs@mitx.mit.edu for John Jarvis 2012-07-19 09:08:16 -04:00
• c6c3d76950 fixes title of course in dashboard to accept very long course names, improves various other UI elemnts in the dashboard Galen Frechette 2012-07-18 22:20:21 -04:00
• 00e366e9f8 improves the already registed message on the course about page Galen Frechette 2012-07-18 21:35:51 -04:00
• 8e1e58a85d imporves layout of course prequisites in course about page sidebar Galen Frechette 2012-07-18 21:01:43 -04:00
• c25306f378 fixes header on course object to accept very long course titles Galen Frechette 2012-07-18 20:10:52 -04:00
• 48d39ee7d2 fixes coursse about header to accept very long course names, fixes icons on course about sidebar Galen Frechette 2012-07-18 18:35:03 -04:00
• 7a332d7b7e Merge pull request #217 from MITx/dormsbee/anant_fixes David Ormsbee 2012-07-18 17:03:16 -07:00
• 20b5edb898 Spelling fix David Ormsbee 2012-07-18 19:59:46 -04:00
• 74b00bc05b Swap out the homepage and courses banner image for something school-neutral (this is temporary) David Ormsbee 2012-07-18 19:58:38 -04:00
• 8bba4abc43 Change citizenship to country in signup David Ormsbee 2012-07-18 19:44:03 -04:00
• c6ca8ab61f Update dev script repos Victor Shnayder 2012-07-18 18:51:28 -04:00
• 3302d1644b Merge pull request #215 from MITx/dormsbee/email_messages David Ormsbee 2012-07-18 15:50:03 -07:00
• 48e0e222d9 Changing email messages to be edX, even the ones I don't think will be sent. David Ormsbee 2012-07-18 18:43:48 -04:00
• 61fea82de0 Merge pull request #214 from MITx/mm-course-columns David Ormsbee 2012-07-18 14:40:02 -07:00
• a64ddc771a Display courses in university related columns. Matthew Mongeau 2012-07-18 17:36:12 -04:00
• 48ff2c9cf5 Merge pull request #213 from MITx/dormsbee/simplewiki_migration David Ormsbee 2012-07-18 14:19:44 -07:00