Commit Graph

16546 Commits

Author SHA1 Message Date
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
Ernie Park
05ce1a0eb5 HTML5 fallback working, time duration buggy from earlier, loading different tabs subtitles/autoplay isn't triggered 2012-01-10 16:03:41 -05:00
Bridger Maxwell
e58aca2878 Relaxed parameters for wiki search, to find more articles. 2012-01-10 15:52:10 -05:00
Bridger Maxwell
680e3da1dc Getting simplewiki search to work. 2012-01-10 14:13:06 -05:00
Bridger Maxwell
eeec1461ee Merged with simplewiki search changes 2012-01-10 14:11:01 -05:00
Bridger Maxwell
678c9464a6 Getting simplewiki search working.
--HG--
branch : profile
2012-01-10 14:06:58 -05:00
Ernie Park
bc3a6d38fd fix bug introduced in fdf0d141844d where MODULE_TYPES defined after it was used 2012-01-09 20:38:09 -05:00
Bridger Maxwell
55c80428d8 Adding a branch to do profiling work.
--HG--
branch : profile
2012-01-09 17:19:36 -05:00
Kyle Fiedler
61a713f2c2 Changed some style for the courseware, fixed the footer links and fixed the modal window 2012-01-09 16:56:22 -05:00
Kyle Fiedler
d54ab7502c Added new css file generated by scss 2012-01-09 15:14:47 -05:00
Kyle Fiedler
8b29b15351 Merged courseware branch 2012-01-09 15:14:01 -05:00
Kyle Fiedler
76b4f6467a Added more style for problems and acordion
--HG--
branch : kf-courseware
2012-01-09 14:48:55 -05:00
Ernie Park
dc44eac627 Merge 2012-01-09 14:29:11 -05:00
Ernie Park
3aa5df6a14 Piotr added comments 2012-01-09 14:28:46 -05:00
Kyle Fiedler
1fc4ab7d08 Merged in default
--HG--
branch : kf-courseware
2012-01-09 11:54:13 -05:00
Kyle Fiedler
fceb44ea80 Fix spelling on readme and edit some css
--HG--
branch : kf-courseware
2012-01-09 11:50:52 -05:00
Bridger Maxwell
c217432ab3 Changed simplewiki templates to inherit from main.html and have standard navigation, footer, etc. 2012-01-09 11:44:15 -05:00
Bridger Maxwell
d561504c50 Merged Mako simplewiki changes. 2012-01-09 10:03:41 -05:00
Bridger Maxwell
2202ec0931 Merged Mako simplewiki templates 2012-01-09 10:02:24 -05:00
Bridger Maxwell
5d3d5489dd Fixed more bugs with simplewiki template conversion. Now working as they originally were. 2012-01-08 04:54:08 -05:00
Bridger Maxwell
67fc2586e5 Fixed bugs in templates. Now working as they were originally, but with Mako. 2012-01-08 04:53:22 -05:00
Bridger Maxwell
4ca87c445b Converting SimpleWiki pages to Mako templates. Moving them to templates. Some bugs remain. 2012-01-08 02:20:48 -05:00
Bridger Maxwell
1968d520c2 Moving SimpleWiki templates to templates/ and using Mako template format. 2012-01-08 02:19:23 -05:00
Piotr Mitros
2aec53aa83 New-style classes 2012-01-06 19:50:23 -05:00
Kyle Fiedler
bcdf6d502a merge 2012-01-06 16:43:11 -05:00
Kyle Fiedler
0f94c8dff8 Removed css files 2012-01-06 16:42:52 -05:00
Kyle Fiedler
31ac4ea8a8 Added application.css that is the gernated sass css 2012-01-06 16:41:08 -05:00
Kyle Fiedler
784071573f merged kf-refactor into default 2012-01-06 16:37:46 -05:00
Kyle Fiedler
512381bdd1 Fixed merge confilcts, hopefully
--HG--
branch : kf-refactor
2012-01-06 16:32:51 -05:00
Kyle Fiedler
63ad756a2d Added style for video and sequence
--HG--
branch : kf-refactor
2012-01-06 15:38:21 -05:00
Kyle Fiedler
170f81a487 More style for the textbook page and various style fixes
--HG--
branch : kf-refactor
2012-01-06 13:19:57 -05:00
Piotr Mitros
a0abfe178d Feedback text a bit better. Window clears when submitted 2012-01-06 09:53:33 -05:00
Piotr Mitros
a387f9fc46 Merge 2012-01-06 08:13:11 -05:00