Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

7928 Commits

Author SHA1 Message Date
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
Rocky Duan
1ad838ace8 fix random js stuff; tag fields; override mathjax config for now 2012-07-28 18:15:37 -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
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
Victor Shnayder
128d11e20e line length fixes 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
f10c4c06b6 Start adding tests for mongo modulestore 
* fix up toy course to match current format
* fix github sync test that referred to toy course
 2012-07-27 16:08:23 -04:00
Victor Shnayder
60cba3d95f Move import_from_xml to xmodule/modulestore 2012-07-27 16:08:23 -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
dae9b16a42 Clean up DescriptorSystem constructor hierarchy 
In response to spending an hour with a strange argument passing bug that neither I nor Cale could figure out.

* pass all arguments explicitly
* pass arguments in a consistent order between classes
 2012-07-27 16:08:23 -04:00
Victor Shnayder
a7159716f9 fix out-of-date code 
* no more __xmltree.
 2012-07-27 16:08:23 -04:00
Victor Shnayder
00da2b48e9 make sure course "org" and "course" are preserved on export 2012-07-27 16:08:23 -04:00
Victor Shnayder
9461148b6e make customtag take impl as attribute rather than child 2012-07-27 16:08:22 -04:00
Victor Shnayder
94ac61ffe2 Make decision about export file splitting overrideable 
* create split_to_file() function
* chapters, html, problems always split
* course never split
* others based on size of subtree for now
 2012-07-27 16:08:22 -04:00
Victor Shnayder
e0513f5f24 Fix course tag name on export of definition 2012-07-27 16:08:22 -04:00
Victor Shnayder
5f84e61925 Add hook for error handling during xml import 
* add error_handler member to DescriptorSystem
* call it where import errors happen
* also includes some refactoring in xml.py
* some more line length and docstring cleanups
 2012-07-27 16:08:22 -04:00
Victor Shnayder
63f34f2e70 Line length and doc string cleanups 
* no functionality changed in this commit.
 2012-07-27 16:08:22 -04:00
Rocky Duan
7a53bc52ae Merge branch 'master' of github.com:MITx/mitx 2012-07-27 12:30:54 -04:00
Calen Pennington
6abd1ec64a Merge pull request #309 from MITx/feature/tutorials_fix 
Add optional hide_from_toc attribute to XML elements
 2012-07-27 05:38:29 -07:00
Rocky Duan
104e4c9fc8 Merge branch 'master' of github.com:MITx/mitx 2012-07-26 17:35:40 -04:00
Arjun Singh
c4c8bc2fbe Adding the ability for javascript from problems to execute more intelligently; for example, errors from javascript included in the returned html will show up in the console when using this mechanism. 2012-07-26 16:35:33 -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
Calen Pennington
1d554c76a0 Comment out really loud debug messages from xml.py 2012-07-26 12:05:23 -04:00
Rocky Duan
aab9f8dc1c make course id available in xmodule 2012-07-25 18:15:52 -04:00
Rocky Duan
e6d437b66e get user_id in discussion module 2012-07-25 18:15:52 -04:00
Rocky Duan
d49338c948 integrated search; refactored some frontend code 2012-07-25 18:15:51 -04:00
Rocky Duan
3267aa1737 forum view for discussions 2012-07-25 18:14:58 -04:00
Rocky Duan
846a488ef2 create new post 2012-07-25 18:11:00 -04:00
Rocky Duan
9abc888340 display simple threaded comment 2012-07-25 18:09:34 -04:00
Rocky Duan
0373096c8d initial setup for the discussion module 2012-07-25 18:09:34 -04:00
Calen Pennington
8b1bab75bd Fixing up comments on xmodule components 2012-07-25 10:10:17 -04:00
Calen Pennington
bdf964a305 Modularize video css 2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695 Modularize sequence css 2012-07-24 16:14:04 -04:00
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
ebb737b94a Add better logging to capa_module during problem checking 2012-07-24 16:14:03 -04:00
Calen Pennington
1924609b10 Move schematic.js into capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
6ea5f6a493 Move imageinput.js to capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
7e4d3c8b35 Modularize sequence coffeescript in prepration for CMS preview 2012-07-24 16:14:02 -04:00
Victor Shnayder
5988d1f47f Organize and de-duplicate imports in mongo.py 2012-07-24 16:14:02 -04:00
Victor Shnayder
49e8d08c1e Add get_courses() to mongo modulestore 
* Note: This doesn't run yet
* add config file for lms on mongo
* Some comment additions and cleanups
 2012-07-24 16:14:01 -04:00
Victor Shnayder
51ae0d5484 improve docstrings and formating in mongo.py 2012-07-24 16:14:01 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Calen Pennington
cb6c7640c8 Get the video module pointing to the correct static files directory, without relying on get_html replacement 2012-07-24 16:14:01 -04:00