197 Commits

Author	SHA1	Message	Date
Brian Talbot	982d22df38	edx.org/LMS: revises graphic-based login and registration banner text to render with system text	2013-09-25 16:00:08 -04:00
David Ormsbee	78acd083be	Merge branch 'master' into ormsbee/verifyuser3 ... Conflicts: common/djangoapps/course_modes/models.py lms/djangoapps/shoppingcart/models.py lms/djangoapps/shoppingcart/processors/CyberSource.py lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py lms/djangoapps/shoppingcart/tests/test_models.py lms/djangoapps/shoppingcart/tests/test_views.py lms/djangoapps/shoppingcart/urls.py lms/djangoapps/shoppingcart/views.py lms/envs/common.py lms/envs/dev.py lms/static/sass/base/_variables.scss	2013-09-04 10:58:30 -04:00
Brian Wilson	8f93051d30	Add editable templates for bulk email ... Adds the edX Marketing-approved template as html default.	2013-08-29 12:40:34 -04:00
Frances Botsford	28db6a2fda	cleanup on the photo page for vcerts	2013-08-27 10:55:09 -04:00
Frances Botsford	0fabba1553	added vcert images and some fake js functionality for photos	2013-08-23 13:08:05 -04:00
Miles Steele	f88b266c2b	add member list widget, add segment.io call for section view	2013-08-02 09:53:21 -04:00
marco	a24c3a9700	updated pinning icons and removed images	2013-06-25 13:28:55 -04:00
marco	05a7d664f7	updated flag icons to be font-awesome based	2013-06-25 13:28:55 -04:00
marco	770bfdc180	removed new post icon and added font-awesome replacement	2013-06-25 13:28:55 -04:00
Brian Talbot	e4cc0dfdba	edx.org - revises login and register graphical banner images to include higher contrast between type and imagery	2013-06-04 10:45:42 -04:00
David Baumgold	bdc9570cd1	Removed Symbolset font files	2013-05-30 16:09:17 -04:00
marcotuts	ab18953eec	Merge pull request #2020 from edx/ux/marco/forums-icons ... updated pinning icons	2013-05-28 11:22:13 -07:00
Greg Price	de5b4d7d27	Merge branch 'master' into drupal-new	2013-05-17 16:10:56 -04:00
marco	71be3debc4	updated flagging icons to not use other libraries	2013-05-16 10:56:58 -04:00
Jay Zoldak	ed5ad46192	Revert "Revert "fix merge conflict"" ... This reverts commit 2df3fe9344. Conflicts: common/static/coffee/src/discussion/utils.coffee	2013-05-16 10:29:33 -04:00
marco	54a33a0a3b	updated pinning icons	2013-05-13 11:04:51 -04:00
Greg Price	a0fb4d6c85	Merge branch 'master' into drupal-new ... Conflicts: lms/envs/aws.py lms/envs/common.py lms/static/sass/base/_base.scss lms/templates/forgot_password_modal.html	2013-05-10 10:30:10 -04:00
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	45baf013fe	Merge branch 'master' into drupal-new	2013-05-02 17:04:39 -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
John Jarvis	2c0b2e4d27	Merge branch 'master' into drupal-new	2013-04-09 13:27:13 -04:00
Kevin Chugh	8358e5162a	Merge branch 'master' into feature/kevin/flagging	2013-04-09 09:23:05 -04:00
Brian Talbot	78079d1ca7	Merge branch 'master' into drupal-new	2013-04-08 22:35:29 -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
Brian Talbot	fe59ca5b89	edx.org - replacing visual banners with updated marketing ones	2013-03-19 17:14:57 -04:00
John Jarvis	78987cc400	resolving merge conflicts	2013-03-19 16:16:32 -04:00
Brian Talbot	dc60d107e9	edx.org - added in new login and registration visual banners per marketing request	2013-03-19 09:53:52 -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
Brian Talbot	d23679ea4e	edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme	2013-03-12 15:04:00 -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