Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,676 Commits 1 Branch 0 Tags
818cb0d1e78022cd157d8e822712fcbd54f13ec3
Commit Graph

3676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
818cb0d1e7 Separate cms and lms auth and env files, and have the LMS that runs with the CMS use the CMS modulestore 2012-07-30 12:59:28 -04:00
Calen Pennington
d86b72fc24 Split REPOS data into separate file on aws 2012-07-30 12:59:28 -04:00
Calen Pennington
7e06c72e42 Add logsettings to CMS 2012-07-30 12:59:28 -04:00
Calen Pennington
d6dc45756c Add an aws settings for the cms 2012-07-30 12:59:28 -04:00
Calen Pennington
012036a478 Clean up minor whitespace stuff in settings 2012-07-30 12:59:28 -04:00
Calen Pennington
39e5a7762e Make github_sync use a namedtuple for repo settings 2012-07-30 12:59:28 -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
Calen Pennington
5e60983e48 Merge pull request #314 from MITx/kf-cms-style 
Style for CMS
 2012-07-30 09:58:08 -07:00
Calen Pennington
02217c33ac Merge pull request #313 from MITx/feature/victor/xml-verify 
Feature/victor/xml verify
 2012-07-30 09:57:37 -07: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
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
Bridger Maxwell
0a60881ca5 Merge branch 'master' of github.com:MITx/mitx 2012-07-27 08:50:07 -04:00
Bridger Maxwell
351ded6c05 Merge branch 'MITx/hotfix/1.0.2' 2012-07-27 08:49:33 -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
Bridger Maxwell
dc021312dd Added faq about UC Berkeley's 'X University' Consortium. 2012-07-27 08:38:01 -04:00
Calen Pennington
aa855eec0f Merge pull request #307 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-27 05:37:57 -07:00
Calen Pennington
81d5c17a60 Merge pull request #310 from MITx/arjun/javascript_loading 
Adding the ability for javascript from problems to execute more intelligently
 2012-07-27 05:37:04 -07:00