Commit Graph

44477 Commits

Author SHA1 Message Date
Kyle Fiedler
c4098707b3 Make graph full width of screen 2012-02-22 11:35:35 -05:00
Piotr Mitros
91d083f881 Default page is now course updates/info 2012-02-22 11:25:35 -05:00
Jean-Michel Claus
39fa4b738a added symlinks to audio labs
--HG--
branch : jmclaus-sound-labs
2012-02-22 11:14:44 -05:00
David Ormsbee
c52727b0e0 add migration for putting an index on auth_user.email 2012-02-22 11:01:27 -05:00
Kyle Fiedler
c4062f40b5 Added some new styles for amplifier 2012-02-22 10:48:47 -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
David Ormsbee
f9f9dbdf53 Merged profile-cache updates 2012-02-21 19:45:05 -05:00
Piotr Mitros
3037a0c8ab Fixed bad commit 2012-02-21 18:36:36 -05:00
Piotr Mitros
d99676432b Rerandomize patch -- untested
--HG--
branch : pmitros-rerandomize
2012-02-21 18:27:37 -05:00
Piotr Mitros
10732cbcc2 Support for sections outside of course.xml 2012-02-21 18:11:19 -05:00
Piotr Mitros
2033b065f0 Merge with subtitles 2012-02-21 18:09:16 -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
b81617e070 Added styles from the sidebar brnach 2012-02-21 17:14:37 -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
David Ormsbee
7e79e9f34a emergency move of askbot settings back into settings.py so staging doesn't blow up 2012-02-21 15:09:45 -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
David Ormsbee
2a5ba5d0c7 Force askbot config to draw all config values from askbotsettings.py, and not hit the database 2012-02-21 14:43:05 -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
Piotr Mitros
024da20b48 Subtitle support working
--HG--
branch : pmitros-subtitles
2012-02-20 20:58:47 -05:00
Kyle Fiedler
36005b0056 Added style for askbot-profile 2012-02-20 17:25:19 -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
Piotr Mitros
2416587c19 Minor cleanup
--HG--
branch : pmitros-section
2012-02-20 16:47:53 -05:00
Piotr Mitros
f83c492720 per-section rendering works, if unclean
--HG--
branch : pmitros-section
2012-02-20 16:35:12 -05:00
Piotr Mitros
086523e0fa Bug in urls file 2012-02-20 16:10:55 -05:00
Piotr Mitros
9812fda559 Minor bug when restarting server with custom tags
This patch has limited testing w.r.t. whether the bug is completely
gone, but it appears to have no negative side effects, and fix at
least one case.
2012-02-20 15:46:31 -05:00
Kyle Fiedler
e844a6f006 Added styles for the profile page in askbot 2012-02-20 15:25:34 -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