Commit Graph

389 Commits

Author SHA1 Message Date
Kyle Fiedler
d287a110f8 Made calc answer input whole width 2012-02-15 10:08:14 -05:00
Kyle Fiedler
de3fd877e5 Fixed header bug and calculator bug in firefox 2012-02-15 09:32:23 -05:00
Kyle Fiedler
b73755d8e9 Merged templates-ernie-html5-buttontoggle 2012-02-15 09:11:51 -05:00
Kyle Fiedler
5842284a94 Merged defualt
--HG--
branch : templates-ernie-html5-buttontoggle
2012-02-15 08:59:58 -05:00
kaishin
f1fc649eee Fixed the tag div properties 2012-02-14 15:24:31 -05:00
Kyle Fiedler
3a25e96a2c Fixed padding on discussions 2012-02-14 14:35:49 -05:00
Kyle Fiedler
50bdad914b merged refactor branch 2012-02-14 14:16:03 -05:00
Kyle Fiedler
cbefe16061 Added in Redas changes
--HG--
branch : kf-refactor-scss
2012-02-14 14:14:22 -05:00
Reda Lemeden
364680a0ea Merge with Head 2012-02-14 13:58:37 -05:00
Reda Lemeden
92f2927fe5 Redesigned the question tag filtering & navigation 2012-02-14 13:57:16 -05:00
Kyle Fiedler
d6b96ae1f1 Major refactor of scss
--HG--
branch : kf-refactor-scss
2012-02-14 13:55:06 -05:00
Kyle Fiedler
7e0d9b0d43 Update bourbon
--HG--
branch : kf-refactor-scss
2012-02-14 11:40:23 -05:00
Kyle Fiedler
48650b131b Changed amazon link 2012-02-14 11:31:23 -05:00
Piotr Mitros
e3e1a37bc2 Missed commit for custom tags 2012-02-13 20:24:08 -05:00
Reda Lemeden
3176123c7c Started redesigning the question filtering and navigation 2012-02-13 18:52:00 -05:00
Piotr Mitros
56858e6498 Undid Kyle's Chrome bug fix, since it resulted in worse Firefox bugs 2012-02-13 18:42:13 -05:00
Piotr Mitros
647407ad45 hg ignore update 2012-02-13 17:20:33 -05:00
Piotr Mitros
31c63455e1 Slightly better text 2012-02-13 16:42:38 -05:00
Kyle Fiedler
1b9f3c1f67 merge 2012-02-13 16:32:31 -05:00
Kyle Fiedler
872b2af4c9 Added help page for outside the app, link to help in footer and Opencourseware link 2012-02-13 16:32:15 -05:00
Piotr Mitros
4cd5720aba Removed obsolete error code -- now AJAX 2012-02-13 16:16:25 -05:00
Piotr Mitros
06d241c514 Standard forms for templates 2012-02-13 15:57:31 -05:00
Kyle Fiedler
0b424b4bd8 Fixed errorn on invalid activation 2012-02-13 15:40:02 -05:00
Kyle Fiedler
2db960a2b3 unused css class 2012-02-13 15:26:55 -05:00
Kyle Fiedler
30559f178e Merged in ernies video changes 2012-02-13 15:20:47 -05:00
Kyle Fiedler
9a17d23475 Merged with default
--HG--
branch : templates-ernie-global-intro-video
2012-02-13 15:20:18 -05:00
Kyle Fiedler
b30dc6fed6 Hide footer links for activation pages 2012-02-13 15:09:57 -05:00
Ernie Park
b4737eb1d2 merge with default
--HG--
branch : templates-ernie-global-intro-video
2012-02-13 14:55:39 -05:00
Ernie Park
0c83d18761 switch intro video to (experimental) iframe player so closing overlay stops video, and hitting play autoplays video. still buggy if clicked within 1 second of loading page
--HG--
branch : templates-ernie-global-intro-video
2012-02-13 14:55:28 -05:00
Kyle Fiedler
c5772894bd Merge 2012-02-13 14:02:06 -05:00
Kyle Fiedler
89fbab77f7 Fixed links and added them to other pages 2012-02-13 14:01:52 -05:00
Piotr Mitros
1366afcfc1 Minor bug fixes 2012-02-13 13:52:23 -05:00
Kyle Fiedler
fdcb58489a Added link to homepage and course page on acctivation 2012-02-13 12:17:35 -05:00
Piotr Mitros
5835fd6eeb MITx italics 2012-02-13 00:43:08 -05:00
Piotr Mitros
fd086c1c63 Minor wordsmithing, etc. 2012-02-12 20:25:37 -05:00
Piotr Mitros
812e137cf3 More wordsmithing 2012-02-12 11:17:50 -05:00
Piotr Mitros
25d4d2a760 Updated honor code 2012-02-12 09:35:51 -05:00
Piotr Mitros
f4f37a94ea Updated honor code 2012-02-12 09:34:42 -05:00
Piotr Mitros
97f124f7bd Blocks to get rid of login buttons, TOS tweak 2012-02-10 19:12:17 -05:00
Kyle Fiedler
389b53b742 merge heads 2012-02-10 16:45:49 -05:00
Kyle Fiedler
b2b05fdd93 Date change again 2012-02-10 16:45:26 -05:00
Kyle Fiedler
a4e57aeb47 Made changes to Anants three pages 2012-02-10 16:44:30 -05:00
Piotr Mitros
c50cae3d93 Merge, minor correction to e-mail 2012-02-10 12:26:44 -05:00
Ernie Park
8b5d56ff2f merge
--HG--
branch : templates-ernie-html5-buttontoggle
2012-02-10 12:10:12 -05:00
Ernie Park
bb7d1615b5 put video control toggle into a function
--HG--
branch : templates-ernie-html5-buttontoggle
2012-02-10 12:10:01 -05:00
Kyle Fiedler
3bab1336f2 merge heads 2012-02-10 11:19:55 -05:00
Kyle Fiedler
6779e9b45e Added screen fix for smaller screens on secondary pages 2012-02-10 11:19:41 -05:00
David Ormsbee
2359de96eb Replace hardcoded url in password reset notification email with site name (from django_site table) 2012-02-10 11:15:18 -05:00
Kyle Fiedler
3c7dc27259 Fixed probelms with layout of three new pages and made small chages requested by Anant 2012-02-10 11:02:50 -05:00
Piotr Mitros
ad2989f4a6 Fixed unescaped unicode characters 2012-02-09 21:24:21 -05:00