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
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
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
Brittany Cheng
aff57bf855
mostly font edits
2012-07-27 14:43:33 -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
Piotr Mitros
2df7e02e31
Fixed comment
2012-07-27 10:23:44 -04:00
Piotr Mitros
6db146f6b4
Missing files
2012-07-27 10:19:51 -04:00
Piotr Mitros
c8b2b4d464
Miniture staff dashboard. Not really tested, but should be safe to merge
2012-07-27 10:14:07 -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
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
Brittany Cheng
3b7b92993c
Merge branch 'master' of github.com:MITx/mitx into discussion
2012-07-26 18:00:17 -04:00
Rocky Duan
03898f4ab7
fixed unmatched div tag
2012-07-26 17:57:37 -04:00
Rocky Duan
104e4c9fc8
Merge branch 'master' of github.com:MITx/mitx
2012-07-26 17:35:40 -04:00
Rocky Duan
fc4e21d4c4
use wmd editor for comments
2012-07-26 17:35:09 -04:00
Calen Pennington
6afe1709e7
Merge pull request #306 from MITx/arjun/compile_coffee
...
Compiling coffee files in course data directories on startup.
2012-07-26 13:31:46 -07:00
Rocky Duan
2e26f84e9b
improve for multiple editor on page
2012-07-26 16:20:26 -04:00
Rocky Duan
dbad9338e1
removed unnecessary/commented out lines
2012-07-26 16:01:57 -04:00
David Ormsbee
9cd3b013f3
Merge pull request #308 from MITx/feature/halogenandtoast/form-field-errors
...
Add field-error class to field with issues.
2012-07-26 12:54:04 -07:00
Brittany Cheng
a3bb3182c0
Merge branch 'master' of github.com:dementrock/mitx into discussion
2012-07-26 15:43:17 -04:00
Brittany Cheng
7a44ebb34d
Merge branch 'master' of github.com:MITx/mitx into discussion
2012-07-26 15:40:01 -04:00
Rocky Duan
b37df4d0a5
removed the dumb debug line
2012-07-26 15:35:06 -04:00
Rocky Duan
f0ce33c951
make mathjax working with the editor
2012-07-26 15:34:22 -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
Victor Shnayder
08ce3944ab
Make logging work for xmodule and company.
...
* We do not want to disable existing loggers when setting up our own
2012-07-26 14:49:11 -04:00
Matthew Mongeau
8e2ced916f
Add field-error class to field with issues.
2012-07-26 14:06:29 -04:00
Arjun Singh
73261719ce
Added TODO near temporary code.
2012-07-26 13:14:00 -04:00
Rocky Duan
b04a645685
make indentation the same
2012-07-26 11:11:45 -04:00
Rocky Duan
eb0a9bc9e8
only run customwmd when where's markdown
2012-07-26 11:11:30 -04:00
Rocky Duan
1a57ac50f4
custom mathjax setup
2012-07-26 11:09:33 -04:00
kimth
6631848b53
CodeMirror fix in the new scss org
2012-07-26 10:49:10 -04:00
Rocky Duan
9d2bccbee7
Merge branch 'master' of github.com:MITx/mitx
2012-07-26 10:43:42 -04:00
Calen Pennington
73d6565fac
Merge remote-tracking branch 'origin/hotfix/1.0.1'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-26 09:05:57 -04:00
Arjun Singh
3002260de5
Compiling coffee files in course data directories on startup.
2012-07-25 21:45:01 -04:00
Rocky Duan
7103bd0071
moved vendor js files to common
2012-07-25 20:57:38 -04:00
Rocky Duan
63633ae1d3
files for wmd editor
2012-07-25 20:47:11 -04:00
Rocky Duan
9f1353b027
removed nonexisted scss links
2012-07-25 20:42:27 -04:00
