5095 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Calen Pennington	e206bf2ffc	Merge pull request #505 from MITx/feature/tomg/fall-design ... Feature/tomg/fall design	2012-08-22 13:34:39 -07:00
David Ormsbee	3b24ae1068	Merge pull request #501 from MITx/kimth/autodisable-syllabus ... Dynamically disable syllabus per-course	2012-08-22 13:15:24 -07:00
David Ormsbee	c86ee73bd8	Merge pull request #504 from MITx/feature/bridger/new_wiki ... Feature/bridger/new wiki	2012-08-22 13:13:33 -07:00
Tom Giannattasio	a05cf05462	Merge branch 'master' into feature/tomg/fall-design	2012-08-22 16:09:30 -04:00
Tom Giannattasio	2c827c46f9	fixed firefox outline bugs	2012-08-22 16:09:09 -04:00
Calen Pennington	e093a365a4	Merge pull request #503 from MITx/feature/ichuang/fix-staff-debug ... staff debug view currently presents an empty window - this fixes	2012-08-22 13:01:31 -07:00
Bridger Maxwell	a694d1034e	We use django-wiki's built-in wikilinks markdown extension. They were clashing.	2012-08-22 15:57:44 -04:00
ike	7c242939f2	fix staff debug view, and also add new source_link	2012-08-22 15:51:08 -04:00
Kyle Fiedler	cca5fe2f04	Delete page	2012-08-22 15:40:56 -04:00
Kyle Fiedler	f4f8b7bf73	Added delete page and padding and hid th on overflow	2012-08-22 15:39:24 -04:00
kimth	f46607710f	Merge master	2012-08-22 15:25:07 -04:00
kimth	64788a73aa	Remove ENABLE_SYLLABUS flag from envs/common	2012-08-22 15:22:58 -04:00
Calen Pennington	5b7ae1a99b	Add more excludes to rakefile	2012-08-22 15:14:25 -04:00
kimth	960cf5792b	Dynamically disable syllabus per-course	2012-08-22 15:12:49 -04:00
Kyle Fiedler	7464332180	added fix for error styles and swapped some the button order	2012-08-22 15:09:20 -04:00
David Ormsbee	8b8ee9f434	Merge pull request #500 from MITx/feature/cale/university-branding ... Feature/cale/university branding	2012-08-22 12:02:19 -07:00
Calen Pennington	2eb0de99eb	Merge pull request #494 from MITx/feature/arjun/course_specific_css ... Feature/arjun/course specific css	2012-08-22 11:55:20 -07:00
Calen Pennington	d735190570	Merge pull request #499 from MITx/feature/bridger/new_wiki ... Added optional <wiki> tag to course to specify an alternative wiki page.	2012-08-22 11:54:39 -07:00
Arjun Singh	23e3d371ef	adding more details about the state of course.css_class	2012-08-22 11:49:26 -07:00
Calen Pennington	55984e31fc	Add HarvardX- and MITx- on-edx-logo.png files	2012-08-22 14:47:50 -04:00
Calen Pennington	5ca636e606	Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH	2012-08-22 14:43:49 -04:00
Kyle Fiedler	1277c5f892	Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki	2012-08-22 14:43:15 -04:00
Kyle Fiedler	d0c92aa159	Added styles for the wiki directory	2012-08-22 14:43:03 -04:00
Bridger Maxwell	788c74e07a	Added optional <wiki> tag to course to specify an alternative wiki page.	2012-08-22 14:25:05 -04:00
Calen Pennington	b841591b0a	Remove special styling for courseware header logo	2012-08-22 14:08:36 -04:00
Calen Pennington	82bab71ccf	First pass at branding the header logo on subdomains	2012-08-22 14:05:19 -04:00
Kyle Fiedler	02f29c22c9	Added stsyles for toc	2012-08-22 13:41:20 -04:00
Calen Pennington	45f516cd52	Merge pull request #493 from MITx/feature/bridger/new_wiki ... Feature/bridger/new wiki	2012-08-22 10:27:18 -07:00
Calen Pennington	2eb3f37681	Merge pull request #498 from MITx/feature/victor/domain-specific-caching ... Separate caches per-domain-name	2012-08-22 10:25:25 -07:00
Victor Shnayder	ce0bc1f782	Separate caches per-domain-name	2012-08-22 13:18:33 -04:00
Bridger Maxwell	14382702bc	Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki ... Conflicts: lms/templates/wiki/settings.html	2012-08-22 13:09:42 -04:00
Calen Pennington	f580bafdfe	Merge pull request #496 from MITx/kimth/fix-choiceresponse ... Fix for 500 on showanswer for choiceresponse	2012-08-22 10:07:42 -07:00
Calen Pennington	aa933cb38f	Merge pull request #497 from MITx/feature/victor/catch-module-errors ... Catch errors in module load	2012-08-22 10:05:08 -07:00
David Ormsbee	6a0072a0fb	Merge pull request #483 from MITx/feature/tomg/fall-design ... Feature/tomg/fall design	2012-08-22 10:04:12 -07:00
Victor Shnayder	365495521e	Catch errors in module load ... * if error is in xmodule_constructor(), catch and return an ErrorModule * if error is somewhere else in get_module(), return None	2012-08-22 12:58:46 -04:00
Bridger Maxwell	7b4c86e55c	Updated django-wiki with bug fix.	2012-08-22 12:42:21 -04:00
Bridger Maxwell	3796bb4a12	Changed title of default root wiki page to just be Wiki.	2012-08-22 12:42:03 -04:00
kimth	edefa04de1	Workaround for 500 on showanswer for choiceresponse	2012-08-22 12:41:30 -04:00
Tom Giannattasio	d2808981cb	fixed wiki breadcrumb arrow bug	2012-08-22 12:09:57 -04:00
Tom Giannattasio	fb1d9ca06c	Merge branch 'master' into feature/tomg/fall-design	2012-08-22 11:41:19 -04:00
Tom Giannattasio	7d903c4089	sidebar hover and firefox bug fixes	2012-08-22 11:40:59 -04:00
Calen Pennington	f065959f8a	Merge pull request #495 from MITx/feature/arjun/fix_syllabus_css ... Fixed syllabus to look good with new courseware styling	2012-08-22 08:39:00 -07:00
Bridger Maxwell	390823bdea	Added django-wiki's requirements to requirements.txt, because they weren't being included automatically.	2012-08-22 11:37:01 -04:00
Bridger Maxwell	96f0f7cbde	Changed default contents of new course wiki.	2012-08-22 11:36:06 -04:00
Bridger Maxwell	03248cc324	Updated django-wiki.	2012-08-22 10:09:06 -04:00
Tom Giannattasio	b7ce475adb	accordion hovers	2012-08-22 09:35:17 -04:00
Tom Giannattasio	8344fe88bd	removed funky footer logo animation	2012-08-22 09:08:42 -04:00
Tom Giannattasio	885efc47c4	darker background for increased contrast	2012-08-22 09:03:38 -04:00
Arjun Singh	a9126aa276	Fixed syllabus to look good with new courseware styling	2012-08-22 05:25:48 -07:00
Arjun Singh	9a21c5d4a8	Adding reasoning for adding a new metadata field	2012-08-22 05:00:39 -07:00