Commits · 8228bebc2ad88fdbc626bf4985b7a2db858eb855 · edx / edx-platform · GitLab

30 Jul, 2012 40 commits
- Merge branch 'master' of github.com:MITx/mitx · 8228bebc
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
```
  Rocky Duan committed Jul 30, 2012
  8228bebc Browse Files
- ..and fix again bug caused by changing id · e6776682
  Rocky Duan committed Jul 30, 2012
  
  e6776682 Browse Files
- fixed bug caused by rearranging stuff · 5fcc1213
  Rocky Duan committed Jul 30, 2012
  
  5fcc1213 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx · 6c821405
  Rocky Duan committed Jul 30, 2012
  
  6c821405 Browse Files
- middleware file forgot to include · 8bf2eb17
  Rocky Duan committed Jul 30, 2012
  
  8bf2eb17 Browse Files
- basic error handling · 941ae0f0
  Rocky Duan committed Jul 30, 2012
  
  941ae0f0 Browse Files
- refactored thread.html · 2869de16
  Rocky Duan committed Jul 30, 2012
  
  2869de16 Browse Files
- Remove couse css file · 3bb82c41
  Kyle Fiedler committed Jul 30, 2012
  
  3bb82c41 Browse Files
- Merge pull request #317 from MITx/feature/cale/cms-aws-cfg · 021e10ab
```
Feature/cale/cms aws cfg
```
  Calen Pennington committed Jul 30, 2012
  021e10ab Browse Files
- Minor review notes · 89b5f5b2
  Calen Pennington committed Jul 30, 2012
  
  89b5f5b2 Browse Files
- edit layout of search box · 1b7e2b35
  Brittany Cheng committed Jul 30, 2012
  
  1b7e2b35 Browse Files
- Add update_schematic to window in schematic.js · ab0055c2
  Calen Pennington committed Jul 30, 2012
  
  ab0055c2 Browse Files
- Make sure that django-pipelined css and js don't collide between the cms and lms · 1fce1dbe
  Calen Pennington committed Jul 30, 2012
  
  1fce1dbe Browse Files
- Look up data_dir in the metadata, not in the top of the json object when loading from mongodb · 395cf147
  Calen Pennington committed Jul 30, 2012
  
  395cf147 Browse Files
- Force mongodb fs_root to be a path object · 2caf1024
  Calen Pennington committed Jul 30, 2012
  
  2caf1024 Browse Files
- Continue during backcompat imports by replacing contents with error xml · d0c99151
  Calen Pennington committed Jul 30, 2012
  
  d0c99151 Browse Files
- Add some more tests of github_sync · 7ae0836f
  Calen Pennington committed Jul 30, 2012
  
  7ae0836f Browse Files
- Add more detail to error messages during loading from xml · 66d5c8ef
  Calen Pennington committed Jul 30, 2012
  
  66d5c8ef Browse Files
- Continue on errors when syncing with github · 6997fc57
  Calen Pennington committed Jul 30, 2012
  
  6997fc57 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion · 833f5fdb
  Brittany Cheng committed Jul 30, 2012
  
  833f5fdb Browse Files
- use single js dependencies for discussion in forum / courseware · ab339239
  Rocky Duan committed Jul 30, 2012
  
  ab339239 Browse Files
- dumb bug · 96c2a34c
  Rocky Duan committed Jul 30, 2012
  
  96c2a34c Browse Files
- Return a custom error for duplicate elements, and ignore it when loading into mongo · 05add581
  Calen Pennington committed Jul 30, 2012
  
  05add581 Browse Files
- Add management command for syncing with github · 6bd9cd6c
  Calen Pennington committed Jul 30, 2012
  
  6bd9cd6c Browse Files
- Add AWS keys so that the CMS can send email · cec2c893
  Calen Pennington committed Jul 30, 2012
  
  cec2c893 Browse Files
- Separate cms and lms auth and env files, and have the LMS that runs with the CMS… · 818cb0d1
```
Separate cms and lms auth and env files, and have the LMS that runs with the CMS use the CMS modulestore
```
  Calen Pennington committed Jul 30, 2012
  818cb0d1 Browse Files
- Split REPOS data into separate file on aws · d86b72fc
  Calen Pennington committed Jul 30, 2012
  
  d86b72fc Browse Files
- Add logsettings to CMS · 7e06c72e
  Calen Pennington committed Jul 30, 2012
  
  7e06c72e Browse Files
- Add an aws settings for the cms · d6dc4575
  Calen Pennington committed Jul 30, 2012
  
  d6dc4575 Browse Files
- Clean up minor whitespace stuff in settings · 012036a4
  Calen Pennington committed Jul 30, 2012
  
  012036a4 Browse Files
- Make github_sync use a namedtuple for repo settings · 39e5a776
  Calen Pennington committed Jul 30, 2012
  
  39e5a776 Browse Files
- Make cms and lms tests run independently (they had been colliding on collectstatic) · c9e637d7
  Calen Pennington committed Jul 30, 2012
  
  c9e637d7 Browse Files
- Merge pull request #314 from MITx/kf-cms-style · 5e60983e
```
Style for CMS
```
  Calen Pennington committed Jul 30, 2012
  5e60983e Browse Files
- Merge pull request #313 from MITx/feature/victor/xml-verify · 02217c33
```
Feature/victor/xml verify
```
  Calen Pennington committed Jul 30, 2012
  02217c33 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion · f290204d
  Brittany Cheng committed Jul 30, 2012
  
  f290204d Browse Files
- Merge branch 'discussion_ui' of github.com:dementrock/mitx · 4fcc76c2
  Rocky Duan committed Jul 30, 2012
  
  4fcc76c2 Browse Files
- raise exception when received error from service · d15d2c55
  Rocky Duan committed Jul 30, 2012
  
  d15d2c55 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion · 65730c22
  Brittany Cheng committed Jul 30, 2012
  
  65730c22 Browse Files
- Added styles for buttons · 44168def
  Kyle Fiedler committed Jul 30, 2012
  
  44168def Browse Files
- Added more styles includeing the index page more color changes and header styles · 270f0f3a
  Kyle Fiedler committed Jul 30, 2012
  
  270f0f3a Browse Files