Commit Graph

421 Commits

Author SHA1 Message Date
Reda Lemeden
439f6298bd Merge with head 2012-02-15 17:25:50 -05:00
kaishin
4b419b6fca Redesigned the sidebar in the question list view 2012-02-15 17:25:18 -05:00
Piotr Mitros
e6e608d8fe MITx help 2012-02-15 15:20:00 -05:00
Piotr Mitros
c9f83519ed Activation e-mail 2012-02-15 15:18:04 -05:00
Piotr Mitros
85576a61b1 Merge 2012-02-15 15:08:28 -05:00
Piotr Mitros
6afac1d033 Updated FAQ 2012-02-15 15:08:16 -05:00
Bridger Maxwell
736b4be376 Hiding hidden chapter on profile page 2012-02-15 14:42:30 -05:00
Kyle Fiedler
940fe75262 Fix close sidebar in firefox 2012-02-15 14:16:01 -05:00
Kyle Fiedler
e5a06c096b Fix some minor things in the courseware 2012-02-15 13:39:47 -05:00
Kyle Fiedler
7dad99844e added some style for the courseware headers 2012-02-15 11:56:13 -05:00
Kyle Fiedler
22c9d55b47 Merged in close sidebar 2012-02-15 11:30:43 -05:00
Kyle Fiedler
35f6dc0079 formating scss
--HG--
branch : close_sidebar
2012-02-15 11:23:51 -05:00
Kyle Fiedler
b419f607b2 Merged in default
--HG--
branch : close_sidebar
2012-02-15 11:20:17 -05:00
Reda Lemeden
3c43f5141a Merge with head 2012-02-15 10:38:07 -05:00
kaishin
1e4951dc88 Started restyling the sidebar 2012-02-15 10:37:05 -05:00
Kyle Fiedler
d287a110f8 Made calc answer input whole width 2012-02-15 10:08:14 -05:00
Kyle Fiedler
a21f01f468 Added more style for the progress list
--HG--
branch : templates-profilecleanup
2012-02-15 09:51:18 -05:00
Kyle Fiedler
efac674084 Merged in default and fixed conflicts
--HG--
branch : templates-profilecleanup
2012-02-15 09:37:47 -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
Kyle Fiedler
02f99ec65c Remove old Sass readme and add new onw
--HG--
branch : close_sidebar
2012-02-14 11:05:16 -05:00
Kyle Fiedler
11071c6f2c Merge with default
--HG--
branch : close_sidebar
2012-02-14 10:57:55 -05:00
Kyle Fiedler
453a72af96 Changed padding on close and changed so only the a closes sidebar
--HG--
branch : close_sidebar
2012-02-14 10:57:34 -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
Kyle Fiedler
0cb2f28173 fix header clashing with close button
--HG--
branch : close_sidebar
2012-02-13 17:31:33 -05:00
Piotr Mitros
647407ad45 hg ignore update 2012-02-13 17:20:33 -05:00
Kyle Fiedler
24f4ec363a Added style for header in sidebar
--HG--
branch : close_sidebar
2012-02-13 17:15:05 -05:00
Piotr Mitros
31c63455e1 Slightly better text 2012-02-13 16:42:38 -05:00
Kyle Fiedler
3ee53f68b0 Merged with default
--HG--
branch : close_sidebar
2012-02-13 16:39:32 -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