Calen Pennington
7ef8b6ac1e
Merge remote-tracking branch 'origin/release/1.0'
2012-07-23 14:27:29 -04: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
Calen Pennington
ebe67d2d7d
Merge remote-tracking branch 'origin/release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-23 13:55:20 -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
Rocky Duan
784bd26510
forum view for discussions
2012-07-22 19:05:32 -04: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
Bridger Maxwell
660d11dc16
Merge remote-tracking branch 'origin/release/1.0' into unenroll
...
Conflicts:
lms/urls.py
2012-07-21 12:49:27 -04:00
David Ormsbee
5330396844
Merge pull request #251 from MITx/kf-multicourse-design
...
Kf multicourse design
2012-07-21 09:39:32 -07:00
Calen Pennington
64b92c35cc
Include ie fixes in via django-pipeline
2012-07-20 19:54:07 -04:00
Kyle Fiedler
1b3f03e2e5
Added fixes for ie and an image change
2012-07-20 19:16:10 -04:00
David Ormsbee
f3885f7e59
Merge pull request #243 from MITx/release_fixes
...
Dashboard show full name instead of location. Removed updatecachemiddleware.
2012-07-20 13:13:14 -07:00
Kyle Fiedler
81e7662afc
Added style for the unenroll links
2012-07-20 16:06:13 -04:00
Kyle Fiedler
164b5b67db
Added style and better markup for the quotes on the jobs page
2012-07-20 15:42:22 -04:00
Bridger Maxwell
c499a1a563
Now displaying full name on the dashboard, instead of location. The icon is just a generic info icon, for now.
2012-07-20 14:55:01 -04:00
Kyle Fiedler
4dc527d119
fixed school images and edited the contact page
2012-07-20 14:48:28 -04:00
Kyle Fiedler
148e20359e
Added social links and fixed header bug
2012-07-20 13:43:32 -04:00
Kyle Fiedler
28aaa88923
Make site fluid, add new homepage image
2012-07-20 13:43:32 -04:00
Rocky Duan
9189fae31e
create new post
2012-07-20 13:27:18 -04:00
Rocky Duan
3d43ba81ce
some basic functionalities of discussion
2012-07-20 12:19:20 -04:00
Kyle Fiedler
c7e43d98dc
Rearranged more images, made some smaller, made some slight changes to the design on the homepage and made all edX proper case
2012-07-20 11:18:39 -04:00
Kyle Fiedler
cb8d08c85d
Remove lowercase edX in all caps
2012-07-20 11:11:47 -04:00
Kyle Fiedler
90d6cee672
Made the whole course container a link
2012-07-20 11:11:47 -04:00
Kyle Fiedler
4d63b58619
Added more social links and took the pointer off the media thats not a link
2012-07-20 11:11:46 -04:00
Rocky Duan
be369938ae
Merge branch 'master' of github.com:MITx/mitx
2012-07-19 17:08:46 -04:00
Matthew Mongeau
0cfd915161
Link faq to be able to sign up from corresponding question.
2012-07-19 16:41:24 -04:00
Kyle Fiedler
f1ca467863
Added some organization to the images and started to make them smaller, replace the homepage image
2012-07-19 15:20:32 -04:00
Kyle Fiedler
2b61eebf51
Added some style for the university blurbs and made the course boxes a little higher
2012-07-19 15:20:32 -04:00
Rocky Duan
6f74c9577d
display simple threaded comment
2012-07-19 14:46:08 -04:00
Matthew Mongeau
1b4460360d
Update harvard image.
2012-07-19 13:34:38 -04:00
Matthew Mongeau
e9d8cbb80b
Updated jobs copy
2012-07-19 13:34:38 -04:00
