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 |
|
Ernie Park
|
042e1fdf8c
|
remove fancybox references for css/js
|
2012-01-26 11:27:42 -05:00 |
|
Reda Lemeden
|
5d257f7d03
|
Merge with Head
|
2012-01-26 09:37:31 -05:00 |
|
Reda Lemeden
|
41e1415aa9
|
New question list stylesheet
|
2012-01-26 09:36:38 -05:00 |
|
Ernie Park
|
a02f9c65b5
|
remove _fancybox.scss, no longer needed
|
2012-01-26 00:17:00 -05:00 |
|
Ernie Park
|
53b121d9c9
|
use © rather than (c)
|
2012-01-25 23:27:52 -05:00 |
|
Ernie Park
|
242b201047
|
merge heads
|
2012-01-25 23:13:24 -05:00 |
|
Ernie Park
|
20f605ebc5
|
move duplicate code in static marketing sites to marketing.html block templates
|
2012-01-25 23:13:10 -05:00 |
|
Bridger Maxwell
|
75f6002fac
|
Added instructions to wiki edit and create pages.
|
2012-01-25 20:23:14 -05:00 |
|
Bridger Maxwell
|
b5167fe816
|
Added instructions to wiki edit and create pages.
|
2012-01-25 20:22:54 -05:00 |
|
Bridger Maxwell
|
f582e49aaf
|
Merged in the extra head. Replaced files with newly generated ones.
|
2012-01-25 19:31:00 -05:00 |
|
Bridger Maxwell
|
c68f6fc7df
|
Merge
|
2012-01-25 19:28:44 -05:00 |
|
Bridger Maxwell
|
2c533bddbf
|
Added editing instructions on the wiki edit page.
|
2012-01-25 19:27:14 -05:00 |
|
Bridger Maxwell
|
c17ca29a29
|
Added editing instructions on the wiki edit page.
|
2012-01-25 19:26:54 -05:00 |
|
David Ormsbee
|
63cb53c919
|
Move logging config, add tracking info to console, remove logging tests.
|
2012-01-25 16:30:32 -05:00 |
|
Reda Lemeden
|
9c1dc60b77
|
Merge
|
2012-01-25 15:10:40 -05:00 |
|
Reda Lemeden
|
33b5c87126
|
Styled the tabula rasa buttons
|
2012-01-25 15:09:45 -05:00 |
|
Kyle Fiedler
|
cc64762653
|
Clean up on marketing styles
|
2012-01-25 15:00:58 -05:00 |
|
Kyle Fiedler
|
c9ae9f27d6
|
Sass compile
|
2012-01-25 14:44:18 -05:00 |
|
Kyle Fiedler
|
b2e1ba7474
|
Manualy switch over some styles from Fancybox to leanbox
|
2012-01-25 14:43:49 -05:00 |
|
Ernie Park
|
e025165010
|
merge
|
2012-01-25 14:20:06 -05:00 |
|
Kyle Fiedler
|
b5e40a695e
|
Merge
|
2012-01-25 14:19:13 -05:00 |
|
Kyle Fiedler
|
94f0b58bc7
|
started fixing layout problems
|
2012-01-25 14:15:53 -05:00 |
|
Reda Lemeden
|
589aa6bafc
|
Merge with head
|
2012-01-25 14:13:12 -05:00 |
|
Ernie Park
|
1114057818
|
fix merge issues in css, fancybox vs leanmodal
|
2012-01-25 14:10:03 -05:00 |
|