Commit Graph

  • 24f4ea7f07 merged sidebar branch Kyle Fiedler 2012-02-21 17:13:12 -05:00
  • c48b247979 Realigned comments + minor visual enhancements Reda Lemeden 2012-02-21 17:09:56 -05:00
  • b7f3bff424 FAQ anchors Piotr Mitros 2012-02-21 17:02:03 -05:00
  • f2c726af68 Changed the question layout and new question prompt Reda Lemeden 2012-02-21 16:20:02 -05:00
  • 74d4436d3c Merged with default Kyle Fiedler 2012-02-21 16:05:45 -05:00
  • 1b2439c4a4 Added more styles for the askbot sidebar Kyle Fiedler 2012-02-21 16:05:27 -05:00
  • 0342a65054 Merged in bug fix and Reda's changes Bridger Maxwell 2012-02-21 15:24:39 -05:00
  • 7e79e9f34a emergency move of askbot settings back into settings.py so staging doesn't blow up David Ormsbee 2012-02-21 15:09:45 -05:00
  • 182dc1a66f fixed conflicts Kyle Fiedler 2012-02-21 15:01:00 -05:00
  • 4838ab1ba8 Changed visual style of titles and filters Reda Lemeden 2012-02-21 14:54:30 -05:00
  • 2a5ba5d0c7 Force askbot config to draw all config values from askbotsettings.py, and not hit the database David Ormsbee 2012-02-21 14:43:05 -05:00
  • 5404e1228a added styles for other headers inthe sidebars Kyle Fiedler 2012-02-21 14:25:59 -05:00
  • ccc3c710b3 Added consistant sidebar headers and made textbook sidebar close Kyle Fiedler 2012-02-21 13:08:35 -05:00
  • 76f98a17c8 Added autocomplete styles and removed commenting limit in Askbot Reda Lemeden 2012-02-21 10:59:42 -05:00
  • 2be705ca01 Fixed bug where wiki warned users even as they saved their changes. Bridger Maxwell 2012-02-20 21:59:26 -05:00
  • b923b59fc4 Merge Bridger Maxwell 2012-02-20 21:58:40 -05:00
  • cdaed49a2b Subtitle support working Piotr Mitros 2012-02-20 20:59:02 -05:00
  • 024da20b48 Subtitle support working Piotr Mitros 2012-02-20 20:58:47 -05:00
  • 36005b0056 Added style for askbot-profile Kyle Fiedler 2012-02-20 17:25:19 -05:00
  • 3ce8557309 Merged heads Kyle Fiedler 2012-02-20 17:24:56 -05:00
  • 0e2216932a Added more style for askbot profile page Kyle Fiedler 2012-02-20 17:24:20 -05:00
  • a75ba51c46 Merged and resolved conflicts Reda Lemeden 2012-02-20 17:14:57 -05:00
  • 6c9540fe4e Minor styles changes and visual fixes to various parts of the app Reda Lemeden 2012-02-20 17:09:36 -05:00
  • 2416587c19 Minor cleanup Piotr Mitros 2012-02-20 16:47:53 -05:00
  • f83c492720 per-section rendering works, if unclean Piotr Mitros 2012-02-20 16:35:12 -05:00
  • 086523e0fa Bug in urls file Piotr Mitros 2012-02-20 16:10:55 -05:00
  • 9812fda559 Minor bug when restarting server with custom tags This patch has limited testing w.r.t. whether the bug is completely gone, but it appears to have no negative side effects, and fix at least one case. Piotr Mitros 2012-02-20 15:46:31 -05:00
  • e844a6f006 Added styles for the profile page in askbot Kyle Fiedler 2012-02-20 15:25:34 -05:00
  • 02174ff62e Merged heads Kyle Fiedler 2012-02-20 15:24:54 -05:00
  • 576643da7e Added base styles for the askbot profile page Kyle Fiedler 2012-02-20 15:24:35 -05:00
  • b2d0b9b621 Merge with Head Reda Lemeden 2012-02-20 14:29:26 -05:00
  • 01ab182a8e Fixed bugs in the answer and question editing forms Reda Lemeden 2012-02-20 14:28:30 -05:00
  • c94d68683e Merge Piotr Mitros 2012-02-20 13:26:39 -05:00
  • 0b3c9dc975 Integrate with mod-template (custom tags dir) Piotr Mitros 2012-02-20 13:25:34 -05:00
  • 349230c1fa Merge with capa fixed Piotr Mitros 2012-02-20 13:24:33 -05:00
  • 0888eed906 Post-merge cleanup Piotr Mitros 2012-02-20 13:06:13 -05:00
  • 34affdabde Merge with new settings Piotr Mitros 2012-02-20 12:14:48 -05:00
  • 8dec0aa7cd Merging with fixes to Capa Piotr Mitros 2012-02-20 12:06:19 -05:00
  • c16ac4fb4e Merge with local template paths Piotr Mitros 2012-02-20 12:03:59 -05:00
  • f6434f906c Merge with Head Reda Lemeden 2012-02-20 11:38:20 -05:00
  • b8dcbaf36c Fixed visual bugs on the main question list + restyled author info in answer view Reda Lemeden 2012-02-20 11:37:39 -05:00
  • 7bd509b7ed Beginning to merge new settings file Piotr Mitros 2012-02-20 11:29:12 -05:00
  • 93c50f0aeb Added styles for the bottom navigation on the textbook: Kyle Fiedler 2012-02-20 11:19:37 -05:00
  • bf632da06f Add textbook nav on the bottom of the page too Kyle Fiedler 2012-02-20 11:18:58 -05:00
  • d83a4d22f3 Added messaging for users with javascript diabled Kyle Fiedler 2012-02-20 10:51:39 -05:00
  • 48a3133714 merged heads Kyle Fiedler 2012-02-20 10:44:07 -05:00
  • db9ca0772f Fix ie enrollment issues by hiding form Kyle Fiedler 2012-02-20 10:43:46 -05:00
  • c7e72c28e0 merged heads Kyle Fiedler 2012-02-20 09:54:13 -05:00
  • c423e17cc3 Added style to remove enrollment form for IE7 and below and added a paragraph explainaing why Kyle Fiedler 2012-02-20 09:53:40 -05:00
  • e57fc19045 Including namespace for sections Piotr Mitros 2012-02-20 07:16:22 -05:00
  • 2501b58305 Removed unnecessary symlinks. WARNING: Must update and push data before deploying Piotr Mitros 2012-02-20 07:13:16 -05:00
  • 47b0ca5564 Merge Piotr Mitros 2012-02-20 07:11:05 -05:00
  • 1befa20b12 Last commit tested and debugged Piotr Mitros 2012-02-20 07:08:22 -05:00
  • 0d9a24e4f4 Templates broken into namespaces Piotr Mitros 2012-02-19 20:12:34 -05:00
  • 5fe68e3a43 Merge to default for next developments Piotr Mitros 2012-02-19 19:34:36 -05:00
  • 622c4e3427 Eliminated save button where not relevant Piotr Mitros 2012-02-19 17:27:21 -05:00
  • cb27c471ff Capa problems handle case sensitivity and give better errors Piotr Mitros 2012-02-19 17:03:46 -05:00
  • 73322a5e6a Capa problems handle case sensitivity and give better errors Piotr Mitros 2012-02-19 17:03:29 -05:00
  • 0807cf8160 Updated FAQ Piotr Mitros 2012-02-19 14:03:12 -05:00
  • ab0f07ebd1 Code cleaned up to be slighlty more explicit Piotr Mitros 2012-02-19 12:30:08 -05:00
  • 7bea938246 Handling case of response not in cache explicitly Piotr Mitros 2012-02-19 12:21:57 -05:00
  • 88adbc9593 Merge Piotr Mitros 2012-02-19 12:18:34 -05:00
  • b2f3a75d86 Working on case where id not in cache. Committing to merge with mainline Piotr Mitros 2012-02-19 12:18:19 -05:00
  • 3ef3c055af Profile page fixed Piotr Mitros 2012-02-19 10:39:18 -05:00
  • 47cd903cc2 Changed jpg to png, new TOC, correct starting/eding pages Piotr Mitros 2012-02-19 10:29:32 -05:00
  • 9025ea34c8 clean up old versions of schematic tool from static/js cjt 2012-02-18 15:07:14 -05:00
  • ffba3c59a5 Merge AB testing branch I should have pulled in a week ago. David Ormsbee 2012-02-17 15:26:58 -05:00
  • a4258d29de Added to the Sass readme Kyle Fiedler 2012-02-17 14:21:42 -05:00
  • b9d72ebbe2 fix footer for mobile styles Kyle Fiedler 2012-02-17 14:04:23 -05:00
  • fd6214ab02 Merged heads Kyle Fiedler 2012-02-17 13:52:23 -05:00
  • 92afb78c54 Mobile styles Kyle Fiedler 2012-02-17 13:43:04 -05:00
  • 6498c8862c Generated css Bridger Maxwell 2012-02-17 00:46:30 -05:00
  • 2c634d35cd Merge Bridger Maxwell 2012-02-17 00:40:27 -05:00
  • c4b05e28d9 Merge Bridger Maxwell 2012-02-17 00:38:04 -05:00
  • 67047cd151 Some changes for code review Bridger Maxwell 2012-02-17 00:37:45 -05:00
  • 6dfaf2a6a4 Added flot library to static (moved from 3rdparty) Bridger Maxwell 2012-02-17 00:30:03 -05:00
  • 085cc17178 Caching problem maximum scores in profile (~10x performance boost in that section of the code) Piotr Mitros 2012-02-16 19:52:52 -05:00
  • fdc4bd71be Added check for unsaved changes before navigating away from wiki edit page. Bridger Maxwell 2012-02-16 18:16:01 -05:00
  • 133ca2991f Merge Reda Lemeden 2012-02-16 17:30:45 -05:00
  • 78826ec070 Question view enhancements kaishin 2012-02-16 17:30:12 -05:00
  • d0418f216e Renable jquery ui on marketing Kyle Fiedler 2012-02-16 15:16:43 -05:00
  • fdc2eef3b7 Merged heads Kyle Fiedler 2012-02-16 15:00:31 -05:00
  • a3299901a9 added better titles and meta information to the marketing site Kyle Fiedler 2012-02-16 15:00:17 -05:00
  • e1cac8d258 Merge Piotr Mitros 2012-02-16 14:55:52 -05:00
  • 93011db4e3 Staff can see problem XML Piotr Mitros 2012-02-16 14:55:27 -05:00
  • 4ae1f53a29 Staff per-problem info Piotr Mitros 2012-02-16 14:52:47 -05:00
  • f96e7a0d3e merged heads Kyle Fiedler 2012-02-16 14:05:04 -05:00
  • bfd76428d8 Added new styles for navigation to highlight current page Kyle Fiedler 2012-02-16 14:04:47 -05:00
  • b1c578400a merged new navigation branch Kyle Fiedler 2012-02-16 14:02:47 -05:00
  • b0614d121c Merged with default Kyle Fiedler 2012-02-16 14:02:15 -05:00
  • 0cbd6fa263 merged with default Kyle Fiedler 2012-02-16 13:59:42 -05:00
  • 2fb05da5c4 More edits to the print styles Kyle Fiedler 2012-02-16 13:59:10 -05:00
  • c02502b34b New constant for calculator and new tests Piotr Mitros 2012-02-16 13:36:09 -05:00
  • 77b6c86299 Styled the question edit form & sidebar kaishin 2012-02-16 12:42:28 -05:00
  • 3cb33e6847 Added new print styles Kyle Fiedler 2012-02-16 12:11:35 -05:00
  • c1676ba1af Merge with Head Reda Lemeden 2012-02-16 11:11:37 -05:00
  • 21d8f47ae5 Finished styling the sidebar kaishin 2012-02-16 11:10:59 -05:00
  • 6d9606f4e8 some clean up Kyle Fiedler 2012-02-16 10:52:40 -05:00
  • df65d0e578 mobile edits Kyle Fiedler 2012-02-16 10:47:54 -05:00
  • 12c1c8beb7 Merged with default Kyle Fiedler 2012-02-16 09:56:08 -05:00