170 Commits

Author	SHA1	Message	Date
Victor Shnayder	06846d9187	update EPFL profile. LH # 374	2013-05-06 11:06:05 -04:00
Victor Shnayder	aae40b4378	Press updates ... LH: 381, 382, 383	2013-05-03 08:55:40 -04:00
Diana Huang	2df3fe9344	Revert "fix merge conflict" ... This reverts commit acfd0d9fd6, reversing changes made to e4194c99d8.	2013-04-26 12:40:35 -04:00
Kevin Chugh	e8c646142f	Merge branch 'master' into feature/kevin/flagging	2013-04-21 06:15:55 -04:00
Brian Talbot	b417651cf1	fixing the visual display of the stanford logo used in press releases on the homepage and dashboard (proportions were off)	2013-04-16 14:47:26 -04:00
Kevin Chugh	8358e5162a	Merge branch 'master' into feature/kevin/flagging	2013-04-09 09:23:05 -04:00
Calen Pennington	8288202008	Marketing request: Lighthouse [#338, fixed]	2013-04-08 14:42:15 -04:00
Greg Price	ffc1259496	Apply text and image changes reqeusted by UTAustinX ... Lighthouse LMS tickets: [#307 state:resolved] [#310 state:resolved] [#319 state:resolved] [#322 state:resolved]	2013-04-04 13:52:33 -04:00
John Jarvis	ea6174af28	fixing image resolution for the stanford-university image	2013-04-04 11:40:44 -04:00
John Jarvis	d2313d851a	renaming image	2013-04-03 16:02:41 -04:00
John Jarvis	b2e8780f9b	adding a smaller stanford image	2013-04-03 16:01:15 -04:00
John Jarvis	e8ee6616c4	removing old logo	2013-04-03 15:39:46 -04:00
John Jarvis	6d78425a82	dding stanford-univ logo	2013-04-03 15:39:22 -04:00
John Jarvis	7b226c34f8	Adding new logo for stanford	2013-04-03 15:34:54 -04:00
Kevin Chugh	5534d8bdce	fix mega merge conflicts	2013-03-29 07:33:52 -04:00
Carlos Andrés Rocha	a15baa97c5	Add UTAustinX landing page	2013-03-28 13:23:58 -04:00
Carlos Andrés Rocha	c5385ff42c	Update Berkeley logos ... LMS Lighthouse [#260]	2013-03-20 14:46:08 -04:00
Carlos Andrés Rocha	b4d83a5f44	Add 2.01x announcement to news feed ... LMS Lighthouse [#259]	2013-03-14 06:49:07 -07:00
Kevin Chugh	8d766c4b51	fix conflict	2013-03-13 21:01:37 -04:00
Your Name	6ee14ec34a	candidate without inline	2013-03-13 18:51:40 -04:00
Kevin Chugh	a2be6dd420	first cut of UI	2013-03-12 10:31:05 -04:00
David Ormsbee	a8ff7911f6	Update of Delft logo (lighthouse ticket #234)	2013-03-11 10:21:03 -04:00
Victor Shnayder	2981f532c1	Integrate Brian T's front-page changes, add epfl and delft ... - removed duplicate logos. - cover images are still in the 200-350 KB range.	2013-02-19 22:04:20 -05:00
Victor Shnayder	105cbd3bfc	Merge remote-tracking branch 'origin/style/btalbot/homepage-newxunis' into press/international	2013-02-19 21:52:06 -05:00
Brian Talbot	1f247ceb0c	edX Homepage - revised layout (HTML/CSS) for new edX universities and created logo assets	2013-02-19 16:40:21 -05:00
Victor Shnayder	45c80abecf	Add initial images for ANU, McGill, Rice, Toronto. ... Still waiting on transparent logos.	2013-02-19 14:04:17 -05:00
Victor Shnayder	c37238d592	Initial landing pages for ANU, McGill, Rice, Toronto	2013-02-19 08:22:09 -05:00
Victor Shnayder	0353cb98e1	7.00x press release	2013-01-30 16:07:47 -05:00
Calen Pennington	75b0a8eed6	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master	2013-01-22 14:47:52 -05:00
Carlos Andrés Rocha	899c501d3d	Add announcement of Walter Lewin's course ... [#157]	2013-01-21 16:58:27 -05:00
Chris Dodge	22695d80c7	Merge branch 'master' into feature/cdodge/cms-master-merge4 ... Conflicts: common/djangoapps/student/models.py common/lib/capa/capa/responsetypes.py common/lib/xmodule/setup.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/xml_module.py jenkins/test.sh lms/djangoapps/courseware/access.py lms/djangoapps/courseware/tests/tests.py lms/djangoapps/django_comment_client/models.py requirements.txt	2013-01-17 09:15:37 -05:00
Carlos Andrés Rocha	2f99d38e90	Update FAQ page: new content and styling	2013-01-14 14:17:39 -05:00
Chris Dodge	3b5e17ef55	Merge branch 'master' into feature/cdodge/cms-master-merge2 ... Conflicts: .gitmodules common/djangoapps/__init__.py common/djangoapps/track/migrations/__init__.py common/lib/capa/capa/inputtypes.py common/lib/capa/capa/responsetypes.py common/lib/capa/capa/templates/openendedinput.html common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/video_module.py common/static/sass/bourbon/css3/_box-sizing.scss doc/development.md lms/djangoapps/instructor/tests.py lms/envs/aws.py lms/envs/common.py lms/templates/video.html requirements.txt test-requirements.txt	2013-01-07 12:34:48 -05:00
Carlos Andrés Rocha	bd0a2f6630	Add content and assets for media kit ... [# 41872203]	2013-01-03 13:28:45 -05:00
Chris Dodge	e70db062b2	Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge ... Conflicts: requirements.txt	2013-01-03 10:46:24 -05:00
Chris Dodge	7229a9cdaf	perform a new merge from master, resolve conflicts	2013-01-03 10:43:03 -05:00
Brian Talbot	4bcfa84519	adding zendesk logo for styling purposes	2012-12-19 14:25:59 -05:00
Brian Talbot	4602a9d654	universities - revised Georgetown University seal/logo for homepage/university page use	2012-12-14 09:52:00 -05:00
Kevin Chugh	6e108c7531	fix conflict	2012-12-10 19:30:04 -05:00
Carlos Andrés Rocha	cc68ba5bc9	Add Georgetown news announcement, landing page and updated FAQ ... [#40805397]	2012-12-07 11:59:13 -05:00
Calen Pennington	c917725ff0	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ... Conflicts: common/lib/xmodule/xmodule/seq_module.py common/lib/xmodule/xmodule/template_module.py common/lib/xmodule/xmodule/x_module.py lms/djangoapps/courseware/tests/tests.py lms/djangoapps/courseware/views.py lms/static/sass/course.scss requirements.txt	2012-12-07 11:17:41 -05:00
Brian Talbot	edbc12e1e3	homepage - added georgetown logo assets and resized other university logos to match 3x3 layout	2012-12-06 17:02:43 -05:00
marco	00d1a7c73b	added flag icons back in with proper transparency	2012-12-06 16:42:15 -05:00
Kevin Chugh	28e86f9602	Merge branch 'master' into feature/kevin/flagging	2012-12-06 09:31:39 -05:00
marco	13581bcfcb	updated flag icons to have proper transparency	2012-12-04 15:47:58 -05:00
marco	64663c34dd	added flag resources	2012-12-04 14:04:31 -05:00
Carlos Andrés Rocha	c702bbcd85	Modify Wellesley rollover logo	2012-12-04 10:27:23 -05:00
Carlos Andrés Rocha	e3d180505f	Add Wellesley College news announcement and frontpage changes	2012-12-04 09:45:30 -05:00
Kevin Chugh	c2b13e0a3c	added temporary flagging assets	2012-11-29 23:43:56 -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