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

844 Commits

Author SHA1 Message Date
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
Rocky Duan
e6776682df ..and fix again bug caused by changing id 2012-07-30 17:25:14 -04:00
Rocky Duan
5fcc12136e fixed bug caused by rearranging stuff 2012-07-30 17:20:30 -04:00
Rocky Duan
6c8214051f Merge branch 'discussion2' of github.com:dementrock/mitx 2012-07-30 17:17:32 -04:00
Rocky Duan
8bf2eb17e8 middleware file forgot to include 2012-07-30 17:17:09 -04:00
Rocky Duan
941ae0f068 basic error handling 2012-07-30 17:16:44 -04:00
Rocky Duan
2869de16dd refactored thread.html 2012-07-30 17:15:53 -04:00
Kyle Fiedler
3bb82c41d2 Remove couse css file 2012-07-30 16:21:03 -04:00
Brittany Cheng
1b7e2b356e edit layout of search box 2012-07-30 15:22:40 -04:00
Calen Pennington
1fce1dbe34 Make sure that django-pipelined css and js don't collide between the cms and lms 2012-07-30 14:04:39 -04:00
Rocky Duan
ab339239f8 use single js dependencies for discussion in forum / courseware 2012-07-30 13:44:00 -04:00
Rocky Duan
96c2a34c95 dumb bug 2012-07-30 13:43:28 -04:00
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
012036a478 Clean up minor whitespace stuff in 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
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
84272f3f8c Added Gemfile.lock to ignore 2012-07-30 09:51:50 -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
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
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