Commits · 6285f2a2be6b6b0f3bebfed51f258e917850ba28 · edx / edx-platform · GitLab

31 Jul, 2012 1 commit
- discussion styles · 6285f2a2
  Brittany Cheng committed Jul 31, 2012
  
  6285f2a2 Browse Files
30 Jul, 2012 39 commits
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 6da690f6
  Brittany Cheng committed Jul 30, 2012
  
  6da690f6 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into discussion2 · bba8e297
  Brittany Cheng committed Jul 30, 2012
  
  bba8e297 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · cc47de51
  Brittany Cheng committed Jul 30, 2012
  
  cc47de51 Browse Files
- fix merge conflicts · a98c505b
  Brittany Cheng committed Jul 30, 2012
  
  a98c505b Browse Files
- Merge branch 'master' of github.com:MITx/mitx · cef34722
  Rocky Duan committed Jul 30, 2012
  
  cef34722 Browse Files
- fix accordion · 24610899
  Rocky Duan committed Jul 30, 2012
  
  24610899 Browse Files
- added color to error msg and borders to threads · 92cfded5
  Brittany Cheng committed Jul 30, 2012
  
  92cfded5 Browse Files
- Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors · e5fd9263
```
Added styles for errors
```
  David Ormsbee committed Jul 30, 2012
  e5fd9263 Browse Files
- Merge pull request #320 from MITx/feature/kfiedler/courseware-style · 1baa306c
```
Start to whip out a bunch of the styles and get courseware working
```
  David Ormsbee committed Jul 30, 2012
  1baa306c Browse Files
- refactored reply rendering by using mustache · d6b77077
  Rocky Duan committed Jul 30, 2012
  
  d6b77077 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx · e705bbb7
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
```
  Rocky Duan committed Jul 30, 2012
  e705bbb7 Browse Files
- 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
- added treeview · c611bd92
  Kyle Fiedler committed Jul 30, 2012
  
  c611bd92 Browse Files
- Moved vendor sass files to css folder and included them in · 257ce043
  Kyle Fiedler committed Jul 30, 2012
  
  257ce043 Browse Files
- Moved files and removed files · 7ab5bbfa
  Kyle Fiedler committed Jul 30, 2012
  
  7ab5bbfa Browse Files
- Start to refactor courseware scss · 6cad5459
  Kyle Fiedler committed Jul 30, 2012
  
  6cad5459 Browse Files
- fix line 511 · 95291ef7
  Brittany Cheng committed Jul 30, 2012
  
  95291ef7 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 2ad854ab
  Brittany Cheng committed Jul 30, 2012
  
  2ad854ab Browse Files
- ..and fix again bug caused by changing id · e6776682
  Rocky Duan committed Jul 30, 2012
  
  e6776682 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into discussion2 · 554fc827
  Brittany Cheng committed Jul 30, 2012
  
  554fc827 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
- merging with origin master · 91cb814e
  Brittany Cheng committed Jul 30, 2012
  
  91cb814e 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