7051 Commits

Author	SHA1	Message	Date
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	20b5edb898	Spelling fix	2012-07-18 19:59:46 -04:00
David Ormsbee	74b00bc05b	Swap out the homepage and courses banner image for something school-neutral (this is temporary)	2012-07-18 19:58:38 -04:00
David Ormsbee	8bba4abc43	Change citizenship to country in signup	2012-07-18 19:44:03 -04:00
David Ormsbee	48e0e222d9	Changing email messages to be edX, even the ones I don't think will be sent.	2012-07-18 18:43:48 -04:00
David Ormsbee	61fea82de0	Merge pull request #214 from MITx/mm-course-columns ... Display courses in university related columns.	2012-07-18 14:40:02 -07:00
Matthew Mongeau	a64ddc771a	Display courses in university related columns.	2012-07-18 17:36:12 -04:00
David Ormsbee	7273868eb2	Kill simplewiki migration (there was already a unique index, adding another causes errors)	2012-07-18 17:15:51 -04:00
David Ormsbee	98a0351433	Merge pull request #211 from MITx/mm-course-registration-copy ... Change copy for needed to sign up to register.	2012-07-18 13:46:16 -07:00
David Ormsbee	da7a7d2dae	Merge pull request #212 from MITx/mm-sign-up-links ... Hook up tos and honor links.	2012-07-18 13:45:42 -07:00
David Ormsbee	9ec8c9934e	Merge pull request #209 from MITx/dormsbee/uni_profile ... Dormsbee/uni profile	2012-07-18 13:39:43 -07:00
Matthew Mongeau	a4afa689e6	Hook up tos and honor links.	2012-07-18 16:36:37 -04:00
Matthew Mongeau	78bee3a71e	Change copy for needed to sign up to register.	2012-07-18 16:33:15 -04:00
bridger	c5d23b27ee	Removed out of date comment.	2012-07-18 17:32:30 -03:00
David Ormsbee	a70e026e63	Merge pull request #210 from MITx/release_fixes ... Added the course image to the about page, even if the video doesn't exis...	2012-07-18 13:22:37 -07:00
Bridger Maxwell	80eb89a23d	Added the course image to the about page, even if the video doesn't exist.	2012-07-18 16:20:11 -04:00
David Ormsbee	16eeb43a04	Add University Profile page with images and text blurbs	2012-07-18 16:17:12 -04:00
David Ormsbee	bbcc19bf87	Merge pull request #208 from MITx/release_fixes ... Release fixes	2012-07-18 13:08:42 -07:00
Bridger Maxwell	a9078ac0b0	check_course didn't have the right exception being caught.	2012-07-18 16:00:03 -04:00
Bridger Maxwell	75e9ef12b6	The dashboard links to the about page for courses that haven't started yet.	2012-07-18 15:53:24 -04:00
David Ormsbee	a3d48cf22c	Merge pull request #207 from MITx/mm-remove-preferred-language ... Mm remove preferred language	2012-07-18 12:24:36 -07:00
Bridger Maxwell	0fab4cdd93	Added a method to render 404 and 500 pages. Added a reference to these views in urls.py.	2012-07-18 14:55:12 -04:00
David Ormsbee	7453af5a41	Add course number to register links on Course About page	2012-07-18 14:33:12 -04:00
David Ormsbee	753181642e	Merge pull request #205 from MITx/course_images ... Course images	2012-07-18 11:08:20 -07:00
Bridger Maxwell	7d148d35fe	Removed application.css	2012-07-18 13:52:41 -04:00
Bridger Maxwell	f25dbc0854	Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses.	2012-07-18 13:48:20 -04:00
Matthew Mongeau	519a744f22	Fix message and notice styles.	2012-07-18 13:40:16 -04:00
Matthew Mongeau	73df314159	wip	2012-07-18 13:40:16 -04:00
bridger	dbf0bf34d8	Merge pull request #204 from MITx/dormsbee/at_a_glance ... Add some more info the the "About" Course page "at a glance" section	2012-07-18 10:39:34 -07:00
Bridger Maxwell	14dc52f66d	Merge remote-tracking branch 'origin/dormsbee/at_a_glance' into release/1.0	2012-07-18 13:25:59 -04:00
David Ormsbee	588f115b33	Add support for optional end_date, effort, and prerequisites info on course_about	2012-07-18 13:17:31 -04:00
Galen Frechette	98ee9fb447	adds styles to new inputs on signup form	2012-07-18 13:04:27 -04:00
Matthew Mongeau	dd0cd57ead	Add date_of_birth	2012-07-18 13:02:56 -04:00
Matthew Mongeau	456054a261	Cleanup.	2012-07-18 13:02:31 -04:00
Matthew Mongeau	67221b0725	Added countries and other demographics to be stored in db.	2012-07-18 13:02:07 -04:00
Matthew Mongeau	7e25f39f62	Change stored gender value for students.models.UserProfile ... * Changed from 'male', 'female', and 'other' to 'm', 'f', and 'o'	2012-07-18 13:00:40 -04:00
Matthew Mongeau	44e8d7474c	Move logic into view.py for whether user is enrolled.	2012-07-18 11:54:36 -04:00
Matthew Mongeau	5824b2ebe2	Display registered when already registered for a course.	2012-07-18 11:48:02 -04:00
Bridger Maxwell	f007a8ff92	The about image is now pulled from the course data directory and shown on the homepage, about course, and dashboard. Working on a way to show other, arbitrary course images.	2012-07-18 11:44:19 -04:00
Matthew Mongeau	7d3c778268	Force dataType to 'text json'	2012-07-18 11:36:20 -04:00
Galen Frechette	72f772d6ff	adds styles to reset password page	2012-07-18 10:56:59 -04:00
David Ormsbee	1979f3a33b	Remove Contact link from top nav (got moved into the About section)	2012-07-18 10:38:58 -04:00
Bridger Maxwell	0b097f470d	Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0	2012-07-18 10:37:07 -04:00
Bridger Maxwell	c24c88022b	Changed wording in emails to remove any 6.002x or MITx reference.	2012-07-18 10:36:55 -04:00
David Ormsbee	824ea6f72e	Merge pull request #199 from MITx/dormsbee/course_images ... Dormsbee/course images	2012-07-18 07:24:23 -07:00
Matthew Mongeau	63fd5b57dd	Fix _modal.scss merge conflicts.	2012-07-18 10:23:44 -04:00