Commit Graph

203 Commits

Author SHA1 Message Date
Rocky Duan
7ab137328f Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-03 10:16:35 -04:00
Victor Shnayder
64346d727b todos and comments 2012-08-02 11:33:53 -04:00
Brittany Cheng
8febbf249f Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-02 10:06:43 -04:00
Victor Shnayder
b63f05b651 update clean_xml script to use error trackers properly 2012-08-01 19:25:47 -04:00
Rocky Duan
ce15faf6a0 Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 2012-08-01 16:52:06 -04:00
Rocky Duan
fc31885d2e Merge branch 'master' into discussion2 2012-08-01 16:51:54 -04:00
Rocky Duan
5d3b187540 Merge branch 'master' of github.com:MITx/mitx 2012-08-01 16:45:21 -04:00
Brittany Cheng
07ebc83368 fixing merge error 2012-08-01 14:39:26 -04:00
Brittany Cheng
bdab90190f trying to fix merge conflicts 2012-08-01 14:29:00 -04:00
Brittany Cheng
01623ddbfb merge with origin master 2012-08-01 14:24:46 -04:00
Rocky Duan
777c3ee42c Merge branch 'master' of github.com:MITx/mitx
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/profile.html
2012-08-01 12:49:00 -04:00
Rocky Duan
75c478771e fixed histogram bug under staff view 2012-08-01 12:42:57 -04:00
Victor Shnayder
32253510d1 Import error cleanup
* call error tracker when needed
* remove duplicate logging--just add info and re-raise
* xml modulestore uses error tracker to capture load errors
* add unstyled list of import errors to courseware homepage!
2012-08-01 11:48:19 -04:00
Victor Shnayder
463b758434 fixed args in call to add_histogram 2012-08-01 11:48:18 -04:00
Victor Shnayder
0b67d1c401 Turn error_handlers into error_trackers
* simplify logic--tracker just tracks errors.  Trackers should not raise,
      and are not be responsible for logging.
* adapted code to use trackers.
* Started cleanup of error handling code:
  - if need to add info and re-raise, just do that.  No logging.
  - if working around a problem, log and track as needed.
2012-08-01 11:48:18 -04:00
Victor Shnayder
e2e524453f Make courseware index view more bulletproof 2012-08-01 11:48:18 -04:00
Victor Shnayder
c0cdff7071 Rename MalformedDescriptor to ErrorDescriptor
* change references and tests
* add staff/non-staff display
* added is_staff to ModuleSystem
2012-08-01 11:42:39 -04:00
Victor Shnayder
0edc40de34 Address minor comments in #313 2012-08-01 11:40:12 -04:00
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
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
kimth
2e3c5de1a5 Remove hardcoding of LMS callback URL and default queuename 2012-07-31 14:08:02 -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
27e142dd2f Extra empty line 2012-07-31 12:58:32 -04:00
kimth
3968e117e1 Simplify dict load in xqueue_callback 2012-07-31 10:42:32 -04:00
kimth
22af531b0b Hardcoded URL moved to LMS for now 2012-07-31 10:09:47 -04:00
kimth
e2f4995bc9 LMS provides fully qualified callback URL 2012-07-31 08:57:28 -04:00
Rocky Duan
e705bbb764 Merge branch 'discussion2' of github.com:dementrock/mitx
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
2012-07-30 17:45:29 -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
Brittany Cheng
91cb814ee0 merging with origin master 2012-07-30 16:28:49 -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
cb30850759 Config for integration tests
* move askbot repo into mitx as a submodule
* set settings as in 85865f7221
* remove test_mongo env.
* Refactor tests to use new config structure.
* Add real integration tests--not working due to bugs in course xml. Turned off.
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
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
Victor Shnayder
168f76ce5a Add jump_to functionality to lms on mongo
* More tests for mongo modulestore, including tweaks to test files
* add location_to_id method to CourseDescriptors
* Implement path_to_location method in mongo.py
  - TODO: does not handle position in sequences yet.
* fix bug in jump_to view.
2012-07-27 16:08:24 -04:00
Victor Shnayder
eb5989aa99 Ready to implement path_to_location
* Clean up test data for simple, toy courses
* clean up test_mongo.py
* write initial test for path_to_location
* hook up view to use path_to_location

Next: actually implement it :)
2012-07-27 16:08:24 -04:00
Victor Shnayder
3cc601b398 Clean up course_info views
* catch exceptions and return a 404 if course not found
* add Location.is_valid(), tests
* stub of jumpto/ view.
2012-07-27 16:08:23 -04:00
Victor Shnayder
beda4f95b2 Initial version of import/check/export script.
* uses xml modulestore, and new error_handler hook
2012-07-27 16:08:23 -04:00
Brittany Cheng
c5aa22ed65 Merge branch 'master' of github.com:MITx/mitx into discussion 2012-07-27 14:42:39 -04:00
Rocky Duan
7a53bc52ae Merge branch 'master' of github.com:MITx/mitx 2012-07-27 12:30:54 -04:00
David Ormsbee
72341569f9 Remove sections from ever getting appended in the first place if hide_from_toc is true 2012-07-27 01:22:07 -04:00
David Ormsbee
2671801f93 Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation). 2012-07-26 14:55:42 -04:00
Rocky Duan
52c7136493 Merge branch 'lol'
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/lib/comment_client.py
	lms/lib/datehelper
	lms/static/sass/application.scss
	lms/templates/discussion/index.html
	lms/templates/news.html
2012-07-25 18:41:24 -04:00
Rocky Duan
048deaa87f show news & options when submit comment 2012-07-25 18:16:57 -04:00
Rocky Duan
aab9f8dc1c make course id available in xmodule 2012-07-25 18:15:52 -04:00
Rocky Duan
b2da6eef9f provide user_id for xmodules 2012-07-25 18:15:52 -04:00
Rocky Duan
54ea3dba22 show news & options when submit comment 2012-07-25 15:30:05 -04:00