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 |
|
Piotr Mitros
|
9d01c286eb
|
New schematic.js from cjt
|
2012-01-06 08:12:25 -05:00 |
|
Piotr Mitros
|
4c7da227a3
|
Feedback button works
|
2012-01-05 22:09:51 -05:00 |
|
Piotr Mitros
|
138ff04f77
|
Feedback button works
|
2012-01-05 22:09:43 -05:00 |
|
Kyle Fiedler
|
b98d833762
|
Added some slight style and new typeface
--HG--
branch : kf-refactor
|
2012-01-05 21:39:55 -05:00 |
|
Kyle Fiedler
|
47bc1b8a68
|
Added more to the sass readme
--HG--
branch : kf-refactor
|
2012-01-05 20:40:27 -05:00 |
|
Piotr Mitros
|
3c95aabbd7
|
Feedback e-mail template
|
2012-01-05 20:29:07 -05:00 |
|
Piotr Mitros
|
af7167dbbe
|
Working calculator
|
2012-01-05 20:28:14 -05:00 |
|
Piotr Mitros
|
4a28fd3b13
|
Working calculator
|
2012-01-05 20:28:05 -05:00 |
|
Kyle Fiedler
|
88a3a69c71
|
added a bunch more overall style
--HG--
branch : kf-refactor
|
2012-01-05 20:27:07 -05:00 |
|
Piotr Mitros
|
5f89be8ff1
|
Bug fixes
|
2012-01-05 17:13:07 -05:00 |
|
Piotr Mitros
|
006b6cd067
|
Took out extreme suffixes, at Jerry's request
|
2012-01-05 15:47:57 -05:00 |
|
Piotr Mitros
|
ccc2a93b0a
|
Destroy JS more-or-less works. Still some bugs
|
2012-01-05 15:04:28 -05:00 |
|
Ernie Park
|
e6488bfcd4
|
update videoDestroy function to remove intervals since removeeventlistener doesn't exist, still needs to be called though
|
2012-01-05 14:46:45 -05:00 |
|
Piotr Mitros
|
0f98d66830
|
Login page has 'Remember Me'
|
2012-01-05 14:28:59 -05:00 |
|
Piotr Mitros
|
f25219cb74
|
Login page has 'Remember Me'
|
2012-01-05 14:28:54 -05:00 |
|
Kyle Fiedler
|
ba557aefae
|
Added layout for courseware, textbooks and profile
--HG--
branch : kf-refactor
|
2012-01-05 12:17:22 -05:00 |
|
Piotr Mitros
|
213d10619f
|
Wiki now supports circuits, modulo bugs
|
2012-01-04 19:03:29 -05:00 |
|
Piotr Mitros
|
e5a2c72123
|
Wiki now supports circuits, modulo bugs
|
2012-01-04 19:01:56 -05:00 |
|
Piotr Mitros
|
85e8b3a2e9
|
Wiki now supports circuits, modulo bugs
|
2012-01-04 19:00:52 -05:00 |
|
Kyle Fiedler
|
2ffe64dc3c
|
Added sass files and readme for generation
--HG--
branch : kf-refactor
|
2012-01-04 14:36:10 -05:00 |
|
Kyle Fiedler
|
340f4ffca4
|
Cleaned markup up more
--HG--
branch : kf-refactor
|
2012-01-04 11:14:37 -05:00 |
|
Piotr Mitros
|
510dd854e6
|
Inline math now works in wiki
|
2012-01-03 20:23:09 -05:00 |
|
Piotr Mitros
|
737cdb375e
|
Merge. Not sure why.
|
2012-01-03 20:17:04 -05:00 |
|
Piotr Mitros
|
505b85fc5c
|
Calculator bug fix
|
2012-01-03 20:15:17 -05:00 |
|
Piotr Mitros
|
eb68f73ea7
|
Bug where -(7+5) didn't work
|
2012-01-03 19:23:54 -05:00 |
|
Kyle Fiedler
|
57a3005f71
|
Refactored html for navigation
--HG--
branch : kf-refactor
|
2012-01-03 17:01:48 -05:00 |
|