Piotr Mitros
|
7c5d93a514
|
Commented out debug print statements for possible merge
--HG--
branch : pmitros-mod-template
|
2012-02-13 16:46:01 -05:00 |
|
Piotr Mitros
|
31c63455e1
|
Slightly better text
|
2012-02-13 16:42:38 -05:00 |
|
Kyle Fiedler
|
3ee53f68b0
|
Merged with default
--HG--
branch : close_sidebar
|
2012-02-13 16:39:32 -05:00 |
|
Piotr Mitros
|
caa2ed9195
|
Removed comments and obsolet error codes
|
2012-02-13 16:36:48 -05:00 |
|
Kyle Fiedler
|
1b9f3c1f67
|
merge
|
2012-02-13 16:32:31 -05:00 |
|
Kyle Fiedler
|
872b2af4c9
|
Added help page for outside the app, link to help in footer and Opencourseware link
|
2012-02-13 16:32:15 -05:00 |
|
Piotr Mitros
|
4cd5720aba
|
Removed obsolete error code -- now AJAX
|
2012-02-13 16:16:25 -05:00 |
|
Piotr Mitros
|
06d241c514
|
Standard forms for templates
|
2012-02-13 15:57:31 -05:00 |
|
Kyle Fiedler
|
0b424b4bd8
|
Fixed errorn on invalid activation
|
2012-02-13 15:40:02 -05:00 |
|
Piotr Mitros
|
95e463c6ae
|
Changed cjt's stuff to pointers
|
2012-02-13 15:28:40 -05:00 |
|
Kyle Fiedler
|
2db960a2b3
|
unused css class
|
2012-02-13 15:26:55 -05:00 |
|
Kyle Fiedler
|
30559f178e
|
Merged in ernies video changes
|
2012-02-13 15:20:47 -05:00 |
|
Kyle Fiedler
|
9a17d23475
|
Merged with default
--HG--
branch : templates-ernie-global-intro-video
|
2012-02-13 15:20:18 -05:00 |
|
Kyle Fiedler
|
c9ece727a9
|
Merge
|
2012-02-13 15:12:38 -05:00 |
|
Kyle Fiedler
|
29482eacee
|
Hide footer links on the acticvation pages
|
2012-02-13 15:10:46 -05:00 |
|
Kyle Fiedler
|
b30dc6fed6
|
Hide footer links for activation pages
|
2012-02-13 15:09:57 -05:00 |
|
Ernie Park
|
b4737eb1d2
|
merge with default
--HG--
branch : templates-ernie-global-intro-video
|
2012-02-13 14:55:39 -05:00 |
|
Ernie Park
|
0c83d18761
|
switch intro video to (experimental) iframe player so closing overlay stops video, and hitting play autoplays video. still buggy if clicked within 1 second of loading page
--HG--
branch : templates-ernie-global-intro-video
|
2012-02-13 14:55:28 -05:00 |
|
cjt
|
4f001d1b0d
|
add plot offsets to schematic tool
|
2012-02-13 14:36:55 -05:00 |
|
Kyle Fiedler
|
56e1111a4a
|
Added style for the layout
--HG--
branch : templates-profilecleanup
|
2012-02-13 14:35:18 -05:00 |
|
Kyle Fiedler
|
b54040ee37
|
Removed larger image for marketing site
|
2012-02-13 14:12:46 -05:00 |
|
Kyle Fiedler
|
c5772894bd
|
Merge
|
2012-02-13 14:02:06 -05:00 |
|
Kyle Fiedler
|
89fbab77f7
|
Fixed links and added them to other pages
|
2012-02-13 14:01:52 -05:00 |
|
Piotr Mitros
|
1366afcfc1
|
Minor bug fixes
|
2012-02-13 13:52:23 -05:00 |
|
Piotr Mitros
|
126c1f982c
|
Removed extra print statement
|
2012-02-13 13:10:14 -05:00 |
|
Piotr Mitros
|
e05e05f445
|
merge in tolerance bug fix
|
2012-02-13 13:08:36 -05:00 |
|
Kyle Fiedler
|
1354bda069
|
added line hight to secondary pages
|
2012-02-13 12:18:28 -05:00 |
|
Kyle Fiedler
|
fdcb58489a
|
Added link to homepage and course page on acctivation
|
2012-02-13 12:17:35 -05:00 |
|
Piotr Mitros
|
fca78b83ba
|
Relative tolerance, minor clean-up, as per Dave
--HG--
branch : tolerance_bug
|
2012-02-13 08:10:32 -05:00 |
|
Piotr Mitros
|
6fa23e9084
|
Custom tags link added
--HG--
branch : pmitros-mod-template
|
2012-02-13 08:04:17 -05:00 |
|
Piotr Mitros
|
5835fd6eeb
|
MITx italics
|
2012-02-13 00:43:08 -05:00 |
|
Piotr Mitros
|
a4dc01509a
|
Bug fix. Not very tested
--HG--
branch : tolerance_bug
|
2012-02-13 00:30:22 -05:00 |
|
Piotr Mitros
|
fd086c1c63
|
Minor wordsmithing, etc.
|
2012-02-12 20:25:37 -05:00 |
|
Piotr Mitros
|
812e137cf3
|
More wordsmithing
|
2012-02-12 11:17:50 -05:00 |
|
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 |
|