Commit Graph

507 Commits

Author SHA1 Message Date
Piotr Mitros
f7ddb4840c Fixed broken anchors 2012-02-22 15:03:29 -05:00
Piotr Mitros
b26205502e Merge 2012-02-22 14:59:14 -05:00
Piotr Mitros
5c9b67df8b Links to twitter, facebook, etc. in FAQ 2012-02-22 14:59:00 -05:00
Reda Lemeden
a9fbf270a2 Merge 2012-02-22 11:45:07 -05:00
Reda Lemeden
5f260759f0 Changed the z-index for the modals, removed box-shadow from comment controls 2012-02-22 11:42:36 -05:00
Kyle Fiedler
418243971c Merged in better print styles 2012-02-22 10:38:29 -05:00
Kyle Fiedler
09b27107b6 merged with default
--HG--
branch : templates-kf-print
2012-02-22 10:37:53 -05:00
Kyle Fiedler
42daf8dd11 Added Ampliflier css 2012-02-22 10:37:20 -05:00
Kyle Fiedler
4319fcf2fa merged heads 2012-02-22 10:36:53 -05:00
Kyle Fiedler
164155610c Moved around some of the js and autofocused the first part of the forms for enrollment and login 2012-02-22 10:36:21 -05:00
Piotr Mitros
ae1d728677 Merge with subtitles 2012-02-21 18:08:38 -05:00
Piotr Mitros
77f1228a19 merge 2012-02-21 17:37:39 -05:00
Kyle Fiedler
24f4ea7f07 merged sidebar branch 2012-02-21 17:13:12 -05:00
Reda Lemeden
c48b247979 Realigned comments + minor visual enhancements 2012-02-21 17:09:56 -05:00
Piotr Mitros
b7f3bff424 FAQ anchors 2012-02-21 17:02:03 -05:00
Reda Lemeden
f2c726af68 Changed the question layout and new question prompt 2012-02-21 16:20:02 -05:00
Kyle Fiedler
74d4436d3c Merged with default
--HG--
branch : kf-sidebar
2012-02-21 16:05:45 -05:00
Kyle Fiedler
1b2439c4a4 Added more styles for the askbot sidebar
--HG--
branch : kf-sidebar
2012-02-21 16:05:27 -05:00
Bridger Maxwell
0342a65054 Merged in bug fix and Reda's changes 2012-02-21 15:24:39 -05:00
Kyle Fiedler
182dc1a66f fixed conflicts
--HG--
branch : kf-sidebar
2012-02-21 15:01:00 -05:00
Reda Lemeden
4838ab1ba8 Changed visual style of titles and filters
--HG--
branch : bridger-dev
2012-02-21 14:54:30 -05:00
Kyle Fiedler
5404e1228a added styles for other headers inthe sidebars
--HG--
branch : kf-sidebar
2012-02-21 14:25:59 -05:00
Kyle Fiedler
ccc3c710b3 Added consistant sidebar headers and made textbook sidebar close
--HG--
branch : kf-sidebar
2012-02-21 13:08:35 -05:00
Reda Lemeden
76f98a17c8 Added autocomplete styles and removed commenting limit in Askbot
--HG--
branch : bridger-dev
2012-02-21 10:59:42 -05:00
Bridger Maxwell
2be705ca01 Fixed bug where wiki warned users even as they saved their changes.
--HG--
branch : bridger-dev
2012-02-20 21:59:26 -05:00
Bridger Maxwell
b923b59fc4 Merge
--HG--
branch : bridger-dev
2012-02-20 21:58:40 -05:00
Piotr Mitros
cdaed49a2b Subtitle support working
--HG--
branch : pmitros-subtitles
2012-02-20 20:59:02 -05:00
Kyle Fiedler
3ce8557309 Merged heads 2012-02-20 17:24:56 -05:00
Kyle Fiedler
0e2216932a Added more style for askbot profile page 2012-02-20 17:24:20 -05:00
Reda Lemeden
a75ba51c46 Merged and resolved conflicts 2012-02-20 17:14:57 -05:00
Reda Lemeden
6c9540fe4e Minor styles changes and visual fixes to various parts of the app 2012-02-20 17:09:36 -05:00
Kyle Fiedler
02174ff62e Merged heads 2012-02-20 15:24:54 -05:00
Kyle Fiedler
576643da7e Added base styles for the askbot profile page 2012-02-20 15:24:35 -05:00
Reda Lemeden
b2d0b9b621 Merge with Head 2012-02-20 14:29:26 -05:00
Reda Lemeden
01ab182a8e Fixed bugs in the answer and question editing forms 2012-02-20 14:28:30 -05:00
Piotr Mitros
c94d68683e Merge 2012-02-20 13:26:39 -05:00
Piotr Mitros
0b3c9dc975 Integrate with mod-template (custom tags dir) 2012-02-20 13:25:34 -05:00
Piotr Mitros
349230c1fa Merge with capa fixed 2012-02-20 13:24:33 -05:00
Reda Lemeden
f6434f906c Merge with Head 2012-02-20 11:38:20 -05:00
Reda Lemeden
b8dcbaf36c Fixed visual bugs on the main question list + restyled author info in answer view 2012-02-20 11:37:39 -05:00
Kyle Fiedler
bf632da06f Add textbook nav on the bottom of the page too 2012-02-20 11:18:58 -05:00
Kyle Fiedler
d83a4d22f3 Added messaging for users with javascript diabled 2012-02-20 10:51:39 -05:00
Kyle Fiedler
c7e72c28e0 merged heads 2012-02-20 09:54:13 -05:00
Kyle Fiedler
c423e17cc3 Added style to remove enrollment form for IE7 and below and added a paragraph explainaing why 2012-02-20 09:53:40 -05:00
Piotr Mitros
2501b58305 Removed unnecessary symlinks. WARNING: Must update and push data before deploying
--HG--
branch : pmitros-mod-template
2012-02-20 07:13:16 -05:00
Piotr Mitros
47b0ca5564 Merge
--HG--
branch : pmitros-mod-template
2012-02-20 07:11:05 -05:00
Piotr Mitros
73322a5e6a Capa problems handle case sensitivity and give better errors
--HG--
branch : pmitros-capa-fixes
2012-02-19 17:03:29 -05:00
Piotr Mitros
0807cf8160 Updated FAQ 2012-02-19 14:03:12 -05:00
Piotr Mitros
3ef3c055af Profile page fixed 2012-02-19 10:39:18 -05:00
Piotr Mitros
47cd903cc2 Changed jpg to png, new TOC, correct starting/eding pages 2012-02-19 10:29:32 -05:00