Commit Graph

357 Commits

Author SHA1 Message Date
Kyle Fiedler
b30dc6fed6 Hide footer links for activation pages 2012-02-13 15:09:57 -05:00
Kyle Fiedler
c5772894bd Merge 2012-02-13 14:02:06 -05:00
Kyle Fiedler
89fbab77f7 Fixed links and added them to other pages 2012-02-13 14:01:52 -05:00
Piotr Mitros
1366afcfc1 Minor bug fixes 2012-02-13 13:52:23 -05:00
Kyle Fiedler
fdcb58489a Added link to homepage and course page on acctivation 2012-02-13 12:17:35 -05:00
Piotr Mitros
5835fd6eeb MITx italics 2012-02-13 00:43:08 -05:00
Piotr Mitros
fd086c1c63 Minor wordsmithing, etc. 2012-02-12 20:25:37 -05:00
Piotr Mitros
812e137cf3 More wordsmithing 2012-02-12 11:17:50 -05:00
Piotr Mitros
25d4d2a760 Updated honor code 2012-02-12 09:35:51 -05:00
Piotr Mitros
f4f37a94ea Updated honor code 2012-02-12 09:34:42 -05:00
Piotr Mitros
97f124f7bd Blocks to get rid of login buttons, TOS tweak 2012-02-10 19:12:17 -05:00
Kyle Fiedler
389b53b742 merge heads 2012-02-10 16:45:49 -05:00
Kyle Fiedler
b2b05fdd93 Date change again 2012-02-10 16:45:26 -05:00
Kyle Fiedler
a4e57aeb47 Made changes to Anants three pages 2012-02-10 16:44:30 -05:00
Piotr Mitros
c50cae3d93 Merge, minor correction to e-mail 2012-02-10 12:26:44 -05:00
Kyle Fiedler
3bab1336f2 merge heads 2012-02-10 11:19:55 -05:00
Kyle Fiedler
6779e9b45e Added screen fix for smaller screens on secondary pages 2012-02-10 11:19:41 -05:00
David Ormsbee
2359de96eb Replace hardcoded url in password reset notification email with site name (from django_site table) 2012-02-10 11:15:18 -05:00
Kyle Fiedler
3c7dc27259 Fixed probelms with layout of three new pages and made small chages requested by Anant 2012-02-10 11:02:50 -05:00
Piotr Mitros
ad2989f4a6 Fixed unescaped unicode characters 2012-02-09 21:24:21 -05:00
Piotr Mitros
bb91ab2a54 More minor word tweaks 2012-02-09 21:06:37 -05:00
Piotr Mitros
e844c63171 Minor tweaks to e-mail templates 2012-02-09 20:55:38 -05:00
Kyle Fiedler
5881c84c47 Added links to the mitx page 2012-02-09 18:09:37 -05:00
Kyle Fiedler
372a987577 Added anats static pages 2012-02-09 18:04:56 -05:00
Kyle Fiedler
96176090d3 Merge 2012-02-09 18:03:22 -05:00
Kyle Fiedler
a3dbdb9512 Added anats static pages 2012-02-09 18:03:06 -05:00
Reda Lemeden
343225a355 Merge with Head 2012-02-09 15:56:56 -05:00
Reda Lemeden
254e806ac5 Fixed the footer and the sidebar 2012-02-09 15:56:21 -05:00
Kyle Fiedler
b605dfc3b5 Flashes error message for all forms on sign up 2012-02-09 15:51:04 -05:00
Kyle Fiedler
930963f667 Merged heads 2012-02-09 15:20:54 -05:00
Bridger Maxwell
4e2ac787e0 Changed instructions for wikipath extension 2012-02-09 15:18:38 -05:00
Kyle Fiedler
70e273db20 Added some more style for course info and profile pages 2012-02-09 15:06:08 -05:00
Kyle Fiedler
8b6188b9bf merged in login errors branch 2012-02-09 12:28:02 -05:00
Kyle Fiedler
261c9b1551 Added link to create a new account on login modal and added styles for that too
--HG--
branch : kf-login-errors
2012-02-09 12:27:06 -05:00
Kyle Fiedler
bd523c2e9a Merged in with default
--HG--
branch : kf-login-errors
2012-02-09 12:07:17 -05:00
Kyle Fiedler
aeb5357e0e added more style to enroll buttons
--HG--
branch : kf-login-errors
2012-02-09 12:06:52 -05:00
Kyle Fiedler
feb383fd7b Merge heads 2012-02-09 11:10:21 -05:00
Kyle Fiedler
28d3275724 Refactored html for calc and restyled 2012-02-09 11:09:59 -05:00
Bridger Maxwell
0585fd43fe Changed editing instruction to not have wiki: shortcut, as that is incompatible right now. 2012-02-08 22:21:33 -05:00
Bridger Maxwell
acab3d2ee9 Changed article creation to *not* create child articles 2012-02-08 18:41:48 -05:00
Kyle Fiedler
78b198e359 Close templates_ernie_leanmodal_closebox
--HG--
extra : close : 1
2012-02-08 16:49:14 -05:00
Kyle Fiedler
63eeea6983 Merged in templates_ernie_leanmodal_closebox 2012-02-08 16:47:27 -05:00
Kyle Fiedler
30518d2f45 Merged with default
--HG--
branch : templates_ernie_leanmodal_closebox
2012-02-08 16:47:00 -05:00
Kyle Fiedler
42b9898572 Edited styles for the leanmodal x
--HG--
branch : templates_ernie_leanmodal_closebox
2012-02-08 16:46:41 -05:00
Reda Lemeden
7cb316e983 Merge with Head 2012-02-08 16:10:24 -05:00
Reda Lemeden
8b48c8b410 Added answer controls 2012-02-08 16:09:59 -05:00
Ernie Park
00e79f04d7 merge with default
--HG--
branch : templates_ernie_leanmodal_closebox
2012-02-08 15:51:32 -05:00
Ernie Park
a2f1928404 update leanmodal scss and add feedback for reset password in profile
--HG--
branch : templates_ernie_leanmodal_closebox
2012-02-08 15:49:10 -05:00
Piotr Mitros
e612572bad MITX -> MITx 2012-02-08 14:39:22 -05:00
Reda Lemeden
e26a8059ce Merge with head 2012-02-08 14:31:24 -05:00