Commit Graph

  • 6fa23e9084 Custom tags link added Piotr Mitros 2012-02-13 08:04:17 -05:00
  • 5835fd6eeb MITx italics Piotr Mitros 2012-02-13 00:43:08 -05:00
  • a4dc01509a Bug fix. Not very tested Piotr Mitros 2012-02-13 00:30:22 -05:00
  • fd086c1c63 Minor wordsmithing, etc. Piotr Mitros 2012-02-12 20:25:37 -05:00
  • 812e137cf3 More wordsmithing Piotr Mitros 2012-02-12 11:17:50 -05:00
  • 7b49f21ec7 Merge Piotr Mitros 2012-02-12 09:48:47 -05:00
  • d22c0cd5fb Legal name required, better error messages Piotr Mitros 2012-02-12 09:48:06 -05:00
  • 25d4d2a760 Updated honor code Piotr Mitros 2012-02-12 09:35:51 -05:00
  • f4f37a94ea Updated honor code Piotr Mitros 2012-02-12 09:34:42 -05:00
  • cc28d828b0 Added template_module.py, which I omitted a few commits ago Piotr Mitros 2012-02-11 18:00:12 -05:00
  • 33013a0b15 Test cases, basic framework for moving id tags out of content_parser Piotr Mitros 2012-02-11 15:07:15 -05:00
  • b274c2e26c Added basic test case Piotr Mitros 2012-02-11 09:31:03 -05:00
  • cbc020785a Semi-generic registration mechanism for modules. Still need to clean up references in content_parser Piotr Mitros 2012-02-11 08:20:43 -05:00
  • 3350e77134 Custom tags dir Piotr Mitros 2012-02-11 00:01:43 -05:00
  • 39011ce011 Book module works Piotr Mitros 2012-02-11 00:01:19 -05:00
  • 97f124f7bd Blocks to get rid of login buttons, TOS tweak Piotr Mitros 2012-02-10 19:12:17 -05:00
  • a50d3d7f91 changed ADMIN email to admin@mitx.mit.edu David Ormsbee 2012-02-10 18:58:35 -05:00
  • 091a45dc0c Removed random debug code Piotr Mitros 2012-02-10 16:57:01 -05:00
  • 885c3ac1a6 The organization of simplewiki_base was a little messed up. Most content was being put in the header Bridger Maxwell 2012-02-10 16:57:00 -05:00
  • 389b53b742 merge heads Kyle Fiedler 2012-02-10 16:45:49 -05:00
  • b2b05fdd93 Date change again Kyle Fiedler 2012-02-10 16:45:26 -05:00
  • a4e57aeb47 Made changes to Anants three pages Kyle Fiedler 2012-02-10 16:44:30 -05:00
  • a8c32923dc Rotated the profile graph labels, so the all fit Bridger Maxwell 2012-02-10 15:57:57 -05:00
  • 69343aaedd Rotated the profile graph labels, so the all fit Bridger Maxwell 2012-02-10 15:57:39 -05:00
  • dae8420456 Support for static pages added Piotr Mitros 2012-02-10 13:38:44 -05:00
  • 59ff6ce7df Added percentage label to course overview progress Bridger Maxwell 2012-02-10 12:35:42 -05:00
  • c50cae3d93 Merge, minor correction to e-mail Piotr Mitros 2012-02-10 12:26:44 -05:00
  • 1b6f058851 Added bar on progress graph to show overall grade. Bridger Maxwell 2012-02-10 12:18:08 -05:00
  • a7f2d96775 Added bar on progress graph to show overall grade. Bridger Maxwell 2012-02-10 12:17:49 -05:00
  • f969faa0d4 merge css Ernie Park 2012-02-10 12:11:28 -05:00
  • 8b5d56ff2f merge Ernie Park 2012-02-10 12:10:12 -05:00
  • bb7d1615b5 put video control toggle into a function Ernie Park 2012-02-10 12:10:01 -05:00
  • e7b49d4a07 fix bug where HTML5 video player's play/pause button didn't update when you click the video Ernie Park 2012-02-10 12:09:43 -05:00
  • cc74e574db Made secondary pages have no padding on smaller screens Kyle Fiedler 2012-02-10 11:20:24 -05:00
  • 3bab1336f2 merge heads Kyle Fiedler 2012-02-10 11:19:55 -05:00
  • 6779e9b45e Added screen fix for smaller screens on secondary pages Kyle Fiedler 2012-02-10 11:19:41 -05:00
  • 2359de96eb Replace hardcoded url in password reset notification email with site name (from django_site table) David Ormsbee 2012-02-10 11:15:18 -05:00
  • 3c7dc27259 Fixed probelms with layout of three new pages and made small chages requested by Anant Kyle Fiedler 2012-02-10 11:02:50 -05:00
  • ad2989f4a6 Fixed unescaped unicode characters Piotr Mitros 2012-02-09 21:24:21 -05:00
  • bb91ab2a54 More minor word tweaks Piotr Mitros 2012-02-09 21:06:37 -05:00
  • e844c63171 Minor tweaks to e-mail templates Piotr Mitros 2012-02-09 20:55:38 -05:00
  • 5881c84c47 Added links to the mitx page Kyle Fiedler 2012-02-09 18:09:37 -05:00
  • 372a987577 Added anats static pages Kyle Fiedler 2012-02-09 18:04:56 -05:00
  • 96176090d3 Merge Kyle Fiedler 2012-02-09 18:03:22 -05:00
  • a3dbdb9512 Added anats static pages Kyle Fiedler 2012-02-09 18:03:06 -05:00
  • 343225a355 Merge with Head Reda Lemeden 2012-02-09 15:56:56 -05:00
  • 254e806ac5 Fixed the footer and the sidebar Reda Lemeden 2012-02-09 15:56:21 -05:00
  • b605dfc3b5 Flashes error message for all forms on sign up Kyle Fiedler 2012-02-09 15:51:04 -05:00
  • b2c89cffff Added documentation for wikipath Bridger Maxwell 2012-02-09 15:22:46 -05:00
  • c64668ce14 new styles for course info page and profile page Kyle Fiedler 2012-02-09 15:21:23 -05:00
  • 930963f667 Merged heads Kyle Fiedler 2012-02-09 15:20:54 -05:00
  • 4e2ac787e0 Changed instructions for wikipath extension Bridger Maxwell 2012-02-09 15:18:38 -05:00
  • 012e51811a Fixed wikipath extension Bridger Maxwell 2012-02-09 15:18:19 -05:00
  • 4c3933a72c merge default in Ernie Park 2012-02-09 15:10:30 -05:00
  • e4b1e0588f enable space bar to pause video Ernie Park 2012-02-09 15:06:32 -05:00
  • 70e273db20 Added some more style for course info and profile pages Kyle Fiedler 2012-02-09 15:06:08 -05:00
  • a8a01ce942 Cleaning up profile to output better lists Bridger Maxwell 2012-02-09 14:55:40 -05:00
  • fd7f229ae1 Cleaning up profile to output better lists Bridger Maxwell 2012-02-09 14:55:20 -05:00
  • 8b6188b9bf merged in login errors branch Kyle Fiedler 2012-02-09 12:28:02 -05:00
  • 261c9b1551 Added link to create a new account on login modal and added styles for that too Kyle Fiedler 2012-02-09 12:27:06 -05:00
  • bd523c2e9a Merged in with default Kyle Fiedler 2012-02-09 12:07:17 -05:00
  • aeb5357e0e added more style to enroll buttons Kyle Fiedler 2012-02-09 12:06:52 -05:00
  • e012f18f43 Styled calc Kyle Fiedler 2012-02-09 11:10:48 -05:00
  • feb383fd7b Merge heads Kyle Fiedler 2012-02-09 11:10:21 -05:00
  • 28d3275724 Refactored html for calc and restyled Kyle Fiedler 2012-02-09 11:09:59 -05:00
  • 0585fd43fe Changed editing instruction to not have wiki: shortcut, as that is incompatible right now. Bridger Maxwell 2012-02-08 22:21:33 -05:00
  • ea39249566 Disabled wikipath markdown extension, as it requires markdown 2.1.0, and we are running 2.0.3 Bridger Maxwell 2012-02-08 22:20:46 -05:00
  • b1377f6c4e Merge. Also, for last commit I added sorting to the wiki 'all articles' but forgot to put it into commit message. Bridger Maxwell 2012-02-08 21:40:27 -05:00
  • 159af57995 Removed codehilite from wiki. It was throwing errors and wasn't used. Should be fixed later? Bridger Maxwell 2012-02-08 21:37:24 -05:00
  • acab3d2ee9 Changed article creation to *not* create child articles Bridger Maxwell 2012-02-08 18:41:48 -05:00
  • 78b198e359 Close templates_ernie_leanmodal_closebox Kyle Fiedler 2012-02-08 16:49:14 -05:00
  • 9a9b417a11 Close static_ernie_leanmodal_closebox Kyle Fiedler 2012-02-08 16:48:56 -05:00
  • 67111de077 Merged in static_ernie_leanmodal_closebox Kyle Fiedler 2012-02-08 16:48:41 -05:00
  • bb36854939 Nex css for leanmodal x Kyle Fiedler 2012-02-08 16:47:59 -05:00
  • 63eeea6983 Merged in templates_ernie_leanmodal_closebox Kyle Fiedler 2012-02-08 16:47:27 -05:00
  • 30518d2f45 Merged with default Kyle Fiedler 2012-02-08 16:47:00 -05:00
  • 42b9898572 Edited styles for the leanmodal x Kyle Fiedler 2012-02-08 16:46:41 -05:00
  • eef3b62c37 Added new styles for closeing side bar and new icons Kyle Fiedler 2012-02-08 16:35:25 -05:00
  • 75f0872ea9 Merged with default Kyle Fiedler 2012-02-08 16:33:28 -05:00
  • 5cf7d9ab8c Added more styles for the slider Kyle Fiedler 2012-02-08 16:32:48 -05:00
  • 7cb316e983 Merge with Head Reda Lemeden 2012-02-08 16:10:24 -05:00
  • 8b48c8b410 Added answer controls Reda Lemeden 2012-02-08 16:09:59 -05:00
  • d7c7b3fb7d merge with default and resolve application.css Ernie Park 2012-02-08 15:53:23 -05:00
  • f63731dad5 another change to the css file Ernie Park 2012-02-08 15:52:28 -05:00
  • 00e79f04d7 merge with default Ernie Park 2012-02-08 15:51:32 -05:00
  • 9a1f8a9e1a update leanmodal css and js to have close box Ernie Park 2012-02-08 15:49:57 -05:00
  • a2f1928404 update leanmodal scss and add feedback for reset password in profile Ernie Park 2012-02-08 15:49:10 -05:00
  • e612572bad MITX -> MITx Piotr Mitros 2012-02-08 14:39:22 -05:00
  • d470bc53eb Merge with head Reda Lemeden 2012-02-08 14:34:00 -05:00
  • 527152387b Redesigned the new question view i Askbot mitx-skin Reda Lemeden 2012-02-08 14:33:44 -05:00
  • e26a8059ce Merge with head Reda Lemeden 2012-02-08 14:31:24 -05:00
  • e34954f458 Redesigned the new question view Reda Lemeden 2012-02-08 14:30:55 -05:00
  • 51a8160a6a lower minimum rep for many basic askbot actions (leaving comments, reopening questions, etc) David Ormsbee 2012-02-08 14:30:18 -05:00
  • 3636bb4755 merged with default Kyle Fiedler 2012-02-08 13:54:42 -05:00
  • fd0023448f Added new styles for errors and added flash to show the user resubmitted the form Kyle Fiedler 2012-02-08 13:54:08 -05:00
  • 73388094c1 Merge Piotr Mitros 2012-02-08 13:01:43 -05:00
  • 59e1f5a50a Account already active is there Piotr Mitros 2012-02-08 13:01:21 -05:00
  • c3598c6b95 Account already active is there Piotr Mitros 2012-02-08 13:01:13 -05:00
  • 26d6cd06f3 Added and upvote arrow icon Reda Lemeden 2012-02-08 12:53:29 -05:00
  • a4b86d1766 Merge with head Reda Lemeden 2012-02-08 12:52:23 -05:00