Commit Graph

14212 Commits

Author SHA1 Message Date
Kyle Fiedler
a58d36bff9 Fixed conflicts 2012-01-27 16:12:11 -05:00
Kyle Fiedler
0510e96a2e merge 2012-01-27 16:09:07 -05:00
Kyle Fiedler
2676c55ea7 added new index shot, fonts and generated css 2012-01-27 16:08:46 -05:00
Kyle Fiedler
ccafe302be refactor some of the index html 2012-01-27 16:08:03 -05:00
Kyle Fiedler
0dc1465248 Change fonts to link to our server 2012-01-27 16:05:17 -05:00
Ernie Park
92e5cff869 clean up video files, use native controls and have HTML5 fallback 2012-01-27 14:40:16 -05:00
Kyle Fiedler
e0299cd6de Styled textbook navigation 2012-01-27 14:04:18 -05:00
cjt
cc40a3c049 updated schematic tool files 2012-01-27 12:47:06 -05:00
Bridger Maxwell
4f15258597 Changed behavior of due date tagger to be more like downward inheritance
--HG--
branch : profiledev
2012-01-27 12:39:55 -05:00
Kyle Fiedler
7362253824 New video icon 2012-01-27 12:08:58 -05:00
Kyle Fiedler
f7ca1a5b21 Added new video icon 2012-01-27 12:04:31 -05:00
David Ormsbee
efdaa04742 convert more prints to logging 2012-01-27 10:57:36 -05:00
Reda Lemeden
f0a4ae55c5 Merge with head 2012-01-27 10:22:29 -05:00
Reda Lemeden
b8bc5201ac new question list layout 2012-01-27 10:21:53 -05:00
Kyle Fiedler
74d228a9b2 Compiled css 2012-01-26 21:52:39 -05:00
Kyle Fiedler
1a04693e63 Added wiki basic html and search styles 2012-01-26 21:51:18 -05:00
Kyle Fiedler
d2595b91a3 merge 2012-01-26 20:30:14 -05:00
Kyle Fiedler
e76d7ad3b3 icons 2012-01-26 20:28:25 -05:00
David Ormsbee
ab00c78886 merging hgignore changes 2012-01-26 19:08:17 -05:00
David Ormsbee
e5ca9618ea remove /login from tracking logs so we don't capture passwords 2012-01-26 19:05:52 -05:00
Bridger Maxwell
3eceb8a920 Merge 2012-01-26 19:04:02 -05:00
Bridger Maxwell
fa63a17a14 Added due date pre-processor
--HG--
branch : profiledev
2012-01-26 19:03:11 -05:00
Bridger Maxwell
978752ad98 The default is now the new askbot. Switch over. 2012-01-26 19:02:38 -05:00
Kyle Fiedler
32f5f10b7a Added ingnore file 2012-01-26 18:12:14 -05:00
Kyle Fiedler
a78df52d74 Compiled sass and new images 2012-01-26 18:02:55 -05:00
Kyle Fiedler
0708f8d03f Merge conflicts 2012-01-26 18:00:28 -05:00
Kyle Fiedler
8b2109ab46 Merge in video layout 2012-01-26 17:55:02 -05:00
Kyle Fiedler
e59f3ed206 More styles for sequence
--HG--
branch : kf-video-layout
2012-01-26 17:52:13 -05:00
Kyle Fiedler
7e86b8384b Added more sequence styles
--HG--
branch : kf-video-layout
2012-01-26 17:33:20 -05:00
David Ormsbee
79c1cf19a0 typo in login error 2012-01-26 16:35:04 -05:00
Ernie Park
6464895847 remove nbsp from empty subtitle li's so it pushes up to the top 2012-01-26 16:25:53 -05:00
David Ormsbee
cb77b9d316 merge logging changes 2012-01-26 15:05:43 -05:00
David Ormsbee
cf210ea171 switch tracking to use logger 2012-01-26 15:03:19 -05:00
Kyle Fiedler
f2a748e4a6 Added some style for video sequence made topbar extend better
--HG--
branch : kf-video-layout
2012-01-26 14:54:00 -05:00
Piotr Mitros
475f30a206 Symlinks needed for Askbot 2012-01-26 14:41:42 -05:00
Piotr Mitros
13482e2f91 Merge 2012-01-26 14:29:14 -05:00
Piotr Mitros
a6ca113a37 Fixed bad link on help.html 2012-01-26 14:28:57 -05:00
Piotr Mitros
fd8b1e50c2 Staging new Askbot, some work on completion framework 2012-01-26 14:26:44 -05:00
Kyle Fiedler
7cfc50fae8 Video scss refactor
--HG--
branch : kf-video-layout
2012-01-26 14:16:51 -05:00
Kyle Fiedler
57d129a3cf Start to fix video layout
--HG--
branch : kf-video-layout
2012-01-26 14:16:27 -05:00
David Ormsbee
fd79da9a7a added some sample logging to login process 2012-01-26 13:50:21 -05:00
Ernie Park
7c12d9c2be merge 2012-01-26 13:19:35 -05:00
Ernie Park
2ba88b53c7 update marketing template blocks, smarter and takes in just a class for header, fixes bug with no picture for mitx_global page 2012-01-26 13:19:22 -05:00
Ernie Park
d440da8f69 merge 2012-01-26 13:04:49 -05:00
Ernie Park
3bb18ec02d compiled sass 2012-01-26 13:04:30 -05:00
Kyle Fiedler
5188826e1a fix more minor things with the layout 2012-01-26 12:59:26 -05:00
Bridger Maxwell
b653c4f2a5 Added styling for alternating wiki history rows. 2012-01-26 12:52:02 -05:00
Bridger Maxwell
dd6c6e540f Added styling for alternating wiki history rows. 2012-01-26 12:51:49 -05:00
David Ormsbee
a7e746d332 Merge 2012-01-26 12:36:11 -05:00
Bridger Maxwell
1bea71a459 Added ignore for DS_Store files. 2012-01-26 12:13:51 -05:00