Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

137 Commits

Author SHA1 Message Date
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
Carlos Andrés Rocha
3492243ffa Add Elsevier press release 2012-09-25 09:41:50 -04:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -07:00
Tom Giannattasio
5caa989e3c added transparent icons for the comment form 2012-09-14 16:17:34 -04:00
David Ormsbee
2e34c4ae5c Merge pull request #676 from MITx/feature/kfiedler/ocw-links 
Feature/kfiedler/ocw links
 2012-09-14 07:26:53 -07:00
Kyle Fiedler
15ffd7e01d Better styles for updates 2012-09-13 15:13:42 -04:00
Victor Shnayder
f4a93b7c70 Merge remote-tracking branch 'origin/master' into feature/kfiedler/ocw-links 2012-09-13 10:22:44 -04:00
Kyle Fiedler
05c3e028c2 Added new press releases 2012-09-12 10:38:17 -04:00
Arjun Singh
7ad9b39b98 Merge master 2012-09-10 15:33:59 -07:00
Tom Giannattasio
d0c2d31558 new show/hide button for inline discussions 2012-09-10 12:12:46 -07:00
Tom Giannattasio
a0c887cd5f new inline post styles 2012-09-07 16:24:25 -04:00
Kyle Fiedler
81ad9530d6 Some edits for the resources box 2012-09-07 09:49:43 -04:00
Kyle Fiedler
bd199ef5c3 Added opencourseware box on course about page 2012-09-07 09:49:43 -04:00