Commit Graph

10228 Commits

Author SHA1 Message Date
Bridger Maxwell
238ed76896 The new markdown framework version was not backwards compatible. Now the wiki source can use either version of the API. 2012-01-14 00:09:01 -05:00
Piotr Mitros
c598b6de68 Logging has a timeout so it doesn't crash Chrome 2012-01-14 00:05:37 -05:00
Piotr Mitros
f840e24104 Merge 2012-01-14 00:04:56 -05:00
Piotr Mitros
7c6e33acb3 Removed wiki print statements 2012-01-14 00:03:22 -05:00
Piotr Mitros
f0786bbec1 Page close event logged 2012-01-13 23:44:59 -05:00
Piotr Mitros
219ff18c27 More packages available from customresponse 2012-01-13 17:56:20 -08:00
Piotr Mitros
e4831106bf Fixed bug in reset 2012-01-13 17:06:42 -08:00
Piotr Mitros
2146b7db66 merge 2012-01-13 17:00:54 -08:00
pmitros
1f2251c98c Making 6.002 page main, moving static pages into static page framework 2012-01-13 16:57:06 -08:00
pmitros
ea603775ca Making 6.002 page main, moving static pages into static page framework
--HG--
rename : courseinfo.html => index.html
rename : index.html => mitx_global.html
2012-01-13 16:57:02 -08:00
Piotr Mitros
dad70c5ae3 Proper from addresses, static view allows CSRF 2012-01-13 19:41:28 -05:00
Ernie Park
089b51589a move html5 iframe stylings to sass file 2012-01-13 13:35:38 -05:00
Piotr Mitros
55c10212f9 SITENAME, e-mail addresses 2012-01-13 09:43:06 -05:00
Piotr Mitros
5b7a59bc58 Staging page works 2012-01-13 07:26:53 -05:00
Kyle Fiedler
83c8fb8422 Styled log in popover 2012-01-12 17:18:58 -05:00
Kyle Fiedler
3a33e238f4 Styled log in popover 2012-01-12 17:18:41 -05:00
Kyle Fiedler
b62bb4401d merged heads 2012-01-12 17:06:10 -05:00
Kyle Fiedler
202d42e772 added sass output for new css 2012-01-12 17:05:47 -05:00
Kyle Fiedler
dab31a37be merged design branch 2012-01-12 17:04:50 -05:00
Kyle Fiedler
3fdfe3a39d removed all my old sass cache files
--HG--
branch : kf-homepage
2012-01-12 17:03:39 -05:00
Kyle Fiedler
f0511986b0 Added more style for the marketing pages
--HG--
branch : kf-homepage
2012-01-12 17:03:00 -05:00
fischerl
ce607db8db merge 2012-01-12 15:51:26 -05:00
fischerl
09cc48fdf0 extra-bonus subtitles commit 2012-01-12 15:51:00 -05:00
Piotr Mitros
832a855643 Fixed bug. Not clear why original worked on some computers but not others. 2012-01-12 14:28:26 -05:00
Piotr Mitros
e6b9a6dd58 Comment 2012-01-12 14:12:09 -05:00
Ernie Park
0ce7d742a2 add .scssc to hgignore 2012-01-12 10:38:39 -05:00
Ernie Park
eb73a0e86e merging html5 video stuff in 2012-01-12 10:04:01 -05:00
Ernie Park
5e9c29654e merging html5 video stuff in 2012-01-12 10:03:20 -05:00
fischerl
b92ca0028a added subs for current course.xml 2012-01-12 09:27:13 -05:00
Piotr Mitros
95c8797ca1 Accidentally committed with debug code 2012-01-11 22:35:22 -05:00
Piotr Mitros
e9819ffb48 customresponse basically works 2012-01-11 22:33:34 -05:00
Ernie Park
a1cb0b0a4e enable HTML5 fallback for non-flash enabled browsers and fix transparency issue in flash 2012-01-11 16:05:03 -05:00
Ernie Park
b7974ad27b fix bug where HTML5 videos wouldn't play when switching to new tab because callback function wasn't being called when video was ready 2012-01-11 16:03:34 -05:00
Bridger Maxwell
53155d228a Getting the names more consistent 2012-01-11 15:52:23 -05:00
Bridger Maxwell
f5bcc41bfd Changed names to match url pattern in urls.py
--HG--
branch : kf-homepage
2012-01-11 15:51:51 -05:00
Kyle Fiedler
2f246156b1 started reworking homepage
--HG--
branch : kf-homepage
2012-01-11 15:47:15 -05:00
Bridger Maxwell
a8b3da3f3e Changed template name from last commit 2012-01-11 15:43:43 -05:00
Bridger Maxwell
de52b657b0 Adding hooks for a new course info page 2012-01-11 15:42:52 -05:00
Kyle Fiedler
7167950cc4 add styles 2012-01-11 12:44:36 -05:00
Kyle Fiedler
6244031ce4 close wiki design branch
--HG--
branch : kf-wiki
extra : close : 1
2012-01-11 12:20:36 -05:00
Kyle Fiedler
333d76e997 merged in wiki design changes 2012-01-11 12:18:38 -05:00
Kyle Fiedler
4ca44ece54 Merged heads 2012-01-11 12:17:50 -05:00
Kyle Fiedler
9caf6e4c4b Added styles for wiki generated by scss 2012-01-11 12:16:58 -05:00
Kyle Fiedler
d5de197d5f merged in default
--HG--
branch : kf-wiki
2012-01-11 12:12:53 -05:00
Kyle Fiedler
741d174189 Added structure and style for most of the wiki
--HG--
branch : kf-wiki
2012-01-11 11:33:18 -05:00
Piotr Mitros
c99d1035d0 Saving schematics works 2012-01-10 22:42:14 -05:00
Piotr Mitros
87191432f2 Schematic with center tag from cjt 2012-01-10 22:24:52 -05:00
Piotr Mitros
18dc8cc5cb Major refactor of infrastructure for grading problems
--HG--
rename : courseware/calc.py => courseware/capa/calc.py
2012-01-10 22:04:24 -05:00
Piotr Mitros
fc81719a87 Refactor for new capa question/answer framework 2012-01-10 21:48:42 -05:00
Ernie Park
ec86424b41 fix video duration bug: when formatting time use floor, not round 2012-01-10 16:05:45 -05:00