Commit Graph

10188 Commits

Author SHA1 Message Date
Reda Lemeden
bd2e82c28b Styled the question order sort 2012-01-25 14:09:38 -05:00
Piotr Mitros
f6ad9d51b4 Merge 2012-01-25 14:00:01 -05:00
Piotr Mitros
fb2f4b6c1a Incomplete file added to sync between computers 2012-01-25 13:59:45 -05:00
Ernie Park
e3885b0f29 updated css files for leanmodal AFTER pulling and updating template scss from remote 2012-01-25 13:51:41 -05:00
Ernie Park
7adda62fc7 fix merge 2012-01-25 13:45:28 -05:00
Ernie Park
5eab8ba70b switch from fancybox to leanmodal and update .hgignore 2012-01-25 13:43:09 -05:00
Ernie Park
831287863d switch from fancybox to leanmodal CSS 2012-01-25 13:04:45 -05:00
Kyle Fiedler
ca8308503e Compiled sass 2012-01-25 12:39:46 -05:00
Kyle Fiedler
c1543c7f49 Added new styles for errors 2012-01-25 12:39:24 -05:00
Reda Lemeden
9f433c1786 Fixed the sidebar layout issue in the discussion page 2012-01-25 12:32:20 -05:00
Reda Lemeden
55deb0d4a2 Fixed the sidebar layout issue in the discussion page 2012-01-25 12:32:09 -05:00
Kyle Fiedler
ff1ee559c4 Merge 2012-01-25 12:30:35 -05:00
Kyle Fiedler
d5ce30761a Fixed bugs in IE8 2012-01-25 12:30:11 -05:00
Bridger Maxwell
7033359cc8 Merge with wiki branch (make sure to update mitx too). 2012-01-25 11:44:50 -05:00
Bridger Maxwell
077603bb9e Merge with wiki branch (make sure to update templates too). 2012-01-25 11:44:12 -05:00
Bridger Maxwell
08e7d06931 Fixed bug for first article creation.
--HG--
branch : bridgerwiki
2012-01-25 11:43:13 -05:00
Reda Lemeden
c45c1e1048 Made the header and footer wrappers fixed width 2012-01-25 11:40:42 -05:00
Bridger Maxwell
60e9b91049 Fixed wording for deleted page error.
--HG--
branch : bridgerwiki
2012-01-25 11:40:00 -05:00
Reda Lemeden
b977901a6e Made the header and footer wrappers fixed width 2012-01-25 11:39:25 -05:00
Kyle Fiedler
29fd55600d Fixed problem in with reset password on lightbox 2012-01-25 10:43:15 -05:00
Kyle Fiedler
83ab19011f Compiled sass 2012-01-25 10:20:26 -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
614f156640 Added UI for locking article. Did more testing/bug fixes on deletion. Seems stable.
--HG--
branch : bridgerwiki
2012-01-24 20:56:12 -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
Piotr Mitros
5a5e65a918 Related bug fixed 2012-01-24 20:18:20 -05:00
Piotr Mitros
d0c8722da4 Revert reversed. Database insert vs. update bug fixed 2012-01-24 20:16:06 -05:00
Bridger Maxwell
8f124e174b Got deletion working.
--HG--
branch : bridgerwiki
2012-01-24 20:14:42 -05:00
Bridger Maxwell
056924ad6f Got most of deleting working.
--HG--
branch : bridgerwiki
2012-01-24 20:05:14 -05:00
Reda Lemeden
90cbeb73c0 Added new Askbot theme 2012-01-24 17:27:48 -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
1a80cf2b8d Compiled sass 2012-01-24 17:05:29 -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
Bridger Maxwell
b3797a41f3 Got most of admin deleting and user deleting implemented. Need to work on interface for encountering deleted articles.
--HG--
branch : bridgerwiki
2012-01-24 15:58:22 -05:00
Kyle Fiedler
e60a20736c Sass compile 2012-01-24 15:51:30 -05:00
Kyle Fiedler
a761ebf647 Style for sub pages before the login screen 2012-01-24 15:50:49 -05:00
Piotr Mitros
98efb8c005 Tab type missing in list of modules 2012-01-24 15:42:52 -05:00
Piotr Mitros
8b4efadfd8 Profile page path issue 2012-01-24 14:54:52 -05:00
Piotr Mitros
7971a02832 Previous change introduced a bug where Django's ORM would insert instead of update. Momentary revert. 2012-01-24 13:58:02 -05:00
Piotr Mitros
94a5c75088 Stage still needs old Askbot. Broken schema migrations. 2012-01-24 11:55:51 -05:00
Kyle Fiedler
3d39a7ac76 compiled css 2012-01-24 11:36:45 -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
Piotr Mitros
acafd3f66c Nasty bug fixes in when we can render. Need to apply to vertical too 2012-01-23 23:38:02 -05:00
Piotr Mitros
f3eb22e0e9 working on import issues 2012-01-23 23:24:30 -05:00