Brittany Cheng
845ca43ea1
inline and forum styles
2012-08-01 16:42:09 -04:00
Brittany Cheng
01623ddbfb
merge with origin master
2012-08-01 14:24:46 -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
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
ichuang
381d247589
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
2012-07-31 21:43:29 -04:00
Brittany Cheng
f1e07024d4
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-07-31 18:43:21 -04:00
kimth
11495563fa
Tweaks to CodeMirror: fix indentation, textarea is vertically resizable
2012-07-31 16:42:17 -04:00
Kyle Fiedler
d30ae5389e
Added fix for videos start to zero out colors and mit styles
2012-07-31 14:18:42 -04:00
kimth
2e3c5de1a5
Remove hardcoding of LMS callback URL and default queuename
2012-07-31 14:08:02 -04:00
Rocky Duan
20f958e6be
bug fix: resize input for defaulttext (tagsinput)
2012-07-31 14:03:55 -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
c39b2db678
retrieve inline discussion by ajax
2012-07-31 13:22:25 -04:00
kimth
a773df588a
Merge branch 'master' into kimth/lms-coderesponse
2012-07-31 13:02:48 -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
Rocky Duan
ada66adff6
Merge branch 'master' of github.com:MITx/mitx
2012-07-31 10:12:06 -04:00
kimth
e2f4995bc9
LMS provides fully qualified callback URL
2012-07-31 08:57:28 -04:00
ichuang
94e73936fc
Merge pull request #319 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-07-30 18:51:16 -07:00
kimth
6d600ecf2c
Merge branch 'master' into kimth/lms-coderesponse
2012-07-30 20:42:10 -04:00
kimth
b9e5e9f0ee
Read XML for queuename
2012-07-30 20:18:25 -04:00
kimth
6244412c28
Simplify default linenumbers behavior
2012-07-30 18:59:11 -04:00
Rocky Duan
d6b7707725
refactored reply rendering by using mustache
2012-07-30 18:19:04 -04:00
Rocky Duan
8228bebc2a
Merge branch 'master' of github.com:MITx/mitx
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/envs/common.py
2012-07-30 17:41:19 -04:00
kimth
bd66a28d32
Add TODO note
2012-07-30 15:23:14 -04:00
Calen Pennington
ab0055c201
Add update_schematic to window in schematic.js
2012-07-30 14:04:39 -04:00
Calen Pennington
395cf147be
Look up data_dir in the metadata, not in the top of the json object when loading from mongodb
2012-07-30 14:04:39 -04:00
Calen Pennington
2caf1024f1
Force mongodb fs_root to be a path object
2012-07-30 14:04:15 -04:00
Calen Pennington
d0c99151f0
Continue during backcompat imports by replacing contents with error xml
2012-07-30 14:04:15 -04:00
Calen Pennington
66d5c8effd
Add more detail to error messages during loading from xml
2012-07-30 13:50:50 -04:00
Calen Pennington
6997fc579e
Continue on errors when syncing with github
2012-07-30 13:50:00 -04:00
kimth
bd0b20bb60
xqueue_callback uses 'xqueue_body' tag rather than 'response' tag for main message
2012-07-30 13:35:13 -04:00
Calen Pennington
05add5818b
Return a custom error for duplicate elements, and ignore it when loading into mongo
2012-07-30 13:16:21 -04:00
kimth
4e43b662fa
CodeResponse admits only one student response
2012-07-30 13:10:24 -04:00
Calen Pennington
c9e637d719
Make cms and lms tests run independently (they had been colliding on collectstatic)
2012-07-30 12:58:45 -04:00
kimth
80b62bf026
Serialize xqueue payload
2012-07-30 12:30:08 -04:00
Rocky Duan
3ad309c2fd
forgot to include files & tiny styling fix
2012-07-29 17:40:11 -04:00
Rocky Duan
8e3251c915
basic tag autocomplete
2012-07-29 17:32:00 -04:00
Rocky Duan
b92a180d25
add tags to threads & view threads by tags
2012-07-29 15:24:15 -04:00
Rocky Duan
1ad838ace8
fix random js stuff; tag fields; override mathjax config for now
2012-07-28 18:15:37 -04:00
Rocky Duan
0790a3add4
image uploading & render markdown
2012-07-27 17:50:38 -04:00
Victor Shnayder
59defd33b6
Formatting and little bugfixes
...
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
2012-07-27 16:09:25 -04:00
Victor Shnayder
a8afe5ed17
Change modulestore to use a logging error handler
...
* log errors, but don't fail
2012-07-27 16:09:25 -04:00
Victor Shnayder
9c92aef669
Tweaks to test data for full course
...
* Add extra nested html file
* add a start date
2012-07-27 16:09:25 -04:00
Victor Shnayder
73b3826820
Initial integration tests!
...
* new env file to run integration tests with mongo backend
- needs askbot to get db in the right state
- needs wiki to load pages successfully
- not using migrations to make it run faster
* import test courses, check that each page loads without erroring.
* fix NonePointerException in index view to make tests pass
* misc formatting cleanups
2012-07-27 16:09:25 -04:00
Victor Shnayder
1251686359
xml format cleanups
...
* rename slug->url_name
* rename name->display_name
* docstring cleanups
* comments :)
2012-07-27 16:09:25 -04:00
Victor Shnayder
3c3bbd114e
minor formatting tweaks
2012-07-27 16:08:24 -04:00
Victor Shnayder
da29d88d04
Add import-export round-trip check.
...
* add fix for the file export code--remove tag tail and text,
not just the children.
2012-07-27 16:08:24 -04:00
