Commit Graph

19654 Commits

Author SHA1 Message Date
Kyle Fiedler
70e273db20 Added some more style for course info and profile pages 2012-02-09 15:06:08 -05:00
Bridger Maxwell
a8a01ce942 Cleaning up profile to output better lists
--HG--
branch : templates-profilecleanup
2012-02-09 14:55:40 -05:00
Bridger Maxwell
fd7f229ae1 Cleaning up profile to output better lists
--HG--
branch : mitx-profilecleanup
2012-02-09 14:55:20 -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
e012f18f43 Styled calc 2012-02-09 11:10:48 -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
ea39249566 Disabled wikipath markdown extension, as it requires markdown 2.1.0, and we are running 2.0.3 2012-02-08 22:20:46 -05:00
Bridger Maxwell
b1377f6c4e Merge. Also, for last commit I added sorting to the wiki 'all articles' but forgot to put it into commit message. 2012-02-08 21:40:27 -05:00
Bridger Maxwell
159af57995 Removed codehilite from wiki. It was throwing errors and wasn't used. Should be fixed later? 2012-02-08 21:37:24 -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
9a9b417a11 Close static_ernie_leanmodal_closebox
--HG--
extra : close : 1
2012-02-08 16:48:56 -05:00
Kyle Fiedler
67111de077 Merged in static_ernie_leanmodal_closebox 2012-02-08 16:48:41 -05:00
Kyle Fiedler
bb36854939 Nex css for leanmodal x
--HG--
branch : static_ernie_leanmodal_closebox
2012-02-08 16:47:59 -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
Kyle Fiedler
eef3b62c37 Added new styles for closeing side bar and new icons
--HG--
branch : static-close_sidebar
2012-02-08 16:35:25 -05:00
Kyle Fiedler
75f0872ea9 Merged with default
--HG--
branch : close_sidebar
2012-02-08 16:33:28 -05:00
Kyle Fiedler
5cf7d9ab8c Added more styles for the slider
--HG--
branch : close_sidebar
2012-02-08 16:32:48 -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
d7c7b3fb7d merge with default and resolve application.css
--HG--
branch : static_ernie_leanmodal_closebox
2012-02-08 15:53:23 -05:00
Ernie Park
f63731dad5 another change to the css file
--HG--
branch : static_ernie_leanmodal_closebox
2012-02-08 15:52:28 -05:00
Ernie Park
00e79f04d7 merge with default
--HG--
branch : templates_ernie_leanmodal_closebox
2012-02-08 15:51:32 -05:00
Ernie Park
9a1f8a9e1a update leanmodal css and js to have close box
--HG--
branch : static_ernie_leanmodal_closebox
2012-02-08 15:49:57 -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
d470bc53eb Merge with head 2012-02-08 14:34:00 -05:00
Reda Lemeden
527152387b Redesigned the new question view i Askbot mitx-skin 2012-02-08 14:33:44 -05:00
Reda Lemeden
e26a8059ce Merge with head 2012-02-08 14:31:24 -05:00
Reda Lemeden
e34954f458 Redesigned the new question view 2012-02-08 14:30:55 -05:00
David Ormsbee
51a8160a6a lower minimum rep for many basic askbot actions (leaving comments, reopening questions, etc) 2012-02-08 14:30:18 -05:00
Kyle Fiedler
3636bb4755 merged with default
--HG--
branch : kf-login-errors
2012-02-08 13:54:42 -05:00
Kyle Fiedler
fd0023448f Added new styles for errors and added flash to show the user resubmitted the form
--HG--
branch : kf-login-errors
2012-02-08 13:54:08 -05:00
Piotr Mitros
73388094c1 Merge 2012-02-08 13:01:43 -05:00
Piotr Mitros
59e1f5a50a Account already active is there 2012-02-08 13:01:21 -05:00
Piotr Mitros
c3598c6b95 Account already active is there 2012-02-08 13:01:13 -05:00
Reda Lemeden
26d6cd06f3 Added and upvote arrow icon 2012-02-08 12:53:29 -05:00
Reda Lemeden
a4b86d1766 Merge with head 2012-02-08 12:52:23 -05:00
Reda Lemeden
46e2cfcfd5 Centerred the comment upvote icon 2012-02-08 12:52:10 -05:00
Reda Lemeden
9312e71e68 Fixed the upvote class in the Javascript and the vote count rotation issue 2012-02-08 12:49:33 -05:00
Piotr Mitros
72720d19dd Missing p tag 2012-02-08 11:54:10 -05:00
Piotr Mitros
b9700bf3e7 Merge 2012-02-08 11:50:29 -05:00
Piotr Mitros
380d279ddf Updated legal 2012-02-08 11:47:49 -05:00