Calen Pennington
d8f8d8c656
Merge branch 'release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
lms/djangoapps/courseware/courses.py
2012-07-24 08:52:50 -04:00
David Ormsbee
1d5e42f175
Remove very large, no longer used images
2012-07-24 00:05:13 -04:00
David Ormsbee
d688b7d249
Merge branch 'release/1.0' into dormsbee/hack_fix_pwd_reset
2012-07-23 23:43:48 -04:00
David Ormsbee
729070763f
Convert @mitx.mit.edu emails to @edx.org emails
2012-07-23 23:43:34 -04:00
David Ormsbee
749740eb07
Actually, the bg play YT bug was there because of the lack of a class on the section. Re-removing the YouTube title.
2012-07-23 23:05:06 -04:00
David Ormsbee
75ba3ebbd4
Reverting the YouTube title hiding commit because it brings back the 'video playing in the background when you hit back' bug
2012-07-23 23:02:04 -04:00
David Ormsbee
8b503eb1ef
Remove YouTube title from showing in homepage video (thanks, Arjun).
2012-07-23 22:59:45 -04:00
David Ormsbee
8db59825f1
Bad hardcoded hack fix to password reset.
...
We used to use Django templates and the Sites framework. At some point we
stopped, but this was leftover. The site_name no longer gets set properly.
It's probably a config issue, but not one I want to deal with right before
release, so I'm hardcoding it to link to the prod edx.org site until we
can sort what's what in the morning.
2012-07-23 22:27:33 -04:00
David Ormsbee
7e8986fce9
Merge pull request #287 from MITx/release_fixes
...
Release fixes
2012-07-23 18:03:21 -07:00
Bridger Maxwell
e7bb31af5b
Changed unenroll to unregister on dashboard.
2012-07-23 20:46:39 -04:00
David Ormsbee
48d69faf4e
Merge pull request #286 from MITx/dormsbee/help
...
Dormsbee/help
2012-07-23 17:40:58 -07:00
David Ormsbee
e53ea2f81d
Add common tech problems to help page
2012-07-23 20:39:26 -04:00
David Ormsbee
38d54f42ca
Let people know courses are free. <sigh>
2012-07-23 20:38:09 -04:00
Bridger Maxwell
80f46c216b
Capitalized facebook on contact page.
2012-07-23 19:56:10 -04:00
Bridger Maxwell
45bdcbdcae
Unecessary capitalized letter on contact page.
2012-07-23 19:55:07 -04:00
Bridger Maxwell
e3b023b0ac
Removed unecessary quotation mark from contact page.
2012-07-23 19:54:03 -04:00
Bridger Maxwell
7c48ab2509
Changed press dates to international format.
2012-07-23 19:53:08 -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
Rocky Duan
8c3931ba0a
removed unnecessary args
2012-07-23 19:24:28 -04:00
Kyle Fiedler
157af877cb
Merge branch 'kf-multicourse-design' into release/1.0
2012-07-23 19:20:49 -04: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
Rocky Duan
d6be47d942
refactored out thread rendering; vote
2012-07-23 19:03:36 -04:00
David Ormsbee
503a7b5d12
Finish a pass at the tech sections of the job page, add new edX fellow description
2012-07-23 18:58:09 -04:00
David Ormsbee
ee7caad181
Change jobs contact to be jobs@edx.org for all
2012-07-23 18:58:09 -04:00
David Ormsbee
799da8de3c
Merge pull request #283 from MITx/release_fixes
...
Fix for appending course enroll to login/register form
2012-07-23 15:49:57 -07:00
Bridger Maxwell
973e474a9c
Fix for appending course enroll to login/register form, now that the form is being cloned.
2012-07-23 18:46:02 -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
David Ormsbee
a0aa2ab2b8
Merge pull request #280 from MITx/release_fixes
...
Added small thumbnails for articles in the rss feed.
2012-07-23 14:14:47 -07:00
Bridger Maxwell
8c88ee5706
Added small thumbnails for articles in the rss feed.
2012-07-23 17:06:22 -04:00
David Ormsbee
756ecc8fec
Merge pull request #279 from MITx/release_fixes
...
edX press release in feed now references png logo instead of jpg with artifacts.
2012-07-23 13:59:38 -07:00
Bridger Maxwell
443f9f5908
Comma for the press release.
2012-07-23 16:54:35 -04:00
Kyle Fiedler
0f4976e069
Added some small IE fixes
2012-07-23 16:53:39 -04:00
Bridger Maxwell
f1936af9ef
edX press release in feed now references png logo instead of jpg with artifacts.
2012-07-23 16:44:11 -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
David Ormsbee
bfdd9bacbb
Merge pull request #274 from MITx/mm-update-index-video
...
Update index video.
2012-07-23 13:35:56 -07:00
Matthew Mongeau
6962735b19
Clone and remove modal
2012-07-23 16:35:19 -04:00
Calen Pennington
4d1c046a7f
Merge pull request #277 from MITx/cpennington/pipelining-course-data
...
Use django-pipeline to read course static files.
2012-07-23 13:34:25 -07:00
Calen Pennington
b8b133d30c
Replace /static urls in all course snippets
2012-07-23 16:31:52 -04:00
Calen Pennington
4984f9d804
Use django-pipeline to read course static files.
...
Requires the replacement of {COURSE_STATIC_URL} with just /static/
in about/overview.html files.
2012-07-23 16:22:45 -04:00
Rocky Duan
fdab215eb4
moved django_comment_client into edx
2012-07-23 16:20:45 -04:00
Bridger Maxwell
c6f0c57b5e
Fixed typo where favicon was references as image/image/x-icon
2012-07-23 16:19:41 -04:00
Bridger Maxwell
95f7e99d36
Changed press release to say UC Berkeley.
2012-07-23 16:18:57 -04:00
Bridger Maxwell
abd1900ac1
Fixed principle/principal typo in press release.
2012-07-23 16:15:08 -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
