5315 Commits

Author	SHA1	Message	Date
Carlos Andrés Rocha	d4f5f17381	Remove unused askbot/discussion sass stylesheets ... The unused styles are referencing images that no longer exisit, breaking collectstatic and therefore tests.	2012-11-27 19:06:03 -05:00
David Ormsbee	658c92037c	Revert "Make tests pass again without askbot" -- that commit removed ... scss files that were still being partially used by the current discussion forum. This reverts commit 010bccc8a5.	2012-11-20 18:43:00 -05:00
Your Name	57b70092e8	update front end to handle flagging	2012-11-20 13:39:33 -05:00
Calen Pennington	010bccc8a5	Make tests pass again without askbot	2012-11-19 16:02:49 -05:00
Don Mitchell	a9233dfd44	Merge branch 'course-info' into feature/dhm/cms-settings ... Conflicts: cms/djangoapps/contentstore/views.py	2012-11-19 16:00:27 -05:00
Carlos Andrés Rocha	71db139045	Update Gates Foundation press release thumbnail	2012-11-19 15:50:17 -05:00
Carlos Andrés Rocha	03c8c54e4a	Add photo to the gates foundation announcement	2012-11-19 14:32:57 -05:00
Carlos Andrés Rocha	1afb982e8d	Update Gates Foundation news release feed image	2012-11-19 13:42:16 -05:00
Carlos Andrés Rocha	1a2cee360a	Update news releases images ... [Delivers #39472239]	2012-11-19 13:06:37 -05:00
Carlos Andrés Rocha	fd3c5566b8	Move press release images to their own folder	2012-11-19 13:06:37 -05:00
Carlos Andrés Rocha	b417002a23	Fix image size of news images on the student dashboard ... [#39472239]	2012-11-19 13:06:36 -05:00
Tom Giannattasio	423de1868d	added carousel to dashboard page	2012-11-19 12:45:46 -05:00
Carlos Andrés Rocha	47362bfdc7	Add new video to frontpage with gates foundation announcement	2012-11-19 10:02:17 -05:00
Carlos Andrés Rocha	6326e4dc7e	Add stub for Gates foundation announcement ... [#39636489 #39636491 #39636495 #39636903]	2012-11-19 06:14:08 -05:00
Your Name	fb6a07c812	allow flagging for abuse and spoilers	2012-11-16 18:39:54 -05:00
Calen Pennington	0fff578e7d	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ... Conflicts: .gitmodules lms/envs/aws.py lms/envs/common.py lms/static/sass/course.scss lms/urls.py	2012-11-16 09:03:15 -05:00
David Ormsbee	156dc1fb6c	Merge branch 'master' into feature/victor/actual-askbot-removal ... Conflicts: lms/envs/aws.py	2012-11-15 14:24:55 -05:00
David Ormsbee	1ab7019607	Merge pull request #1044 from MITx/feature/brian/press-updates ... Feature/brian/press updates	2012-11-14 10:01:16 -08:00
Brian Wilson	515d2f4b1e	add press mentions for October, update missing logos, and add sorting.	2012-11-14 11:55:08 -05:00
Calen Pennington	dbcb1adfaf	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ... Conflicts: lms/static/sass/course/courseware/_courseware.scss	2012-11-13 10:22:42 -05:00
Brian Wilson	f9f5850a55	update press page mentions through September, and home page pointers for early November.	2012-11-12 23:14:20 -05:00
Victor Shnayder	92ab5af627	bigger error messages	2012-11-12 16:23:40 -05:00
Victor Shnayder	6a313fd562	more css tweaks	2012-11-12 13:17:26 -05:00
Victor Shnayder	0ad2154b86	merge in origin/master	2012-11-12 13:10:21 -05:00
Victor Shnayder	2b55c5906d	css tweaks	2012-11-12 13:09:16 -05:00
Victor Shnayder	2846c61d15	Revert "remove (almost) all references to askbot." ... This reverts commit 793354a0dc.	2012-11-09 18:18:37 -05:00
Brian Talbot	c6bfb67b1a	revised no certificate state for dashboard messages and removed course message UI for future work on separate branch	2012-11-09 18:18:36 -05:00
Brian Talbot	d155869f16	added in course-wide completion message static states and styling	2012-11-09 18:18:36 -05:00
Brian Talbot	be13bc6026	added in completed course status to dashboard and certificate availability states	2012-11-09 18:18:36 -05:00
Victor Shnayder	76f0cf4a86	remove (almost) all references to askbot.	2012-11-09 18:18:33 -05:00
Victor Shnayder	fb3b52b99f	refactor + style self-assessment in progress	2012-11-08 18:01:09 -05:00
Calen Pennington	0bfa443520	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master	2012-11-02 11:09:19 -04:00
Vik Paruchuri	8734e492de	added back in ie css file that was accidentally removed	2012-11-02 09:23:36 -04:00
Vik Paruchuri	8557007195	removed some extra files, undid changes to html module	2012-11-02 09:22:23 -04:00
Vik Paruchuri	99b0795e59	replaced removed file from master	2012-11-01 15:10:05 -04:00
Vik Paruchuri	62d1f1fe3e	update gitignore for pycharm	2012-10-30 20:14:55 -04:00
Victor Shnayder	793354a0dc	remove (almost) all references to askbot.	2012-10-30 18:23:07 -04:00
Carlos Andrés Rocha	e4daad4327	Update Job Page with new positions	2012-10-24 20:30:54 -04:00
Calen Pennington	cac8e3453c	Remove more remnants of askbot	2012-10-23 13:40:50 -04:00
Calen Pennington	b52ed48221	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ... Conflicts: common/lib/capa/capa/responsetypes.py common/lib/xmodule/xmodule/js/src/html/display.coffee lms/envs/common.py	2012-10-23 13:38:11 -04:00
Carlos Andrés Rocha	2f7733ede0	Add Cengage book press release	2012-10-18 14:45:42 -04:00
Carlos Andrés Rocha	b121e620f8	Make small corrections to UT pages and announcement	2012-10-15 11:54:23 -04:00
Carlos Andrés Rocha	b13412d3b2	Make corrections of UT announcement	2012-10-15 11:12:35 -04:00
Carlos Andrés Rocha	c5a148639d	Add announcement of UT joining edx and related changes	2012-10-15 06:57:50 -04:00
Arjun Singh	d7b237ce0a	more removal of data("id") in favor of attr("data-id")	2012-10-12 14:47:44 -07:00
David Ormsbee	f5f1e858d5	Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids ... Hotfix/arjun/fix integer disc ids	2012-10-12 11:38:28 -07:00
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
Arjun Singh	71201a73b2	styles and tiny bit of logic for community tas	2012-10-12 04:54:56 -07:00