eb532d0d51
The 'not found' wiki page now has a working 'create article' link
Bridger Maxwell
2012-01-17 19:02:43 -05:00
9155eedda3
manage.py has execute permissions
Piotr Mitros
2012-01-17 13:39:49 -05:00
a8e03a2427
merge
Ernie Park
2012-01-16 21:43:04 -05:00
c877e538f5
add html5 youtube iframe tag css to application.css
Ernie Park
2012-01-16 21:42:51 -05:00
9682aea995
Stupid typo in settings.py
Piotr Mitros
2012-01-16 21:34:16 -05:00
5859f466ec
Run without courseware with --settings
Piotr Mitros
2012-01-16 20:39:50 -05:00
851bf3e692
Fixed revery in settings.py
Piotr Mitros
2012-01-16 18:19:27 -05:00
972001d3e9
merge
Ernie Park
2012-01-16 16:25:05 -05:00
fb9d4fe2a8
merge changes
Ernie Park
2012-01-16 16:24:48 -05:00
1fb47e9cdd
settings.py had textbook. Worked on dev machines because .pyc files stuck around; didn't work on staging
Piotr Mitros
2012-01-16 15:58:50 -05:00
7600920f76
CJT's new schematic editor
Piotr Mitros
2012-01-16 13:29:57 -05:00
25389b5a2d
Close page event logging works in FF and Chrome
Piotr Mitros
2012-01-16 13:24:52 -05:00
3ddddbe5c3
merge
Piotr Mitros
2012-01-16 12:33:43 -05:00
56c81a07fd
Fixed -.33 bug in calculator from gjs
Piotr Mitros
2012-01-16 12:33:29 -05:00
d909e89104
Added setting to generate random user credentials to test account creation. Might have accidentally stomped other changes to settings.py
Bridger Maxwell
2012-01-16 11:48:45 -05:00
d65d268045
Fixed two minor errors. setting -> settings, default PERF_STATS in settings.py
Piotr Mitros
2012-01-16 11:38:41 -05:00
86bc89fd23
We can now manage.py runserver --settings=setting_no_askbot
Piotr Mitros
2012-01-16 11:34:41 -05:00
c05ecb4747
merge
Piotr Mitros
2012-01-14 00:09:53 -05:00
1bd924bef1
Sequence steps logged
Piotr Mitros
2012-01-14 00:09:31 -05:00
238ed76896
The new markdown framework version was not backwards compatible. Now the wiki source can use either version of the API.
Bridger Maxwell
2012-01-14 00:09:01 -05:00
c598b6de68
Logging has a timeout so it doesn't crash Chrome
Piotr Mitros
2012-01-14 00:05:37 -05:00
f840e24104
Merge
Piotr Mitros
2012-01-14 00:04:56 -05:00
7c6e33acb3
Removed wiki print statements
Piotr Mitros
2012-01-14 00:03:22 -05:00
f0786bbec1
Page close event logged
Piotr Mitros
2012-01-13 23:44:59 -05:00
219ff18c27
More packages available from customresponse
Piotr Mitros
2012-01-13 17:56:20 -08:00
e4831106bf
Fixed bug in reset
Piotr Mitros
2012-01-13 17:06:42 -08:00
2146b7db66
merge
Piotr Mitros
2012-01-13 17:00:54 -08:00
1f2251c98c
Making 6.002 page main, moving static pages into static page framework
pmitros
2012-01-13 16:57:06 -08:00
ea603775ca
Making 6.002 page main, moving static pages into static page framework
pmitros
2012-01-13 16:57:02 -08:00
dad70c5ae3
Proper from addresses, static view allows CSRF
Piotr Mitros
2012-01-13 19:41:28 -05:00
089b51589a
move html5 iframe stylings to sass file
Ernie Park
2012-01-13 13:35:38 -05:00
55c10212f9
SITENAME, e-mail addresses
Piotr Mitros
2012-01-13 09:43:06 -05:00
5b7a59bc58
Staging page works
Piotr Mitros
2012-01-13 07:26:53 -05:00
83c8fb8422
Styled log in popover
Kyle Fiedler
2012-01-12 17:18:58 -05:00
3a33e238f4
Styled log in popover
Kyle Fiedler
2012-01-12 17:18:41 -05:00
832a855643
Fixed bug. Not clear why original worked on some computers but not others.
Piotr Mitros
2012-01-12 14:28:26 -05:00
e6b9a6dd58
Comment
Piotr Mitros
2012-01-12 14:12:09 -05:00
0ce7d742a2
add .scssc to hgignore
Ernie Park
2012-01-12 10:38:39 -05:00
eb73a0e86e
merging html5 video stuff in
Ernie Park
2012-01-12 10:04:01 -05:00
5e9c29654e
merging html5 video stuff in
Ernie Park
2012-01-12 10:03:20 -05:00
b92ca0028a
added subs for current course.xml
fischerl
2012-01-12 09:27:13 -05:00
95c8797ca1
Accidentally committed with debug code
Piotr Mitros
2012-01-11 22:35:22 -05:00
e9819ffb48
customresponse basically works
Piotr Mitros
2012-01-11 22:33:34 -05:00
a1cb0b0a4e
enable HTML5 fallback for non-flash enabled browsers and fix transparency issue in flash
Ernie Park
2012-01-11 16:05:03 -05:00
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
Ernie Park
2012-01-11 16:03:34 -05:00
53155d228a
Getting the names more consistent
Bridger Maxwell
2012-01-11 15:52:23 -05:00
f5bcc41bfd
Changed names to match url pattern in urls.py
Bridger Maxwell
2012-01-11 15:51:51 -05:00
2f246156b1
started reworking homepage
Kyle Fiedler
2012-01-11 15:47:15 -05:00
a8b3da3f3e
Changed template name from last commit
Bridger Maxwell
2012-01-11 15:43:43 -05:00
de52b657b0
Adding hooks for a new course info page
Bridger Maxwell
2012-01-11 15:42:52 -05:00
9caf6e4c4b
Added styles for wiki generated by scss
Kyle Fiedler
2012-01-11 12:16:58 -05:00
d5de197d5f
merged in default
Kyle Fiedler
2012-01-11 12:12:53 -05:00
741d174189
Added structure and style for most of the wiki
Kyle Fiedler
2012-01-11 11:33:18 -05:00
c99d1035d0
Saving schematics works
Piotr Mitros
2012-01-10 22:42:14 -05:00
87191432f2
Schematic with center tag from cjt
Piotr Mitros
2012-01-10 22:24:52 -05:00
18dc8cc5cb
Major refactor of infrastructure for grading problems
Piotr Mitros
2012-01-10 22:04:24 -05:00
fc81719a87
Refactor for new capa question/answer framework
Piotr Mitros
2012-01-10 21:48:42 -05:00
ec86424b41
fix video duration bug: when formatting time use floor, not round
Ernie Park
2012-01-10 16:05:45 -05:00
05ce1a0eb5
HTML5 fallback working, time duration buggy from earlier, loading different tabs subtitles/autoplay isn't triggered
Ernie Park
2012-01-10 16:03:41 -05:00
e58aca2878
Relaxed parameters for wiki search, to find more articles.
Bridger Maxwell
2012-01-10 15:52:10 -05:00
76b4f6467a
Added more style for problems and acordion
Kyle Fiedler
2012-01-09 14:48:55 -05:00
dc44eac627
Merge
Ernie Park
2012-01-09 14:29:11 -05:00
3aa5df6a14
Piotr added comments
Ernie Park
2012-01-09 14:28:46 -05:00
1fc4ab7d08
Merged in default
Kyle Fiedler
2012-01-09 11:54:13 -05:00
fceb44ea80
Fix spelling on readme and edit some css
Kyle Fiedler
2012-01-09 11:50:52 -05:00
c217432ab3
Changed simplewiki templates to inherit from main.html and have standard navigation, footer, etc.
Bridger Maxwell
2012-01-09 11:44:15 -05:00