Bridger Maxwell
|
7033359cc8
|
Merge with wiki branch (make sure to update mitx too).
|
2012-01-25 11:44:50 -05:00 |
|
Bridger Maxwell
|
60e9b91049
|
Fixed wording for deleted page error.
--HG--
branch : bridgerwiki
|
2012-01-25 11:40:00 -05:00 |
|
Kyle Fiedler
|
6d3e6827c9
|
Commented out overiding base styles from askbot and addes style for links in course pages
|
2012-01-25 10:19:23 -05:00 |
|
Bridger Maxwell
|
92196110ad
|
Added UI for locking article. Did more testing/bug fixes on deletion. Seems stable.
--HG--
branch : bridgerwiki
|
2012-01-24 20:56:02 -05:00 |
|
Bridger Maxwell
|
8f124e174b
|
Got deletion working.
--HG--
branch : bridgerwiki
|
2012-01-24 20:14:42 -05:00 |
|
Reda Lemeden
|
e9fd04d545
|
Resolve application.css conflict
|
2012-01-24 17:19:08 -05:00 |
|
Reda Lemeden
|
071dc14d4f
|
Added a discussion stylesheet and the original sass file
|
2012-01-24 17:11:10 -05:00 |
|
Kyle Fiedler
|
ef22943597
|
Make all MITx italic
|
2012-01-24 17:04:50 -05:00 |
|
Kyle Fiedler
|
c0a61a55ca
|
add some style to fix bloated type
|
2012-01-24 16:23:08 -05:00 |
|
Kyle Fiedler
|
a761ebf647
|
Style for sub pages before the login screen
|
2012-01-24 15:50:49 -05:00 |
|
Kyle Fiedler
|
23b5cf6691
|
Added new style and html for honor code on enroll form
|
2012-01-24 11:32:39 -05:00 |
|
Kyle Fiedler
|
2eb6fd0469
|
Added some styles for help
|
2012-01-24 10:34:42 -05:00 |
|
Kyle Fiedler
|
b2bcf6b2ac
|
Fixed change language and location bugs
|
2012-01-24 10:27:46 -05:00 |
|
Kyle Fiedler
|
ce6b84196c
|
merge
|
2012-01-24 09:53:48 -05:00 |
|
Kyle Fiedler
|
9a527344f4
|
started to fix javascript issues
|
2012-01-24 09:51:58 -05:00 |
|
Reda Lemeden
|
8b3acb3448
|
Added a discussion stylesheet and linked to it in application.scss
|
2012-01-24 09:20:38 -05:00 |
|
Bridger Maxwell
|
07f328f67f
|
merge
|
2012-01-23 18:12:42 -05:00 |
|
Bridger Maxwell
|
7200ca0d0c
|
Update to simplewiki
|
2012-01-23 18:12:29 -05:00 |
|
Piotr Mitros
|
25cb46731d
|
Sequential module stores position. Basic groundwork to make video module do the same
|
2012-01-23 09:16:35 -05:00 |
|
Piotr Mitros
|
a2f83751b3
|
Placeholders for TOS, copyright, privacy, honor code
|
2012-01-20 14:57:52 -05:00 |
|
cjt
|
70424b1c92
|
lab support
|
2012-01-20 14:13:20 -05:00 |
|
Piotr Mitros
|
b05d2ce5df
|
Slight error in last commit. Wrong version of main
|
2012-01-20 10:22:45 -05:00 |
|
Piotr Mitros
|
da6c0613f1
|
Added print.css
|
2012-01-20 10:17:33 -05:00 |
|
fischerl
|
099be2fed7
|
merge
|
2012-01-20 00:33:10 -05:00 |
|
fischerl
|
a40d8f08df
|
textbook index fixed
|
2012-01-20 00:32:27 -05:00 |
|
Kyle Fiedler
|
9b0136f1ca
|
shorted hieght of header on course page
|
2012-01-19 22:50:30 -05:00 |
|
Kyle Fiedler
|
cb9a923747
|
edit max width so its not choppy
|
2012-01-19 22:27:50 -05:00 |
|
Kyle Fiedler
|
45a9bda33f
|
added fix for firefox
|
2012-01-19 22:25:27 -05:00 |
|
Kyle Fiedler
|
b7e9aff117
|
Added js back in after breaking login
|
2012-01-19 17:09:50 -05:00 |
|
Kyle Fiedler
|
106b56a4fe
|
added more styles for the marketing pages
|
2012-01-19 16:59:09 -05:00 |
|
Kyle Fiedler
|
7ec5dfaef9
|
Merge
|
2012-01-19 15:42:11 -05:00 |
|
Kyle Fiedler
|
eb71eaa1d8
|
Changed around most of the marketing styles and updated the content
|
2012-01-19 15:40:06 -05:00 |
|
fischerl
|
c310c37247
|
half-done textbook updates
|
2012-01-19 08:50:51 -05:00 |
|
Bridger Maxwell
|
cf9364fe1c
|
Merge
|
2012-01-18 09:41:24 -05:00 |
|
Bridger Maxwell
|
ea15a5629a
|
Changes to simplewiki reverse URL lookup
|
2012-01-18 09:41:07 -05:00 |
|
Piotr Mitros
|
2d08b32140
|
Course info
|
2012-01-17 21:28:55 -05:00 |
|
Ernie Park
|
972001d3e9
|
merge
|
2012-01-16 16:25:05 -05:00 |
|
Ernie Park
|
fb9d4fe2a8
|
merge changes
|
2012-01-16 16:24:48 -05:00 |
|
Piotr Mitros
|
c05ecb4747
|
merge
|
2012-01-14 00:09:53 -05:00 |
|
Piotr Mitros
|
1bd924bef1
|
Sequence steps logged
|
2012-01-14 00:09:31 -05:00 |
|
pmitros
|
ea603775ca
|
Making 6.002 page main, moving static pages into static page framework
--HG--
rename : courseinfo.html => index.html
rename : index.html => mitx_global.html
|
2012-01-13 16:57:02 -08:00 |
|
Ernie Park
|
089b51589a
|
move html5 iframe stylings to sass file
|
2012-01-13 13:35:38 -05:00 |
|
Kyle Fiedler
|
83c8fb8422
|
Styled log in popover
|
2012-01-12 17:18:58 -05:00 |
|
Kyle Fiedler
|
dab31a37be
|
merged design branch
|
2012-01-12 17:04:50 -05:00 |
|
Kyle Fiedler
|
3fdfe3a39d
|
removed all my old sass cache files
--HG--
branch : kf-homepage
|
2012-01-12 17:03:39 -05:00 |
|
Kyle Fiedler
|
f0511986b0
|
Added more style for the marketing pages
--HG--
branch : kf-homepage
|
2012-01-12 17:03:00 -05:00 |
|
Ernie Park
|
0ce7d742a2
|
add .scssc to hgignore
|
2012-01-12 10:38:39 -05:00 |
|
Ernie Park
|
5e9c29654e
|
merging html5 video stuff in
|
2012-01-12 10:03:20 -05:00 |
|
Ernie Park
|
a1cb0b0a4e
|
enable HTML5 fallback for non-flash enabled browsers and fix transparency issue in flash
|
2012-01-11 16:05:03 -05:00 |
|
Bridger Maxwell
|
f5bcc41bfd
|
Changed names to match url pattern in urls.py
--HG--
branch : kf-homepage
|
2012-01-11 15:51:51 -05:00 |
|