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
David Ormsbee
a86938ee93
New press articles
2012-07-25 18:09:26 -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
David Ormsbee
1d5e42f175
Remove very large, no longer used images
2012-07-24 00:05:13 -04:00
jarv
6666c2fe8a
Merge pull request #285 from MITx/release_fixes
...
Fixed bugs caused by modal cloning. Now, only video modals are cloned.
2012-07-23 16:25:03 -07:00
Kyle Fiedler
3008c17730
Added bottom margin for articles in help
2012-07-23 19:19:50 -04:00
Bridger Maxwell
1e1e777e04
Fixed bugs caused by modal cloning. Now, only video modals are cloned.
2012-07-23 19:19:27 -04:00
Kyle Fiedler
18ec7ca8e8
Added social links to the footer of the press release
2012-07-23 19:17:22 -04:00
David Ormsbee
2fb5bb6e86
Merge pull request #282 from MITx/kf-multicourse-design
...
Added styles for help page
2012-07-23 15:45:48 -07:00
Kyle Fiedler
6aac776a33
Added styles for help page
2012-07-23 18:40:58 -04:00
David Ormsbee
0832373859
Merge pull request #281 from MITx/kf-multicourse-design
...
IE fixes!!!!!!!!!!!!!!!
2012-07-23 15:24:27 -07:00
Kyle Fiedler
2cb9e2997e
Move the shiv back to the header
2012-07-23 18:22:21 -04:00
Kyle Fiedler
63faa76e2a
More small ie fixes
2012-07-23 17:49:48 -04:00
Bridger Maxwell
8c88ee5706
Added small thumbnails for articles in the rss feed.
2012-07-23 17:06:22 -04:00
Kyle Fiedler
0f4976e069
Added some small IE fixes
2012-07-23 16:53:39 -04:00
David Ormsbee
0d80a938ad
Merge pull request #278 from MITx/mm-modal-clone
...
Clone and remove modal
2012-07-23 13:37:30 -07:00
Matthew Mongeau
6962735b19
Clone and remove modal
2012-07-23 16:35:19 -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
5150c993fe
Run all images through compression
2012-07-23 14:12:20 -04:00
Kyle Fiedler
54516a9560
Fix grid and make sure that everything is fluid
2012-07-23 13:56:44 -04:00
Kyle Fiedler
6da83900aa
Added min width for container
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
Calen Pennington
652aa52001
Merge pull request #260 from MITx/split-sass
...
Split sass
2012-07-23 09:43:17 -07:00
Kyle Fiedler
e6465e420a
Changed around the css
2012-07-23 12:38:21 -04:00
David Ormsbee
c5849805ed
Merge pull request #264 from MITx/mm-video-fixes-for-index
...
Add rel=0 to all lightbox videos.
2012-07-23 09:23:36 -07:00
Matthew Mongeau
315063ffed
Add rel=0 to all lightbox videos.
2012-07-23 12:09:09 -04:00
Kyle Fiedler
8eeeac716b
Added some design changes to the homepage header
2012-07-23 12:06:17 -04:00
David Ormsbee
9d81a8becb
Merge pull request #256 from MITx/dormsbee/change_reg_fields
...
Dormsbee/change reg fields
2012-07-22 16:13:52 -07:00
David Ormsbee
074fc24343
Fix up the signup modal for registration for the new fields.
2012-07-22 18:53:12 -04:00
Bridger Maxwell
0cac360225
Added a favicon.
2012-07-22 18:49:10 -04:00
Bridger Maxwell
ed10dc43d9
Added UC Berkeley press release. Moved press releases to their own folder.
2012-07-22 17:35:10 -04:00
David Ormsbee
fa51046949
Merge pull request #253 from MITx/smooth_registration
...
Smooth registration
2012-07-22 13:49:59 -07:00
Bridger Maxwell
d798b4ac7f
Ignoring ie.css
2012-07-22 15:27:49 -04:00
David Ormsbee
679b19c94d
Merge pull request #240 from MITx/unenroll
...
Unenroll
2012-07-22 12:23:02 -07:00
Bridger Maxwell
61105134aa
Cleaned up activation pages. Added "Log In" link to notice when anonymous user tries to enroll in course.
2012-07-22 14:52:49 -04:00
David Ormsbee
24235a62c4
Add IEEE Spectrum link to front page, change UC Berkeley title
2012-07-22 00:16:33 -04:00
David Ormsbee
e21e5284de
Remove placeholder background image from courses and course about pages.
2012-07-21 20:27:04 -04:00
Bridger Maxwell
2f4aba8042
If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account.
2012-07-21 17:52:28 -04:00
David Ormsbee
d7dd64905f
Images needed for press page links
2012-07-21 16:16:31 -04:00
David Ormsbee
c4ee4e051b
Ugly listing of articles in Press page.
...
The static press page is getting edited a lot in terms of both
content and styling. I didn't want to the RSS thing until we
figured out what it's supposed to look like and need in terms of
fields. I didn't want to add a view entry, urls.py, etc. for this,
so for now it just uses an Article namedtuple inline to make
updates a little easier.
2012-07-21 15:40:17 -04:00
