ichuang
703c7a95a8
Merge pull request #226 from MITx/arjun/choiceresponse
...
Arjun/choiceresponse
2012-07-19 13:36:29 -07:00
bridger
e247239b69
Merge pull request #231 from MITx/dormsbee/no_org_fix
...
Keep courses and front page from erroring when we're missing an org in data
2012-07-19 13:27:39 -07:00
Arjun Singh
25b6db762f
Replacing startouttext/endouttext with text in examples.
2012-07-19 13:24:19 -07:00
David Ormsbee
17263dcd1b
Keep courses and front page from erroring when we're missing an org in the data.
2012-07-19 16:19:16 -04:00
Victor Shnayder
42fa0806fe
Fix paths in create-dev-env.sh
...
* need to be in mitx/ to install common/lib/*
* create data dir if it doesn't exit
* add a few more log messages
* Change url for our fork of django-pipeline to stop the hanging checkouts.
It works either way on my machine, so not sure if this will fix it.
2012-07-19 16:13:56 -04:00
Arjun Singh
c87f9cd523
Added tests for ChoiceResponses.
2012-07-19 13:07:00 -07:00
David Ormsbee
739b981820
Merge pull request #229 from MITx/release_fixes
...
University profile caching and csrf cookie. Course about page caching.
2012-07-19 12:53:25 -07:00
Bridger Maxwell
287cfd7dcc
university_profile didn't have the ensure_csrf_cookie decorator. course_about and university_profile didn't have the cache_if_anonymous decorator.
2012-07-19 15:47:19 -04:00
Arjun Singh
6871326001
Adding information and an example for ChoiceResponse
2012-07-19 12:41:28 -07:00
Kyle Fiedler
f1ca467863
Added some organization to the images and started to make them smaller, replace the homepage image
2012-07-19 15:20:32 -04:00
Kyle Fiedler
2b61eebf51
Added some style for the university blurbs and made the course boxes a little higher
2012-07-19 15:20:32 -04:00
Rocky Duan
6f74c9577d
display simple threaded comment
2012-07-19 14:46:08 -04:00
David Ormsbee
af4813a78b
Merge pull request #227 from MITx/mm-copy
...
Mm copy
2012-07-19 10:53:53 -07:00
Matthew Mongeau
21bc4a432f
Fix email addresses on help page.
2012-07-19 13:45:29 -04:00
Matthew Mongeau
90d27751c4
Fix copy on contact page.
2012-07-19 13:45:16 -04:00
Matthew Mongeau
1b4460360d
Update harvard image.
2012-07-19 13:34:38 -04:00
Matthew Mongeau
e9d8cbb80b
Updated jobs copy
2012-07-19 13:34:38 -04:00
Matthew Mongeau
ab910c048e
Fix mispellings and alternate spellings on inquiries.
2012-07-19 13:34:38 -04:00
Matthew Mongeau
e32f322aac
Point blog to http://edxonline.tumblr.com/
2012-07-19 13:34:38 -04:00
Matthew Mongeau
13e8e99273
Lowercase "the" in The Massachusetts Institute of Technology in about section
2012-07-19 13:34:38 -04:00
Arjun Singh
85f5c93d92
Added MultipleChoiceResponse, TrueFalseResponse, and choicegroup back in.
2012-07-19 10:25:51 -07:00
Arjun Singh
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.
2012-07-19 10:25:51 -07:00
Arjun Singh
ab11a5f7ed
Allowing for form fields to submit more than one value; e.g. checkbox inputs.
2012-07-19 10:25:51 -07:00
ichuang
77dfc2ade7
Merge pull request #224 from MITx/fix_optioninput
...
minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.
2012-07-19 10:16:02 -07:00
John Jarvis
f1406953e0
adding prod-requirements to match puppet configuration
2012-07-19 12:42:10 -04:00
Kyle Fiedler
2eba466d62
Added style for 404 and other error pages
2012-07-19 12:12:06 -04:00
Kyle Fiedler
88444939b1
Change email to edx.org
2012-07-19 11:57:17 -04:00
Kyle Fiedler
a8377922a4
Added .env to ignore
2012-07-19 11:57:17 -04:00
ichuang
b814e6a08d
Merge pull request #221 from MITx/kimth/lms-coderesponse
...
CodeResponse restricted to only one answer field
2012-07-19 08:25:03 -07:00
ichuang
6ce2ab6025
fix for py2.6 compatbility
2012-07-19 11:19:42 -04:00
David Ormsbee
f542bf4d9e
Merge pull request #223 from MITx/release_fixes
...
Release fixes
2012-07-19 08:19:21 -07:00
ichuang
0903ba9c1f
fix optioninput to preserve author's ordering of options
2012-07-19 11:15:14 -04:00
Bridger Maxwell
9fd99016a9
Removed duplicate index on simplewiki_namespace. Re-added migration that was exposing South 0.7.4 bug.
2012-07-19 11:12:10 -04:00
Bridger Maxwell
58348a98da
Revert "Kill simplewiki migration (there was already a unique index, adding another causes errors)"
...
This reverts commit 7273868eb2
2012-07-19 11:00:39 -04:00
kimth
ff4716ef76
Further simplification after restricting to one answer field
2012-07-19 10:57:14 -04:00
David Ormsbee
db5c187a3c
Merge pull request #220 from MITx/mm-university-profile-courses-display
...
Fix display of courses on university profile pages.
2012-07-19 07:56:23 -07:00
Matthew Mongeau
a8e7f12b9f
Fix display of courses on university profile pages.
2012-07-19 10:48:35 -04:00
kimth
bff86c32ca
CodeResponse restricted to only one answer field
2012-07-19 10:47:12 -04:00
David Ormsbee
2d71a71657
Merge pull request #219 from MITx/mm-course-page-ordering
...
Order courses according to univesity on courses page.
2012-07-19 07:41:07 -07:00
Matthew Mongeau
1f595ef401
Order courses according to univesity on courses page.
2012-07-19 10:26:39 -04:00
Calen Pennington
1c88c5a1bd
Merge pull request #218 from MITx/jarv/edx-email-update
...
Created email forwards to jobs@mitx.mit.edu for
2012-07-19 06:30:56 -07:00
Calen Pennington
49ee12963f
Merge pull request #185 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-07-19 06:29:48 -07:00
John Jarvis
8cd9dd3161
Created email forwards to jobs@mitx.mit.edu for
...
* careers
* content-engineer
* fellow-jobs
* jobs
2012-07-19 09:08:16 -04:00
Galen Frechette
c6c3d76950
fixes title of course in dashboard to accept very long course names, improves various other UI elemnts in the dashboard
2012-07-19 02:39:31 -04:00
Galen Frechette
00e366e9f8
improves the already registed message on the course about page
2012-07-19 02:36:42 -04:00
Galen Frechette
8e1e58a85d
imporves layout of course prequisites in course about page sidebar
2012-07-19 02:34:47 -04:00
Galen Frechette
c25306f378
fixes header on course object to accept very long course titles
2012-07-19 02:33:58 -04:00
Galen Frechette
48d39ee7d2
fixes coursse about header to accept very long course names, fixes icons on course about sidebar
2012-07-19 02:33:58 -04:00
David Ormsbee
7a332d7b7e
Merge pull request #217 from MITx/dormsbee/anant_fixes
...
Dormsbee/anant fixes
2012-07-18 17:03:16 -07:00
David Ormsbee
20b5edb898
Spelling fix
2012-07-18 19:59:46 -04:00
