Commit Graph

  • e9fd04d545 Resolve application.css conflict Reda Lemeden 2012-01-24 17:19:08 -05:00
  • 071dc14d4f Added a discussion stylesheet and the original sass file Reda Lemeden 2012-01-24 17:11:10 -05:00
  • 1a80cf2b8d Compiled sass Kyle Fiedler 2012-01-24 17:05:29 -05:00
  • ef22943597 Make all MITx italic Kyle Fiedler 2012-01-24 17:04:50 -05:00
  • c0a61a55ca add some style to fix bloated type Kyle Fiedler 2012-01-24 16:23:08 -05:00
  • b3797a41f3 Got most of admin deleting and user deleting implemented. Need to work on interface for encountering deleted articles. Bridger Maxwell 2012-01-24 15:58:22 -05:00
  • e60a20736c Sass compile Kyle Fiedler 2012-01-24 15:51:30 -05:00
  • a761ebf647 Style for sub pages before the login screen Kyle Fiedler 2012-01-24 15:50:49 -05:00
  • 98efb8c005 Tab type missing in list of modules Piotr Mitros 2012-01-24 15:42:52 -05:00
  • 8b4efadfd8 Profile page path issue Piotr Mitros 2012-01-24 14:54:52 -05:00
  • 7971a02832 Previous change introduced a bug where Django's ORM would insert instead of update. Momentary revert. Piotr Mitros 2012-01-24 13:58:02 -05:00
  • 94a5c75088 Stage still needs old Askbot. Broken schema migrations. Piotr Mitros 2012-01-24 11:55:51 -05:00
  • 3d39a7ac76 compiled css Kyle Fiedler 2012-01-24 11:36:45 -05:00
  • 23b5cf6691 Added new style and html for honor code on enroll form Kyle Fiedler 2012-01-24 11:32:39 -05:00
  • 2eb6fd0469 Added some styles for help Kyle Fiedler 2012-01-24 10:34:42 -05:00
  • b2bcf6b2ac Fixed change language and location bugs Kyle Fiedler 2012-01-24 10:27:46 -05:00
  • ce6b84196c merge Kyle Fiedler 2012-01-24 09:53:48 -05:00
  • 9a527344f4 started to fix javascript issues Kyle Fiedler 2012-01-24 09:51:58 -05:00
  • 8b3acb3448 Added a discussion stylesheet and linked to it in application.scss Reda Lemeden 2012-01-24 09:20:38 -05:00
  • acafd3f66c Nasty bug fixes in when we can render. Need to apply to vertical too Piotr Mitros 2012-01-23 23:38:02 -05:00
  • f3eb22e0e9 working on import issues Piotr Mitros 2012-01-23 23:24:30 -05:00
  • 150fbc80bb Fully qualified path in import. Attempting to debug staging problem Piotr Mitros 2012-01-23 22:57:56 -05:00
  • 17a0c1e186 New hgignore. Ignore this commit Piotr Mitros 2012-01-23 22:45:53 -05:00
  • 7ebdd04d57 Stupid infrastructure for benchmarking Piotr Mitros 2012-01-23 22:37:35 -05:00
  • 4442754a86 Redundant DB queries eliminated. We're at about 5 hits per sequence w/o Askbot, and 10 with Piotr Mitros 2012-01-23 22:02:36 -05:00
  • 98e9d96cc9 Fixed revert Piotr Mitros 2012-01-23 18:46:21 -05:00
  • e982418a3d Merge Piotr Mitros 2012-01-23 18:37:23 -05:00
  • b2d5c680ec Adding fixture for pmitros@csail.mit.edu Piotr Mitros 2012-01-23 18:37:07 -05:00
  • faae6b5979 merging changes from wiki David Ormsbee 2012-01-23 18:29:33 -05:00
  • 28bc63f108 added logging setup for settings_new_askbot.py David Ormsbee 2012-01-23 18:27:25 -05:00
  • 07f328f67f merge Bridger Maxwell 2012-01-23 18:12:42 -05:00
  • 7200ca0d0c Update to simplewiki Bridger Maxwell 2012-01-23 18:12:29 -05:00
  • 608fa17983 Adding delete functionality Bridger Maxwell 2012-01-23 18:05:16 -05:00
  • 7e177fc66b Merge Bridger Maxwell 2012-01-23 17:56:46 -05:00
  • dda9290889 Simple logging so we can test loggers on staging. David Ormsbee 2012-01-23 16:34:17 -05:00
  • 81e70347d5 merge Bridger Maxwell 2012-01-23 15:43:20 -05:00
  • b9cd444682 added more subs fischerl 2012-01-23 14:38:36 -05:00
  • f2f6f0c14b Wiki redirection bug fix Bridger Maxwell 2012-01-23 13:31:13 -05:00
  • b8087c10f9 rearrange imports David Ormsbee 2012-01-23 13:29:12 -05:00
  • 01fbbb9fc7 Merge Piotr Mitros 2012-01-23 13:26:15 -05:00
  • 5227734fae merge Bridger Maxwell 2012-01-23 13:05:07 -05:00
  • b694183db0 Merge Bridger Maxwell 2012-01-23 12:55:53 -05:00
  • 499ff9a97e Changed structure of wiki so that the base article is just '/' Bridger Maxwell 2012-01-23 12:41:26 -05:00
  • 747f5ac290 Switching to new Askbot Piotr Mitros 2012-01-23 12:35:37 -05:00
  • 11f3012214 Bug fix in profile page Piotr Mitros 2012-01-23 12:20:25 -05:00
  • 25cb46731d Sequential module stores position. Basic groundwork to make video module do the same Piotr Mitros 2012-01-23 09:16:35 -05:00
  • ef1c465d5e Video module set up to store last location. Several bug fixes too. Piotr Mitros 2012-01-23 09:15:59 -05:00
  • d989621bff Series remembers last spot Piotr Mitros 2012-01-21 23:52:46 -05:00
  • 29d23d1594 Accidentally left in a print Piotr Mitros 2012-01-21 18:50:51 -05:00
  • ba2c03357c All modules moved into new OO framework Piotr Mitros 2012-01-21 18:46:34 -05:00
  • 16ab1bb564 Vertical Module is now an x_module Piotr Mitros 2012-01-21 15:25:25 -05:00
  • 837e87e177 Modules moved into their own directory Piotr Mitros 2012-01-21 13:21:50 -05:00
  • d410d8294a All elements in course file include IDs Piotr Mitros 2012-01-21 12:47:30 -05:00
  • 714167322e course_file now includes parsing. Piotr Mitros 2012-01-21 12:36:52 -05:00
  • 829e890a6e Very minor cleanups Piotr Mitros 2012-01-21 12:24:17 -05:00
  • 1ec3209d05 Moved courseware from minidom to lxml2. Appears to work, but big change. may still have bugs. Piotr Mitros 2012-01-21 12:12:00 -05:00
  • 8539b9264f Profile page uses lxml Piotr Mitros 2012-01-21 09:20:24 -05:00
  • 591f902372 Content parser moved to lxml Piotr Mitros 2012-01-20 18:54:14 -05:00
  • 958426020d Two content_parser modules by accident Piotr Mitros 2012-01-20 18:01:15 -05:00
  • 4a11f0ddee added new subs fischerl 2012-01-20 16:18:57 -05:00
  • 97ebb75046 Accidentally switched to wrong settings Piotr Mitros 2012-01-20 15:04:15 -05:00
  • bddfe16e37 Placeholder pages for TOS, privacy, honor code Piotr Mitros 2012-01-20 14:58:32 -05:00
  • a2f83751b3 Placeholders for TOS, copyright, privacy, honor code Piotr Mitros 2012-01-20 14:57:52 -05:00
  • 1b4d400cdd lab support cjt 2012-01-20 14:18:53 -05:00
  • 70424b1c92 lab support cjt 2012-01-20 14:13:20 -05:00
  • 6660646f9c commented out middleware requirement for pagesize which is no longer in the new devel middleware Ernie Park 2012-01-20 12:49:53 -05:00
  • 7cb8c9ee33 removed border from textbook fischerl 2012-01-20 11:30:19 -05:00
  • 4474de49b4 restore adding askbot-devel to the pythonpath David Ormsbee 2012-01-20 11:24:32 -05:00
  • 7de2c6fab1 update settings to remove server split between askbot and courseware David Ormsbee 2012-01-20 10:56:20 -05:00
  • b05d2ce5df Slight error in last commit. Wrong version of main Piotr Mitros 2012-01-20 10:22:45 -05:00
  • 6756e263a4 print.css Piotr Mitros 2012-01-20 10:18:02 -05:00
  • da6c0613f1 Added print.css Piotr Mitros 2012-01-20 10:17:33 -05:00
  • 099be2fed7 merge fischerl 2012-01-20 00:33:10 -05:00
  • a40d8f08df textbook index fixed fischerl 2012-01-20 00:32:27 -05:00
  • 9b0136f1ca shorted hieght of header on course page Kyle Fiedler 2012-01-19 22:50:30 -05:00
  • 0b771777ce generated css Kyle Fiedler 2012-01-19 22:49:57 -05:00
  • ef406ae356 new generated css Kyle Fiedler 2012-01-19 22:28:10 -05:00
  • cb9a923747 edit max width so its not choppy Kyle Fiedler 2012-01-19 22:27:50 -05:00
  • 45a9bda33f added fix for firefox Kyle Fiedler 2012-01-19 22:25:27 -05:00
  • 2e7fd523cb Added more images and new generated css Kyle Fiedler 2012-01-19 22:25:02 -05:00
  • d082f474ef Added generated new stylesheets and new images Kyle Fiedler 2012-01-19 21:03:37 -05:00
  • 25b92d8e5c add static content for labs cjt 2012-01-19 19:58:51 -05:00
  • 4f54c4b266 new .js files cjt 2012-01-19 19:58:07 -05:00
  • b7e9aff117 Added js back in after breaking login Kyle Fiedler 2012-01-19 17:09:50 -05:00
  • 106b56a4fe added more styles for the marketing pages Kyle Fiedler 2012-01-19 16:59:09 -05:00
  • 4bc58c5611 Option for new Askbot Piotr Mitros 2012-01-19 16:31:40 -05:00
  • 7ec5dfaef9 Merge Kyle Fiedler 2012-01-19 15:42:11 -05:00
  • eb71eaa1d8 Changed around most of the marketing styles and updated the content Kyle Fiedler 2012-01-19 15:40:06 -05:00
  • c310c37247 half-done textbook updates fischerl 2012-01-19 08:50:51 -05:00
  • fa39e96903 Merge Bridger Maxwell 2012-01-18 23:27:59 -05:00
  • d47d95edf2 Removed simplewiki's custom 404 page so urls work better, and it uses global 404 page. Set bad debug setting to false Bridger Maxwell 2012-01-18 21:43:23 -05:00
  • 9619bf20ea moved logging level to INFO, replaced tabs with spaces in settings.py David Ormsbee 2012-01-18 15:00:46 -05:00
  • 4e75a04ffa Problem tracking appears to work Piotr Mitros 2012-01-18 14:17:06 -05:00
  • b0bbfc1b81 Fixed my own error in above Piotr Mitros 2012-01-18 13:14:16 -05:00
  • a25b247849 Fixed bridger's bug in adding to settings.py instead of his local Piotr Mitros 2012-01-18 13:13:27 -05:00
  • cf9364fe1c Merge Bridger Maxwell 2012-01-18 09:41:24 -05:00
  • ea15a5629a Changes to simplewiki reverse URL lookup Bridger Maxwell 2012-01-18 09:41:07 -05:00
  • 8c979717cc Merge Piotr Mitros 2012-01-17 21:36:51 -05:00
  • 74e9fc7ab7 handouts Piotr Mitros 2012-01-17 21:33:52 -05:00
  • 2d08b32140 Course info Piotr Mitros 2012-01-17 21:28:55 -05:00