Victor Shnayder
ed35cefa29
Fix html file handling.
...
* html files are now stored as follows:
If the html file is valid xml, store as html/stuff.xml
If it's not, store as html/stuff.xml, which contains
<html meta1="..." filename="stuff.html">,
and html/stuff.html, which actually contains the contents.
Warn if the contents are not parseable with lxml's html parser,
but don't error.
* for parseable html, strip out the html tag when storing, so that it isn't
rendered into the middle of a page
* lots of backcompat to deal with paths. Can go away soon.
* fix output ordering in clean_xml
2012-08-01 11:40:12 -04:00
Victor Shnayder
46775386d3
make CACHE_TIMEOUT messages go away
2012-08-01 11:40:12 -04:00
Calen Pennington
ef8a211b9e
Merge pull request #329 from MITx/MITx/feature/bridger/fast_course_grading
...
Got profile page working again.
2012-08-01 08:37:16 -07:00
Bridger Maxwell
ae3da772d0
Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.
2012-08-01 11:27:04 -04:00
Brittany Cheng
f637ca5120
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-01 09:44:45 -04:00
ichuang
b9773b5d17
Merge pull request #323 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-07-31 19:45:55 -07:00
Brittany Cheng
8023d2b70a
pulled from origin master
2012-07-31 18:48:39 -04:00
Brittany Cheng
f1e07024d4
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-07-31 18:43:21 -04:00
Brittany Cheng
33c7336f1d
styles again
2012-07-31 18:17:35 -04:00
Brittany Cheng
72bd3e6db0
edit tag styles
2012-07-31 16:44:55 -04:00
Kyle Fiedler
b5b0d08621
Sorta fix askbot
2012-07-31 16:29:01 -04:00
Kyle Fiedler
9d14033f6b
Added some styles for the top navigation and for the sidebar navigation
2012-07-31 16:29:01 -04:00
Brittany Cheng
29d75057f2
fix font inheritance, update post control styles
2012-07-31 16:25:27 -04:00
Victor Shnayder
71b9dbbb2e
Remove obsolete js references
2012-07-31 16:15:33 -04:00
Rocky Duan
84fcb5ef52
change watch to follow in front end
2012-07-31 16:00:42 -04:00
Brittany Cheng
c69a4728e7
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-31 15:42:12 -04:00
Brittany Cheng
b12d887309
font sizing
2012-07-31 15:41:03 -04:00
Brittany Cheng
3d389c099e
new post control button and link styles
2012-07-31 15:05:07 -04:00
Rocky Duan
c46b232e19
oops missed a bracket
2012-07-31 14:32:00 -04:00
David Ormsbee
fafa86b413
Merge pull request #322 from MITx/feature/kfiedler/courseware-style
...
Added fix for videos start to zero out colors and mit styles
2012-07-31 11:31:16 -07:00
Kyle Fiedler
d30ae5389e
Added fix for videos start to zero out colors and mit styles
2012-07-31 14:18:42 -04:00
Brittany Cheng
b3474fbf10
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-31 14:09:12 -04:00
Brittany Cheng
ff4d0637f5
merging styles
2012-07-31 14:09:06 -04:00
Rocky Duan
32c76d1351
bug fix search bar lol..
2012-07-31 14:08:31 -04:00
kimth
2e3c5de1a5
Remove hardcoding of LMS callback URL and default queuename
2012-07-31 14:08:02 -04:00
Brittany Cheng
643316a10b
tag styles
2012-07-31 14:05:11 -04:00
Rocky Duan
20f958e6be
bug fix: resize input for defaulttext (tagsinput)
2012-07-31 14:03:55 -04:00
Rocky Duan
c43d5d236a
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
...
Conflicts:
lms/static/coffee/src/discussion.coffee
2012-07-31 13:43:53 -04:00
Brittany Cheng
836242706f
buttons
2012-07-31 13:41:21 -04:00
Rocky Duan
401f57b81a
show new post form after clicking button
2012-07-31 13:40:26 -04:00
Brittany Cheng
ddce6d8cb6
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-31 13:39:13 -04:00
Rocky Duan
799f66b776
make search bar configurable
2012-07-31 13:26:36 -04:00
Brittany Cheng
48674d6fa5
search button style
2012-07-31 13:23:35 -04:00
Rocky Duan
c39b2db678
retrieve inline discussion by ajax
2012-07-31 13:22:25 -04:00
kimth
0879f3e0a8
Use build_absolute_uri rather than hardcoded sandbox URL
2012-07-31 13:21:45 -04:00
kimth
a773df588a
Merge branch 'master' into kimth/lms-coderesponse
2012-07-31 13:02:48 -04:00
kimth
27e142dd2f
Extra empty line
2012-07-31 12:58:32 -04:00
Brittany Cheng
607bc6b50b
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-31 12:51:17 -04:00
Calen Pennington
b659846e1f
Add askbot to lms staticfiles_dirs in test
2012-07-31 12:46:47 -04:00
Rocky Duan
701f8716f7
only show edit button when user can edit
2012-07-31 12:31:59 -04:00
Brittany Cheng
cf92f356c0
edit styles for tags, discussion votes, etc
2012-07-31 12:03:45 -04:00
Rocky Duan
e301be4a80
modify anonymity handling; display comments count
2012-07-31 11:54:02 -04:00
Brittany Cheng
32cf7c6f66
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-07-31 11:26:17 -04:00
Kyle Fiedler
2bbb19790d
Fixed jquery ui image problem and added a base style sheet for lms to override fonts
2012-07-31 11:06:39 -04:00
Brittany Cheng
9bd1aa94d8
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-31 10:48:18 -04:00
Rocky Duan
a08d4b808b
fix raw tag data bug
2012-07-31 10:47:42 -04:00
kimth
3968e117e1
Simplify dict load in xqueue_callback
2012-07-31 10:42:32 -04:00
Brittany Cheng
278483371b
fix merge conflicts
2012-07-31 10:30:26 -04:00
Brittany Cheng
6285f2a2be
discussion styles
2012-07-31 10:27:14 -04:00
Rocky Duan
6f44001813
basic editing functionality
2012-07-31 10:11:51 -04:00
