2609 Commits

Author	SHA1	Message	Date
Tom Giannattasio	a9ba3543d3	styled edge registration form	2012-10-12 11:18:55 -04:00
Calen Pennington	4814f8c38e	Cleaning up logos for edge landing page	2012-10-12 10:31:46 -04:00
Calen Pennington	c41c084b39	Wire up login and register forms for edx landing page	2012-10-12 09:55:32 -04:00
Tom Giannattasio	51a19b3d7e	transferred edge styles from cms to lms	2012-10-11 14:02:13 -04:00
Calen Pennington	096d6853eb	Allow for branding subdomains that are longer than a single .	2012-10-11 13:18:27 -04:00
Calen Pennington	9e9825cb88	Enable the edge virtual university landing page in the lms	2012-10-11 13:18:01 -04:00
Calen Pennington	d21c5761df	Minor bug fixes from edge-configs merge	2012-10-11 12:49:48 -04:00
Calen Pennington	cf19a43268	Set SESSION_COOKIE_DOMAIN from env.json	2012-10-11 12:32:23 -04:00
Calen Pennington	5ae34aa4ed	Add heartbeat to cms	2012-10-11 12:32:23 -04:00
Calen Pennington	284f0d6a22	Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content	2012-10-11 12:31:52 -04:00
Calen Pennington	658bb622ba	Always import logsettings after common, so that paths are set	2012-10-11 12:31:52 -04:00
Calen Pennington	bc69ed8c9e	Move logsettings to common, so that it's shared between cms and lms	2012-10-11 12:31:52 -04:00
Calen Pennington	20f84b2055	Use the right config as the base for lms.envs.cms.aws	2012-10-11 12:31:52 -04:00
Calen Pennington	eece835d9b	Put in an empty contentstore for the LMS by default	2012-10-11 12:31:52 -04:00
Calen Pennington	46668d2634	Read CONTENTSTORE from auth.json in lms	2012-10-11 12:31:51 -04:00
Calen Pennington	0162e4c031	Remove more askbot remnants	2012-10-11 12:31:51 -04:00
Calen Pennington	f5a63f7375	Remove all askbot common settings	2012-10-11 12:31:51 -04:00
Calen Pennington	1114f66a98	Enable specification of modulestore in LMS aws config	2012-10-11 12:31:51 -04:00
Tom Giannattasio	86f32bb3d4	added edge template to university folder	2012-10-11 12:29:40 -04:00
Calen Pennington	c8d267fb72	Fix minor typo in access.py	2012-10-10 22:03:08 -04:00
Calen Pennington	b19627ccf3	Add configs for lms and lms preview running against mongo	2012-10-10 12:49:52 -04:00
Calen Pennington	2b030f7aaf	Clean up how tests use modulestores	2012-10-10 12:49:51 -04:00
Calen Pennington	1a8532d8ad	Make it possible to create, edit, and publish a draft	2012-10-10 12:49:51 -04:00
Chris Dodge	a80e8ce3d5	respond to Cale pull request comments. Update access.py (LMS) to use the same 'check for legacy group name first' logic. Add SECRET_KEY setting to the CAS project so that auth tokens from CAS are accepted in the LMS	2012-10-09 15:11:07 -04:00
Calen Pennington	b305c0bae2	Make drag/drop save content immediately in seqs and verticals	2012-10-01 15:17:41 -04:00
Calen Pennington	fd7223bd87	Make editing work, building towards drag/drop saving	2012-10-01 15:17:41 -04:00
Calen Pennington	ce3638538c	Make inline editing save to mongo and then update the preview	2012-10-01 15:17:41 -04:00
Calen Pennington	05b9e6cab2	Standardize more of css between lms and cms	2012-10-01 15:17:40 -04:00
Calen Pennington	4381674ec5	Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms	2012-10-01 15:17:40 -04:00
Calen Pennington	d240b5b1eb	Consolidate bourbon and link to it from both cms and lms	2012-10-01 15:17:40 -04:00
Calen Pennington	44805ca383	Make discussion js work for cms as well as lms so that inline discussion xmodules load	2012-10-01 15:16:54 -04:00
Tom Giannattasio	1870db5fb1	fixed custom tab box-sizing glitch in firefox	2012-10-01 10:09:56 -04:00
David Ormsbee	cd0991469e	Merge pull request #786 from MITx/feature/tomg/moderator-tag ... added moderator label styles	2012-09-30 19:10:19 -07:00
David Ormsbee	1c823b375c	Merge pull request #790 from MITx/feature/bridger/max_grade_cache_fix ... Fix to update the max_grade cache on StudentModule	2012-09-30 19:08:50 -07:00
Victor Shnayder	af6dd84af0	Merge pull request #789 from MITx/feature/bridger/course_grading ... Feature/bridger/course grading	2012-09-30 11:52:36 -07:00
Bridger Maxwell	fd43e94318	If an problem was updated and had a new max score it wasn't recached. Now it is fixed.	2012-09-28 23:38:49 -04:00
Bridger Maxwell	fc73916e05	Removed django.conf.settings dependency from graders.	2012-09-28 23:14:55 -04:00
kimth	7750bb471c	Merge pull request #788 from MITx/bug/tomg/new-collapsibles ... Added HTML and Problem collapsibles	2012-09-28 10:03:50 -07:00
Tom Giannattasio	04119cce3f	remove collapsible from problem template	2012-09-28 12:37:25 -04:00
Calen Pennington	1977b42d5b	Merge pull request #783 from MITx/feature/rocha/update-jobs-page ... Remove Fellow and Course Manager positions from the jobs page	2012-09-28 09:09:32 -07:00
Calen Pennington	8838c50f0d	Merge pull request #770 from MITx/feature/dave/progress_reverse_quickfix ... Put tests to check ordering of scores returned on progress page.	2012-09-28 05:56:56 -07:00
Tom Giannattasio	10227e8cdf	added moderator label styles	2012-09-28 07:27:57 -04:00
Carlos Andrés Rocha	70b91813a9	Remove Fellow and Course Manager positions from the jobs page	2012-09-27 19:29:42 -04:00
David Ormsbee	7a6eedb3f1	Make it so we don't require HTTP basic auth to talk to the queue server	2012-09-27 19:02:34 -04:00
kimth	8210bfdff5	Remove vestigial js include	2012-09-26 19:51:04 -07:00
Carlos Andrés Rocha	ed3d944371	Fix display of email address on 404 pages	2012-09-26 13:35:48 -04:00
Carlos Andrés Rocha	52bde562ce	Correct Terms of Use and Privacy static pages	2012-09-26 13:19:33 -04:00
Carlos Andrés Rocha	e05c7be1ab	Update Terms of Use and Privacy static pages	2012-09-26 10:42:08 -04:00
ichuang	35569d1086	Merge pull request #731 from MITx/feature/ichuang/symmath_improvements ... improvements in symbolic math checking. Merging now because it is needed for Physics courses.	2012-09-25 19:36:02 -07:00
David Ormsbee	305dcfc4e9	Put tests to check ordering of scores returned on progress page.	2012-09-25 12:54:06 -04:00