Commit Graph

65817 Commits

Author SHA1 Message Date
Reda Lemeden
3f7c4ada6d Added tooltip on hover 2012-02-23 17:04:54 -05:00
Reda Lemeden
3439b8f225 Changed sup and sub styling + amplifier label colors 2012-02-23 15:13:11 -05:00
Reda Lemeden
2d6fa27973 Redesigned the profile sidebar and refactored some scss 2012-02-23 14:47:52 -05:00
David Ormsbee
463ba9a1ea merge superflous head I created because I'm an hg newb 2012-02-23 14:47:08 -05:00
David Ormsbee
487407172c merged 2012-02-23 14:40:08 -05:00
David Ormsbee
bd34843036 Add caching for User objects (again) 2012-02-23 14:30:36 -05:00
Bridger Maxwell
13a7d2cb91 Merge in default
--HG--
branch : bridger-dev
2012-02-23 14:28:30 -05:00
David Ormsbee
c5b0115be0 add User object caching 2012-02-23 13:28:00 -05:00
Piotr Mitros
49f86241ed Maximum tracking event is now 10k. We were losing ends of event on the main server with big sessions 2012-02-22 21:21:44 -05:00
Piotr Mitros
09cc7ec35d Tracking now records time 2012-02-22 21:15:25 -05:00
Piotr Mitros
ec4538ac65 Untested patch to eliminate AJAX DB writes
--HG--
branch : pmitros_cut_writes
2012-02-22 21:06:41 -05:00
Reda Lemeden
dd9a82192c merge 2012-02-22 17:13:32 -05:00
Reda Lemeden
9332f63f21 Fixed edit sidebar + comments actions 2012-02-22 17:13:11 -05:00
Kyle Fiedler
84640da40c added slightly darker social icons an hover css 2012-02-22 16:29:16 -05:00
Kyle Fiedler
0d9a8088fb Added slightly darker social icons so that they can have some opacity on hover 2012-02-22 16:28:44 -05:00
Kyle Fiedler
f081b51bf7 Merged captions branch 2012-02-22 16:23:18 -05:00
Kyle Fiedler
b12e4cf36d added new images and styles for social icons in the marketing footer 2012-02-22 16:21:59 -05:00
Kyle Fiedler
6b289871e3 Merged with default
--HG--
branch : kf-captions
2012-02-22 16:21:25 -05:00
Kyle Fiedler
687ae76315 added social icons for marketing pages
--HG--
branch : kf-captions
2012-02-22 16:21:00 -05:00
Piotr Mitros
e18074024e Missing authentication on /info 2012-02-22 15:49:38 -05:00
Kyle Fiedler
bd4190f578 Merged hgeads 2012-02-22 15:26:30 -05:00
Kyle Fiedler
56755618d9 merged heads 2012-02-22 15:04:19 -05:00
Kyle Fiedler
97ac71c88c added closed caption image 2012-02-22 15:03:59 -05:00
Kyle Fiedler
f038ab1402 Merged in with default
--HG--
branch : kf-captions
2012-02-22 15:02:17 -05:00
Piotr Mitros
f7ddb4840c Fixed broken anchors 2012-02-22 15:03:29 -05:00
Reda Lemeden
14b902db78 Merge 2012-02-22 15:02:05 -05:00
Kyle Fiedler
3081cc0189 Added styles and js to hide captions
--HG--
branch : kf-captions
2012-02-22 15:01:56 -05:00
Reda Lemeden
629509739e Styled the un-answered question sharing prompt 2012-02-22 15:01:45 -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
Piotr Mitros
d42198ada9 Rerandomize patch merged 2012-02-22 14:43:34 -05:00
Piotr Mitros
c9bbc54238 Rerandomize per_student/always/never tested and working
--HG--
branch : pmitros-rerandomize
2012-02-22 14:37:51 -05:00
Piotr Mitros
c202d550f5 Merge
--HG--
branch : pmitros-rerandomize
2012-02-22 13:59:21 -05:00
Piotr Mitros
7b27b01642 Default view now info 2012-02-22 13:58:03 -05:00
Piotr Mitros
55c1a4352f Merge in data/static for jmc's stuff 2012-02-22 13:28:14 -05:00
Jean-Michel Claus
3015ed7a81 Removed files from old locations
--HG--
branch : jmclaus-sound-labs
2012-02-22 12:29:55 -05:00
Jean-Michel Claus
2df697a6bb Merge
--HG--
branch : jmclaus-sound-labs
2012-02-22 12:14:47 -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
06fa36cee2 Fix rounded corners on profile 2012-02-22 11:36:49 -05:00
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