Commit Graph

19654 Commits

Author SHA1 Message Date
Piotr Mitros
7b49f21ec7 Merge 2012-02-12 09:48:47 -05:00
Piotr Mitros
d22c0cd5fb Legal name required, better error messages 2012-02-12 09:48:06 -05:00
Piotr Mitros
25d4d2a760 Updated honor code 2012-02-12 09:35:51 -05:00
Piotr Mitros
f4f37a94ea Updated honor code 2012-02-12 09:34:42 -05:00
Piotr Mitros
cc28d828b0 Added template_module.py, which I omitted a few commits ago
--HG--
branch : pmitros-mod-template
2012-02-11 18:00:12 -05:00
Piotr Mitros
33013a0b15 Test cases, basic framework for moving id tags out of content_parser
--HG--
branch : pmitros-mod-template
2012-02-11 15:07:15 -05:00
Piotr Mitros
b274c2e26c Added basic test case
--HG--
branch : pmitros-mod-template
2012-02-11 09:31:03 -05:00
Piotr Mitros
cbc020785a Semi-generic registration mechanism for modules. Still need to clean up references in content_parser
--HG--
branch : pmitros-mod-template
2012-02-11 08:20:43 -05:00
Piotr Mitros
3350e77134 Custom tags dir
--HG--
branch : pmitros-mod-template
2012-02-11 00:01:43 -05:00
Piotr Mitros
39011ce011 Book module works
--HG--
branch : pmitros-mod-template
2012-02-11 00:01:19 -05:00
Piotr Mitros
97f124f7bd Blocks to get rid of login buttons, TOS tweak 2012-02-10 19:12:17 -05:00
David Ormsbee
a50d3d7f91 changed ADMIN email to admin@mitx.mit.edu 2012-02-10 18:58:35 -05:00
Piotr Mitros
091a45dc0c Removed random debug code 2012-02-10 16:57:01 -05:00
Bridger Maxwell
885c3ac1a6 The organization of simplewiki_base was a little messed up. Most content was being put in the header
--HG--
branch : bridger-dev
2012-02-10 16:57:00 -05:00
Kyle Fiedler
389b53b742 merge heads 2012-02-10 16:45:49 -05:00
Kyle Fiedler
b2b05fdd93 Date change again 2012-02-10 16:45:26 -05:00
Kyle Fiedler
a4e57aeb47 Made changes to Anants three pages 2012-02-10 16:44:30 -05:00
Bridger Maxwell
a8c32923dc Rotated the profile graph labels, so the all fit
--HG--
branch : bridger-dev
2012-02-10 15:57:57 -05:00
Bridger Maxwell
69343aaedd Rotated the profile graph labels, so the all fit
--HG--
branch : bridger-dev
2012-02-10 15:57:39 -05:00
Piotr Mitros
dae8420456 Support for static pages added 2012-02-10 13:38:44 -05:00
Bridger Maxwell
59ff6ce7df Added percentage label to course overview progress
--HG--
branch : bridger-dev
2012-02-10 12:35:42 -05:00
Piotr Mitros
c50cae3d93 Merge, minor correction to e-mail 2012-02-10 12:26:44 -05:00
Bridger Maxwell
1b6f058851 Added bar on progress graph to show overall grade.
--HG--
branch : bridger-dev
2012-02-10 12:18:08 -05:00
Bridger Maxwell
a7f2d96775 Added bar on progress graph to show overall grade.
--HG--
branch : bridger-dev
2012-02-10 12:17:49 -05:00
Ernie Park
f969faa0d4 merge css
--HG--
branch : static-ernie-html5-buttontoggle
2012-02-10 12:11:28 -05:00
Ernie Park
8b5d56ff2f merge
--HG--
branch : templates-ernie-html5-buttontoggle
2012-02-10 12:10:12 -05:00
Ernie Park
bb7d1615b5 put video control toggle into a function
--HG--
branch : templates-ernie-html5-buttontoggle
2012-02-10 12:10:01 -05:00
Ernie Park
e7b49d4a07 fix bug where HTML5 video player's play/pause button didn't update when you click the video
--HG--
branch : static-ernie-html5-buttontoggle
2012-02-10 12:09:43 -05:00
Kyle Fiedler
cc74e574db Made secondary pages have no padding on smaller screens 2012-02-10 11:20:24 -05:00
Kyle Fiedler
3bab1336f2 merge heads 2012-02-10 11:19:55 -05:00
Kyle Fiedler
6779e9b45e Added screen fix for smaller screens on secondary pages 2012-02-10 11:19:41 -05:00
David Ormsbee
2359de96eb Replace hardcoded url in password reset notification email with site name (from django_site table) 2012-02-10 11:15:18 -05:00
Kyle Fiedler
3c7dc27259 Fixed probelms with layout of three new pages and made small chages requested by Anant 2012-02-10 11:02:50 -05:00
Piotr Mitros
ad2989f4a6 Fixed unescaped unicode characters 2012-02-09 21:24:21 -05:00
Piotr Mitros
bb91ab2a54 More minor word tweaks 2012-02-09 21:06:37 -05:00
Piotr Mitros
e844c63171 Minor tweaks to e-mail templates 2012-02-09 20:55:38 -05:00
Kyle Fiedler
5881c84c47 Added links to the mitx page 2012-02-09 18:09:37 -05:00
Kyle Fiedler
372a987577 Added anats static pages 2012-02-09 18:04:56 -05:00
Kyle Fiedler
96176090d3 Merge 2012-02-09 18:03:22 -05:00
Kyle Fiedler
a3dbdb9512 Added anats static pages 2012-02-09 18:03:06 -05:00
Reda Lemeden
343225a355 Merge with Head 2012-02-09 15:56:56 -05:00
Reda Lemeden
254e806ac5 Fixed the footer and the sidebar 2012-02-09 15:56:21 -05:00
Kyle Fiedler
b605dfc3b5 Flashes error message for all forms on sign up 2012-02-09 15:51:04 -05:00
Bridger Maxwell
b2c89cffff Added documentation for wikipath 2012-02-09 15:22:46 -05:00
Kyle Fiedler
c64668ce14 new styles for course info page and profile page 2012-02-09 15:21:23 -05:00
Kyle Fiedler
930963f667 Merged heads 2012-02-09 15:20:54 -05:00
Bridger Maxwell
4e2ac787e0 Changed instructions for wikipath extension 2012-02-09 15:18:38 -05:00
Bridger Maxwell
012e51811a Fixed wikipath extension 2012-02-09 15:18:19 -05:00
Ernie Park
4c3933a72c merge default in
--HG--
branch : templates-ernie-video-spacebar
2012-02-09 15:10:30 -05:00
Ernie Park
e4b1e0588f enable space bar to pause video
--HG--
branch : templates-ernie-video-spacebar
2012-02-09 15:06:32 -05:00