Commit Graph

58450 Commits

Author SHA1 Message Date
Kyle Fiedler
b402cde650 Added some style for the dashboard message 2012-07-30 12:11:46 -04:00
Kyle Fiedler
c51f78bdfa Added styles for course images to always the right dimentions 2012-07-30 12:09:30 -04:00
Kyle Fiedler
a040f4346e Added styles for errors 2012-07-30 11:57:31 -04:00
Brittany Cheng
f290204dbc Merge branch 'master' of github.com:dementrock/mitx into discussion 2012-07-30 11:11:33 -04:00
Rocky Duan
4fcc76c24b Merge branch 'discussion_ui' of github.com:dementrock/mitx 2012-07-30 11:08:29 -04:00
Rocky Duan
d15d2c55e3 raise exception when received error from service 2012-07-30 11:05:15 -04:00
Brittany Cheng
65730c2268 Merge branch 'master' of github.com:dementrock/mitx into discussion 2012-07-30 10:45:04 -04:00
Kyle Fiedler
44168deffc Added styles for buttons 2012-07-30 09:51:50 -04:00
Kyle Fiedler
270f0f3ae4 Added more styles includeing the index page more color changes and header styles 2012-07-30 09:51:50 -04:00
Kyle Fiedler
b777d2c057 Added some more style for cal view and nav bar 2012-07-30 09:51:50 -04:00
Kyle Fiedler
84272f3f8c Added Gemfile.lock to ignore 2012-07-30 09:51:50 -04:00
Kyle Fiedler
1d5ce54140 Added styles for buttons 2012-07-30 09:51:49 -04:00
Kyle Fiedler
d53e4bd38f Added more styles includeing the index page more color changes and header styles 2012-07-30 09:51:49 -04:00
Kyle Fiedler
9d638d2ac0 Added some more style for cal view and nav bar 2012-07-30 09:50:25 -04:00
Kyle Fiedler
d94fd1542d Added Gemfile.lock to ignore 2012-07-30 09:50:24 -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
Brittany Cheng
f6a3842fd8 merging inline html 2012-07-28 18:18:47 -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
Brittany Cheng
4535188099 style changes 2012-07-27 17:20: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
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
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
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
e5117dba13 Mostly fix tests.
* change custom tags in test/data/full to new single-tag format
* fix broken file references
* fix argument to import_from_xml
* error_handler fix in mongo.py in next commit
2012-07-27 16:08:23 -04:00
Victor Shnayder
a5bacb4696 add now-mandatory metadata to toy course.xml 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
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
Victor Shnayder
d43831e11c add to overview of course.xml processing 2012-07-27 16:06:55 -04:00
Victor Shnayder
8a6b9a5666 update lms readme 2012-07-27 16:06:54 -04:00
Brittany Cheng
148d499bfe Merge branch 'master' of github.com:dementrock/mitx into discussion 2012-07-27 14:43:43 -04:00