Commit Graph

704 Commits

Author SHA1 Message Date
Arjun Singh
d8a1b5d574 adding some styling so that the syllabus lists display reasonably 2012-08-08 02:59:15 -04:00
Calen Pennington
8059008bde Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors 2012-08-06 10:13:12 -04:00
Calen Pennington
442fb6e839 Pass the cursor, rather than the output of cursor.execute, to dictfetchall 2012-08-01 16:19:29 -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
David Ormsbee
f500fac0ae Merge pull request #318 from MITx/pmitros/minidash
Miniature staff dashboard. Not really tested, but should be safe to merge
2012-07-30 11:43:01 -07:00
Bridger Maxwell
a2271d4e48 The message div will only show up when there is a message to display. 2012-07-30 12:11:54 -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
Piotr Mitros
2df7e02e31 Fixed comment 2012-07-27 10:23:44 -04:00
Piotr Mitros
6db146f6b4 Missing files 2012-07-27 10:19:51 -04:00
Piotr Mitros
c8b2b4d464 Miniture staff dashboard. Not really tested, but should be safe to merge 2012-07-27 10:14:07 -04:00
Bridger Maxwell
dc021312dd Added faq about UC Berkeley's 'X University' Consortium. 2012-07-27 08:38:01 -04:00
David Ormsbee
e4073663e2 Have Bloomberg link point to Bloomberg article :-P 2012-07-25 18:47:26 -04:00
David Ormsbee
5ad1791433 add a few items to the press links at the bottom of the front page 2012-07-25 18:31:57 -04:00
David Ormsbee
9671df3e25 minor typo fixes 2012-07-25 18:22:46 -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
a8610c3889 fixed twitter link to Berkeley Press Release 2012-07-25 18:15:37 -04:00
David Ormsbee
619d4cd989 fixed twitter link for course about pages 2012-07-25 18:14:05 -04:00
David Ormsbee
a86938ee93 New press articles 2012-07-25 18:09:26 -04:00
David Ormsbee
3a933aeab8 Update About Page text with new intro paragraph 2012-07-25 17:40:58 -04:00
Matthew Mongeau
bd9da89fe9 Move press articles to json. 2012-07-25 17:31:34 -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
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
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
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