Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,002 Commits 1 Branch 0 Tags
b3f00a672504e70e66a38d9d35f85df48ff70afd
Commit Graph

149 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Brian Wilson
515d2f4b1e add press mentions for October, update missing logos, and add sorting. 2012-11-14 11:55:08 -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
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
Calen Pennington
4814f8c38e Cleaning up logos for edge landing page 2012-10-12 10:31:46 -04:00
Tom Giannattasio
51a19b3d7e transferred edge styles from cms to lms 2012-10-11 14:02:13 -04:00
Tom Giannattasio
671f2af387 added image 2012-10-02 13:39:42 -04:00
Carlos Andrés Rocha
52a9bd2d1e Fix news and announcements icons on the frontpage 2012-09-25 10:33:38 -04:00
Carlos Andrés Rocha
a948c13496 Resize images for the news feed on the frontpage 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
1a95abd095 Update Elsevier press release and frontpage feed 2012-09-25 09:41:50 -04:00