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

3780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rocky Duan
e705bbb764 Merge branch 'discussion2' of github.com:dementrock/mitx 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
 2012-07-30 17:45:29 -04:00
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
Brittany Cheng
95291ef745 fix line 511 2012-07-30 17:29:07 -04:00
Brittany Cheng
2ad854abb7 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-30 17:28:05 -04:00
Rocky Duan
e6776682df ..and fix again bug caused by changing id 2012-07-30 17:25:14 -04:00
Brittany Cheng
554fc827f4 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-30 17:22:12 -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
Brittany Cheng
91cb814ee0 merging with origin master 2012-07-30 16:28:49 -04:00
Kyle Fiedler
3bb82c41d2 Remove couse css file 2012-07-30 16:21:03 -04:00
Calen Pennington
021e10ab4e Merge pull request #317 from MITx/feature/cale/cms-aws-cfg 
Feature/cale/cms aws cfg
 2012-07-30 13:11:48 -07:00
Calen Pennington
89b5f5b2be Minor review notes 2012-07-30 16:11:35 -04:00
Brittany Cheng
1b7e2b356e edit layout of search box 2012-07-30 15:22:40 -04:00
Calen Pennington
ab0055c201 Add update_schematic to window in schematic.js 2012-07-30 14:04:39 -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
Calen Pennington
395cf147be Look up data_dir in the metadata, not in the top of the json object when loading from mongodb 2012-07-30 14:04:39 -04:00
Calen Pennington
2caf1024f1 Force mongodb fs_root to be a path object 2012-07-30 14:04:15 -04:00
Calen Pennington
d0c99151f0 Continue during backcompat imports by replacing contents with error xml 2012-07-30 14:04:15 -04:00
Calen Pennington
7ae0836f77 Add some more tests of github_sync 2012-07-30 13:50:50 -04:00
Calen Pennington
66d5c8effd Add more detail to error messages during loading from xml 2012-07-30 13:50:50 -04:00
Calen Pennington
6997fc579e Continue on errors when syncing with github 2012-07-30 13:50:00 -04:00
Brittany Cheng
833f5fdbe0 Merge branch 'master' of github.com:dementrock/mitx into discussion 2012-07-30 13:45:55 -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
05add5818b Return a custom error for duplicate elements, and ignore it when loading into mongo 2012-07-30 13:16:21 -04:00
Calen Pennington
6bd9cd6c28 Add management command for syncing with github 2012-07-30 12:59:28 -04:00
Calen Pennington
cec2c893be Add AWS keys so that the CMS can send email 2012-07-30 12:59: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
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
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