Commit Graph

19654 Commits

Author SHA1 Message Date
Bridger Maxwell
216e996982 Tracking now logs to a file including the pid instead of syslog
--HG--
branch : bridger-dev
2012-03-02 14:47:54 -05:00
Bridger Maxwell
4b6681b348 Merged in default
--HG--
branch : bridger-dev
2012-03-02 14:44:05 -05:00
Jean-Michel Claus
407788f8ad Merge 2012-03-02 12:31:12 -05:00
Jean-Michel Claus
42ac1d0e12 Added missing file ocw-hw1.pdf 2012-03-02 12:06:27 -05:00
Ernie Park
0da6c6d6f9 regenerate marketing.css, there was a merge conflict that wasnt resolved previously 2012-03-02 11:13:52 -05:00
Piotr Mitros
d456e6ec69 Symlink for html5 shiv as a short-term pre-ship workaround for a 404 2012-03-01 19:09:07 -05:00
Kyle Fiedler
8ff948a753 Highlight speed after clicked
--HG--
branch : kf-highlight-speed
2012-03-01 17:41:07 -05:00
Bridger Maxwell
8c3c33b7ac Fixed accordion on hidden courseware pages 2012-03-01 17:12:39 -05:00
Kyle Fiedler
c4cebb4f15 Merge heads 2012-03-01 16:23:39 -05:00
Reda Lemeden
6b5b3d5d7b Merge 2012-03-01 16:23:22 -05:00
Kyle Fiedler
95a90a1a9f Merged in kf-profile-graph 2012-03-01 16:23:04 -05:00
Kyle Fiedler
021331054a merged with default
--HG--
branch : kf-profile-graph
2012-03-01 16:22:26 -05:00
Reda Lemeden
d57c80b595 Wiki and Askbot bug fixes 2012-03-01 16:21:40 -05:00
Reda Lemeden
3f09848a05 Fixed article list width bug 2012-03-01 16:21:04 -05:00
Reda Lemeden
41488fa3af Merge 2012-03-01 15:48:22 -05:00
Reda Lemeden
9a109167ca Added badges styling 2012-03-01 15:47:56 -05:00
Ernie Park
4661404cc8 merge
--HG--
branch : ernie-static-fix-ios-video
2012-03-01 15:43:53 -05:00
Ernie Park
6b0655be55 prevent autoplay on iOS devices (which doesnt work anyway). fixes videos so user can click play and it'll play
--HG--
branch : ernie-static-fix-ios-video
2012-03-01 15:43:29 -05:00
Kyle Fiedler
53c8c35bba Added styles for new ie warning 2012-03-01 15:31:23 -05:00
Kyle Fiedler
068e9eadec Adde new warning messages for userers IE8 and under 2012-03-01 15:30:56 -05:00
Kyle Fiedler
5b8f0205bc Minor adjustemnts to the topbar and Mathjax2 2012-03-01 14:27:47 -05:00
Kyle Fiedler
c1c4eabf27 Added fix for tootip styles and fixed top bar issues 2012-03-01 13:40:30 -05:00
Kyle Fiedler
d3460a8ed2 Added fix for tooltips linehight 2012-03-01 13:37:44 -05:00
Kyle Fiedler
c44c9851ed Merged heads 2012-03-01 12:45:34 -05:00
Kyle Fiedler
f885cd85b6 Fix styles for topbar 2012-03-01 12:45:17 -05:00
Bridger Maxwell
ad3fc40290 My last merge wasn't fast enough 2012-03-01 12:33:49 -05:00
Bridger Maxwell
7e64a746e0 Merge 2012-03-01 12:26:09 -05:00
Reda Lemeden
4d53b370d7 Edited the simple wiki templates to allow for more flexibility in title markup + changed the layout of search results 2012-03-01 12:25:26 -05:00
Kyle Fiedler
1987e8a29b tooltip lost styles 2012-03-01 11:39:18 -05:00
Kyle Fiedler
f7996b58f8 added a fix for the wiki topbar 2012-03-01 11:35:32 -05:00
Reda Lemeden
6446972d35 Merge 2012-03-01 10:06:37 -05:00
Reda Lemeden
682a167c65 Changed height and padding for wiki header 2012-03-01 10:00:12 -05:00
David Ormsbee
d60d689611 Merge performance fixes, and rename StudentModule.get_from_cache to get_with_caching 2012-02-29 18:28:18 -05:00
Piotr Mitros
4c16563def Removed long comment; browser bug was rendering part of it 2012-02-29 17:25:14 -05:00
Piotr Mitros
b4540a4803 Merge 2012-02-29 17:16:49 -05:00
Piotr Mitros
cbfe2ae851 Fixed https link 2012-02-29 16:52:01 -05:00
Reda Lemeden
4520b15da9 Removed border from last course chapter in profile 2012-02-29 16:05:50 -05:00
Kyle Fiedler
8b4979065d Added new styles and color for profile graph
--HG--
branch : kf-profile-graph
2012-02-29 15:50:29 -05:00
Reda Lemeden
4a734bf1b5 Fixed wiki history table and header alignment issues 2012-02-29 15:02:37 -05:00
Piotr Mitros
7f68610dac Error in case sensitivity. Applying patch from gjs' machine 2012-02-29 14:22:33 -05:00
Reda Lemeden
919cf9b1da Fixed minor alignment and baseline issues 2012-02-29 13:38:41 -05:00
Reda Lemeden
8bb11c52af Fixed sidebar and question list layout in smaller resolutions 2012-02-29 10:50:19 -05:00
Reda Lemeden
d7fff54080 Removed date sorting and added question excerpts 2012-02-29 10:07:01 -05:00
Reda Lemeden
5942c13b39 Added Wiki navigation icons 2012-02-28 17:32:56 -05:00
Reda Lemeden
7363a2fba0 Merge 2012-02-28 17:30:12 -05:00
Reda Lemeden
37d1ed27e7 Added Wiki navigation icons and styled the article list view 2012-02-28 17:28:49 -05:00
Kyle Fiedler
611b4acf65 Merged in default
--HG--
branch : kf-tooltips
2012-02-28 17:15:13 -05:00
Kyle Fiedler
1628b3e59a Moved jquery ui scss to its own folder
--HG--
branch : kf-tooltips
2012-02-28 17:14:52 -05:00
Kyle Fiedler
1a6f06416b added new tooltips and styles for new tool tips
--HG--
branch : kf-tooltips
2012-02-28 17:13:03 -05:00
Reda Lemeden
bb84687817 Resolved application.css 2012-02-28 10:44:52 -05:00