Commit Graph

351 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
bd0a2f6630 Add content and assets for media kit
[# 41872203]
2013-01-03 13:28:45 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Brian Talbot
e170afa927 test center registration - forgot to add/commit corresponding SASS file 2012-12-21 13:23:20 -05:00
Brian Talbot
3987120496 test center registration - further UI design and styling on form and dashboard tweaks 2012-12-21 13:04:22 -05:00
Brian Talbot
5119257f3e test center - fixed dashboard link font issue and started cleaning up markup in reg form - wip 2012-12-20 12:24:31 -05:00
Carlos Andrés Rocha
6d85accad8 Add news announcement for spring 2013 courses
[# 41258693]
2012-12-19 11:49:55 -05:00
Tom Giannattasio
f3067cd8c8 restyling of dashboard with pearson exam notifications 2012-12-14 16:17:03 -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
cc870f8ecd homepage - changed partner university listing layout to handle 6 partners 2012-12-06 14:37:09 -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
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
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 Talbot
be13bc6026 added in completed course status to dashboard and certificate availability states 2012-11-09 18:18:36 -05:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Carlos Andrés Rocha
e4daad4327 Update Job Page with new positions 2012-10-24 20:30:54 -04:00
Tom Giannattasio
a9ba3543d3 styled edge registration form 2012-10-12 11:18:55 -04:00
Calen Pennington
c41c084b39 Wire up login and register forms for edx landing page 2012-10-12 09:55:32 -04:00
Tom Giannattasio
51a19b3d7e transferred edge styles from cms to lms 2012-10-11 14:02:13 -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
3492243ffa Add Elsevier press release 2012-09-25 09:41:50 -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
Kyle Fiedler
3edf1a6a84 Added buttons for both pages to make it even more clear to start class 2012-08-31 15:58:44 -04:00
Kyle Fiedler
7c1cc4ed21 Added hover on course about and more actionable text 2012-08-31 15:58:44 -04:00
Kyle Fiedler
0ff70472c9 Added styles for dashboard to have link around whole class 2012-08-31 15:58:44 -04:00
Tom Giannattasio
bc005e5f46 adjusted dashboard sidebar to accommodate long emails 2012-08-23 07:29:35 -04:00
Calen Pennington
9f23e4378e Merge remote-tracking branch 'origin/hotfix/1.0.4' 2012-08-21 14:56:35 -04:00
Tom Giannattasio
ee0cbf66f9 added a cleaner arrow implementation 2012-08-13 10:19:06 -04:00
Tom Giannattasio
3c23aca898 styled bulleted lists on jobs page 2012-08-09 12:26:32 -04:00
Arjun Singh
d8a1b5d574 adding some styling so that the syllabus lists display reasonably 2012-08-08 02:59:15 -04:00
Calen Pennington
aa215bc316 Merge remote-tracking branch 'origin/hotfix/1.0.1' into hotfix/1.0.3 2012-08-01 15:59:06 -04:00
Kyle Fiedler
b402cde650 Added some style for the dashboard message 2012-07-30 12:11:46 -04:00
Kyle Fiedler
c51f78bdfa Added styles for course images to always the right dimentions 2012-07-30 12:09:30 -04:00
Kyle Fiedler
8c079c8a72 Added styles for course images to always the right dimentions 2012-07-25 18:18:52 -04:00
Arjun Singh
cdea9488ef Fixing up bracket indentation 2012-07-25 15:58:14 -04:00
Brittany Cheng
388ddc5365 change activation complete green and add styles for faq 2012-07-25 14:57:00 -04:00
Kyle Fiedler
3008c17730 Added bottom margin for articles in help 2012-07-23 19:19:50 -04:00
Kyle Fiedler
18ec7ca8e8 Added social links to the footer of the press release 2012-07-23 19:17:22 -04:00
Kyle Fiedler
6aac776a33 Added styles for help page 2012-07-23 18:40:58 -04:00
Kyle Fiedler
2cb9e2997e Move the shiv back to the header 2012-07-23 18:22:21 -04:00
David Ormsbee
64ecd3a211 Merge pull request #275 from MITx/uc_berkeley_press
Added contact info on Berkeley press release.
2012-07-23 12:52:16 -07:00
Bridger Maxwell
e1ad3539b6 Updated contact information on press release. 2012-07-23 15:40:10 -04:00
Kyle Fiedler
b4d08f820e Chage placement of the read more link 2012-07-23 15:28:24 -04:00
Bridger Maxwell
f6b4475309 Added contact info on Berkeley press release. 2012-07-23 15:22:06 -04:00
Kyle Fiedler
c2b426afeb prereqs float right 2012-07-23 15:14:04 -04:00
David Ormsbee
40aaaeda25 Merge pull request #254 from MITx/uc_berkeley_press
UC berkeley press
2012-07-23 11:46:44 -07:00
Kyle Fiedler
54516a9560 Fix grid and make sure that everything is fluid 2012-07-23 13:56:44 -04:00
Kyle Fiedler
b557363ac2 Added som fixed for fluid design 2012-07-23 13:56:44 -04:00
Bridger Maxwell
863071c9a5 Merge remote-tracking branch 'origin/release/1.0' into uc_berkeley_press
Conflicts:
	lms/urls.py
2012-07-23 13:44:04 -04:00