Victor Shnayder
0ae434cc09
Move path_to_location out of mongo.py
...
* also bugfix for load_definition in html_module
* a bit of refactoring of Location checking code in mongo.py
2012-08-01 11:40:12 -04:00
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
Victor Shnayder
d750d945fd
Remove malformed tags when contents aren't malformed anymore.
2012-08-01 11:40:12 -04:00
Victor Shnayder
c53ed6a238
remove some debugging messages
2012-08-01 11:40:11 -04:00
Victor Shnayder
10054e95ce
add message to import command
2012-08-01 11:40:11 -04:00
Victor Shnayder
0d83d2e645
Add roundtrip test for malformed module
...
* also fix error message in backcompat_module
2012-08-01 11:40:11 -04:00
Victor Shnayder
53608922ba
Make the malformed descriptor import properly
...
* Also get rid of lazy loading of metadata and definition
2012-08-01 11:40:11 -04:00
Victor Shnayder
ef6da22ac3
Add a fallback MalformedDescriptor
...
* when things don't load normally, use this
* separate raw editing functionality into EditingDescriptor
* raw descriptor just enforces that xml is valid
* add a MalformedDescriptor that just saves a string
* Fallback to it on import.
2012-08-01 11:40:11 -04:00
Victor Shnayder
4e6a9b0df7
Add kwargs back to DescriptorSystem init()s
...
* allow future expansion without breaking interface.
2012-08-01 11:40:11 -04:00
Calen Pennington
0bfcefd214
Merge pull request #327 from MITx/fix-beautifulsoup4
...
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
2012-08-01 08:39:38 -07: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
Brittany Cheng
c107d109c9
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-01 11:29:26 -04: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
jarv
a2e1409dbb
Merge pull request #328 from MITx/jarv/dev-script-updates
...
Jarv/dev script updates
2012-08-01 08:13:34 -07:00
John Jarvis
94c19059b5
trailing whitespace
2012-08-01 11:08:41 -04:00
John Jarvis
71898e4869
removing matplotlib from requirements.txt
2012-08-01 10:54:50 -04:00
John Jarvis
8c1bb0cab2
sanity checking /usr/local, updating coffee script install location, old location no longer works
2012-08-01 10:54:32 -04:00
kimth
8a983b3ced
Queuekey does not need to be integer
2012-08-01 10:39:09 -04:00
kimth
fac7659315
Use xqueue cname
2012-08-01 10:23:30 -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
ichuang
381d247589
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
2012-07-31 21:43:29 -04: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
jarv
f099928150
Merge pull request #324 from MITx/jarv/dev-script-updates
...
Jarv/dev script updates
2012-07-31 14:59:51 -07:00
John Jarvis
b08ea47bf3
Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates
2012-07-31 17:24:09 -04:00
John Jarvis
0642af0147
submodules are not on a branch, no need to pull
2012-07-31 17:17:33 -04:00
John Jarvis
ecab194e47
removing unnecessary chdir
2012-07-31 17:14:22 -04:00
John Jarvis
5c73a6f2ca
betting rvmrc handling
2012-07-31 17:04:58 -04:00
David Ormsbee
61fa118427
Merge pull request #325 from MITx/feature/kfiedler/courseware-style
...
Navigation style and make askbot have style
2012-07-31 13:58:18 -07:00
John Jarvis
9c31715da5
removing virtualenv install lines that arent needed
2012-07-31 16:55:07 -04:00
John Jarvis
4d1bf53027
Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates
2012-07-31 16:53:29 -04:00
John Jarvis
37ba0395e0
do not install virtualenv unless it needs to be upgraded (<1.7)
2012-07-31 16:49:18 -04:00
Brittany Cheng
72bd3e6db0
edit tag styles
2012-07-31 16:44:55 -04:00
kimth
11495563fa
Tweaks to CodeMirror: fix indentation, textarea is vertically resizable
2012-07-31 16:42:17 -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
f3567ddd66
Change absolute paths to relative in scss
...
* makes collectstatic happy
2012-07-31 16:15:49 -04:00
Victor Shnayder
71b9dbbb2e
Remove obsolete js references
2012-07-31 16:15:33 -04:00
John Jarvis
e08cb5067e
always pip install virtualenv
2012-07-31 16:09:11 -04:00
John Jarvis
0919963119
adding option back for --system-site-packages, will ensure virtualenv > 1.7
2012-07-31 16:07:00 -04:00
Rocky Duan
84fcb5ef52
change watch to follow in front end
2012-07-31 16:00:42 -04:00
John Jarvis
50dc4e80a3
adding askbot as a submodule of mitx
2012-07-31 15:49:11 -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
John Jarvis
5e8d132aad
removing askbot-devel
2012-07-31 15:15:49 -04:00
Brittany Cheng
3d389c099e
new post control button and link styles
2012-07-31 15:05:07 -04:00
