Commit Graph

  • ccafe302be refactor some of the index html Kyle Fiedler 2012-01-27 16:08:03 -05:00
  • 0dc1465248 Change fonts to link to our server Kyle Fiedler 2012-01-27 16:05:17 -05:00
  • 92e5cff869 clean up video files, use native controls and have HTML5 fallback Ernie Park 2012-01-27 14:40:16 -05:00
  • e0299cd6de Styled textbook navigation Kyle Fiedler 2012-01-27 14:04:18 -05:00
  • cc40a3c049 updated schematic tool files cjt 2012-01-27 12:47:06 -05:00
  • 4f15258597 Changed behavior of due date tagger to be more like downward inheritance Bridger Maxwell 2012-01-27 12:39:55 -05:00
  • 7362253824 New video icon Kyle Fiedler 2012-01-27 12:08:58 -05:00
  • f7ca1a5b21 Added new video icon Kyle Fiedler 2012-01-27 12:04:31 -05:00
  • efdaa04742 convert more prints to logging David Ormsbee 2012-01-27 10:57:36 -05:00
  • f0a4ae55c5 Merge with head Reda Lemeden 2012-01-27 10:22:29 -05:00
  • b8bc5201ac new question list layout Reda Lemeden 2012-01-27 10:21:53 -05:00
  • 74d228a9b2 Compiled css Kyle Fiedler 2012-01-26 21:52:39 -05:00
  • 1a04693e63 Added wiki basic html and search styles Kyle Fiedler 2012-01-26 21:51:18 -05:00
  • d2595b91a3 merge Kyle Fiedler 2012-01-26 20:30:14 -05:00
  • e76d7ad3b3 icons Kyle Fiedler 2012-01-26 20:28:25 -05:00
  • ab00c78886 merging hgignore changes David Ormsbee 2012-01-26 19:08:17 -05:00
  • e5ca9618ea remove /login from tracking logs so we don't capture passwords David Ormsbee 2012-01-26 19:05:52 -05:00
  • 3eceb8a920 Merge Bridger Maxwell 2012-01-26 19:04:02 -05:00
  • fa63a17a14 Added due date pre-processor Bridger Maxwell 2012-01-26 19:03:11 -05:00
  • 978752ad98 The default is now the new askbot. Switch over. Bridger Maxwell 2012-01-26 19:02:38 -05:00
  • 32f5f10b7a Added ingnore file Kyle Fiedler 2012-01-26 18:12:14 -05:00
  • a78df52d74 Compiled sass and new images Kyle Fiedler 2012-01-26 18:02:55 -05:00
  • 0708f8d03f Merge conflicts Kyle Fiedler 2012-01-26 18:00:28 -05:00
  • 8b2109ab46 Merge in video layout Kyle Fiedler 2012-01-26 17:55:02 -05:00
  • e59f3ed206 More styles for sequence Kyle Fiedler 2012-01-26 17:52:13 -05:00
  • 7e86b8384b Added more sequence styles Kyle Fiedler 2012-01-26 17:33:20 -05:00
  • 79c1cf19a0 typo in login error David Ormsbee 2012-01-26 16:35:04 -05:00
  • 6464895847 remove nbsp from empty subtitle li's so it pushes up to the top Ernie Park 2012-01-26 16:25:53 -05:00
  • cb77b9d316 merge logging changes David Ormsbee 2012-01-26 15:05:43 -05:00
  • cf210ea171 switch tracking to use logger David Ormsbee 2012-01-26 15:03:19 -05:00
  • f2a748e4a6 Added some style for video sequence made topbar extend better Kyle Fiedler 2012-01-26 14:54:00 -05:00
  • 475f30a206 Symlinks needed for Askbot Piotr Mitros 2012-01-26 14:41:42 -05:00
  • 13482e2f91 Merge Piotr Mitros 2012-01-26 14:29:14 -05:00
  • a6ca113a37 Fixed bad link on help.html Piotr Mitros 2012-01-26 14:28:57 -05:00
  • fd8b1e50c2 Staging new Askbot, some work on completion framework Piotr Mitros 2012-01-26 14:26:44 -05:00
  • 7cfc50fae8 Video scss refactor Kyle Fiedler 2012-01-26 14:16:51 -05:00
  • 57d129a3cf Start to fix video layout Kyle Fiedler 2012-01-26 14:16:27 -05:00
  • fd79da9a7a added some sample logging to login process David Ormsbee 2012-01-26 13:50:21 -05:00
  • 7c12d9c2be merge Ernie Park 2012-01-26 13:19:35 -05:00
  • 2ba88b53c7 update marketing template blocks, smarter and takes in just a class for header, fixes bug with no picture for mitx_global page Ernie Park 2012-01-26 13:19:22 -05:00
  • d440da8f69 merge Ernie Park 2012-01-26 13:04:49 -05:00
  • 3bb18ec02d compiled sass Ernie Park 2012-01-26 13:04:30 -05:00
  • 5188826e1a fix more minor things with the layout Kyle Fiedler 2012-01-26 12:59:26 -05:00
  • b653c4f2a5 Added styling for alternating wiki history rows. Bridger Maxwell 2012-01-26 12:52:02 -05:00
  • dd6c6e540f Added styling for alternating wiki history rows. Bridger Maxwell 2012-01-26 12:51:49 -05:00
  • a7e746d332 Merge David Ormsbee 2012-01-26 12:36:11 -05:00
  • 1bea71a459 Added ignore for DS_Store files. Bridger Maxwell 2012-01-26 12:13:51 -05:00
  • 042e1fdf8c remove fancybox references for css/js Ernie Park 2012-01-26 11:27:42 -05:00
  • 5d257f7d03 Merge with Head Reda Lemeden 2012-01-26 09:37:31 -05:00
  • 41e1415aa9 New question list stylesheet Reda Lemeden 2012-01-26 09:36:38 -05:00
  • a02f9c65b5 remove _fancybox.scss, no longer needed Ernie Park 2012-01-26 00:17:00 -05:00
  • 53b121d9c9 use © rather than (c) Ernie Park 2012-01-25 23:27:52 -05:00
  • 242b201047 merge heads Ernie Park 2012-01-25 23:13:24 -05:00
  • 20f605ebc5 move duplicate code in static marketing sites to marketing.html block templates Ernie Park 2012-01-25 23:13:10 -05:00
  • 75f6002fac Added instructions to wiki edit and create pages. Bridger Maxwell 2012-01-25 20:23:14 -05:00
  • b5167fe816 Added instructions to wiki edit and create pages. Bridger Maxwell 2012-01-25 20:22:54 -05:00
  • f582e49aaf Merged in the extra head. Replaced files with newly generated ones. Bridger Maxwell 2012-01-25 19:31:00 -05:00
  • c68f6fc7df Merge Bridger Maxwell 2012-01-25 19:28:44 -05:00
  • 2c533bddbf Added editing instructions on the wiki edit page. Bridger Maxwell 2012-01-25 19:27:14 -05:00
  • c17ca29a29 Added editing instructions on the wiki edit page. Bridger Maxwell 2012-01-25 19:26:54 -05:00
  • 63cb53c919 Move logging config, add tracking info to console, remove logging tests. David Ormsbee 2012-01-25 16:30:32 -05:00
  • 9c1dc60b77 Merge Reda Lemeden 2012-01-25 15:10:40 -05:00
  • 33b5c87126 Styled the tabula rasa buttons Reda Lemeden 2012-01-25 15:09:45 -05:00
  • cc64762653 Clean up on marketing styles Kyle Fiedler 2012-01-25 15:00:58 -05:00
  • c9ae9f27d6 Sass compile Kyle Fiedler 2012-01-25 14:44:18 -05:00
  • b2e1ba7474 Manualy switch over some styles from Fancybox to leanbox Kyle Fiedler 2012-01-25 14:43:49 -05:00
  • e025165010 merge Ernie Park 2012-01-25 14:20:06 -05:00
  • b5e40a695e Merge Kyle Fiedler 2012-01-25 14:19:13 -05:00
  • 94f0b58bc7 started fixing layout problems Kyle Fiedler 2012-01-25 14:15:53 -05:00
  • 589aa6bafc Merge with head Reda Lemeden 2012-01-25 14:13:12 -05:00
  • 1114057818 fix merge issues in css, fancybox vs leanmodal Ernie Park 2012-01-25 14:10:03 -05:00
  • bd2e82c28b Styled the question order sort Reda Lemeden 2012-01-25 14:09:38 -05:00
  • f6ad9d51b4 Merge Piotr Mitros 2012-01-25 14:00:01 -05:00
  • fb2f4b6c1a Incomplete file added to sync between computers Piotr Mitros 2012-01-25 13:59:45 -05:00
  • e3885b0f29 updated css files for leanmodal AFTER pulling and updating template scss from remote Ernie Park 2012-01-25 13:51:41 -05:00
  • 7adda62fc7 fix merge Ernie Park 2012-01-25 13:45:28 -05:00
  • 5eab8ba70b switch from fancybox to leanmodal and update .hgignore Ernie Park 2012-01-25 13:43:09 -05:00
  • 831287863d switch from fancybox to leanmodal CSS Ernie Park 2012-01-25 13:04:45 -05:00
  • ca8308503e Compiled sass Kyle Fiedler 2012-01-25 12:39:46 -05:00
  • c1543c7f49 Added new styles for errors Kyle Fiedler 2012-01-25 12:39:24 -05:00
  • 9f433c1786 Fixed the sidebar layout issue in the discussion page Reda Lemeden 2012-01-25 12:32:20 -05:00
  • 55deb0d4a2 Fixed the sidebar layout issue in the discussion page Reda Lemeden 2012-01-25 12:32:09 -05:00
  • ff1ee559c4 Merge Kyle Fiedler 2012-01-25 12:30:35 -05:00
  • d5ce30761a Fixed bugs in IE8 Kyle Fiedler 2012-01-25 12:30:11 -05:00
  • 7033359cc8 Merge with wiki branch (make sure to update mitx too). Bridger Maxwell 2012-01-25 11:44:50 -05:00
  • 077603bb9e Merge with wiki branch (make sure to update templates too). Bridger Maxwell 2012-01-25 11:44:12 -05:00
  • 08e7d06931 Fixed bug for first article creation. Bridger Maxwell 2012-01-25 11:43:13 -05:00
  • c45c1e1048 Made the header and footer wrappers fixed width Reda Lemeden 2012-01-25 11:40:42 -05:00
  • 60e9b91049 Fixed wording for deleted page error. Bridger Maxwell 2012-01-25 11:40:00 -05:00
  • b977901a6e Made the header and footer wrappers fixed width Reda Lemeden 2012-01-25 11:39:25 -05:00
  • 29fd55600d Fixed problem in with reset password on lightbox Kyle Fiedler 2012-01-25 10:43:15 -05:00
  • 83ab19011f Compiled sass Kyle Fiedler 2012-01-25 10:20:26 -05:00
  • 6d3e6827c9 Commented out overiding base styles from askbot and addes style for links in course pages Kyle Fiedler 2012-01-25 10:19:23 -05:00
  • 614f156640 Added UI for locking article. Did more testing/bug fixes on deletion. Seems stable. Bridger Maxwell 2012-01-24 20:56:12 -05:00
  • 92196110ad Added UI for locking article. Did more testing/bug fixes on deletion. Seems stable. Bridger Maxwell 2012-01-24 20:56:02 -05:00
  • 5a5e65a918 Related bug fixed Piotr Mitros 2012-01-24 20:18:20 -05:00
  • d0c8722da4 Revert reversed. Database insert vs. update bug fixed Piotr Mitros 2012-01-24 20:16:06 -05:00
  • 8f124e174b Got deletion working. Bridger Maxwell 2012-01-24 20:14:42 -05:00
  • 056924ad6f Got most of deleting working. Bridger Maxwell 2012-01-24 20:05:14 -05:00
  • 90cbeb73c0 Added new Askbot theme Reda Lemeden 2012-01-24 17:27:48 -05:00