Commits · 40e5fae3e6d9bfbc02ca6a1635eee8b48722c6ff · edx / edx-platform · GitLab

21 May, 2012 1 commit
- Merge pull request #58 from MITx/new-settings · 40e5fae3
```
Delete settings.py in favor of envs/*.py, and add a rake task to run a d...
```
  David Ormsbee committed May 21, 2012
  40e5fae3 Browse Files
20 May, 2012 1 commit
- Merge pull request #57 from MITx/fix-multicourse · 770a070c
```
fix multicourse; fix bug in I4xSystem - self.filestore not set when
```
  pmitros committed May 20, 2012
  770a070c Browse Files
18 May, 2012 5 commits
- Delete settings.py in favor of envs/*.py, and add a rake task to run a dev… · eeccdb9c
```
Delete settings.py in favor of envs/*.py, and add a rake task to run a dev server locally from those settings
```
  Calen Pennington committed May 18, 2012
  eeccdb9c Browse Files
- cleaned up cruft in mathjax_include.html · ad540704
  ichuang committed May 17, 2012
  
  ad540704 Browse Files
- fix quickedit (request.user_is_staff is not a function); small edit to problem.html · 6fc644ac
```
to show quickedit when settings.QUICKEDIT is True.  add
mathjax_include.html because that is needed by quickedit.html
```
  ichuang committed May 17, 2012
  6fc644ac Browse Files
- make courseware/capa/util.py contextualize_text return gracefully if text = None · 9f6be5ea
  ichuang committed May 17, 2012
  
  9f6be5ea Browse Files
- fix multicourse; fix bug in I4xSystem - self.filestore not set when · 61974efe
```
filestore not None.  mitxhome.html now properly automatically lists
all courses given in settings.COURSE_SETTINGS.  mitxhome now served
from multicourse.views.  optioninput.html was missing; fixed. cleaned
up access to request.session for coursename in courseware/views.py
```
  ichuang committed May 17, 2012
  61974efe Browse Files
17 May, 2012 31 commits
- Merge pull request #54 from MITx/pmitros/removing-fs-refs-pull · c1ec6caf
```
More code transitioned to pyfilesystem
```
  David Ormsbee committed May 17, 2012
  c1ec6caf Browse Files
- Merge pull request #55 from MITx/rl-comments · 0c828553
```
Added comments to Askbot stylesheets
```
  Reda Lemeden committed May 17, 2012
  0c828553 Browse Files
- Added comments to Askbot stylesheets · b265ef9c
  Reda Lemeden committed May 17, 2012
  
  b265ef9c Browse Files
- added fix for lists in updates · ef0ff1a3
  Kyle Fiedler committed May 17, 2012
  
  ef0ff1a3 Browse Files
- Bring envs/common.py up to par with settings.py · 1899e62a
  Calen Pennington committed May 17, 2012
  
  1899e62a Browse Files
- Renable debugging in envs/dev.py · 8c0bf362
  Calen Pennington committed May 17, 2012
  
  8c0bf362 Browse Files
- Remove references to the Accept middleware · bf3332cb
  Calen Pennington committed May 17, 2012
  
  bf3332cb Browse Files
- Merge pull request #49 from MITx/specific-error-handling · 71960974
```
Specific error handling
```
  pmitros committed May 17, 2012
  71960974 Browse Files
- Fix minor bugs, commenting out future code · 45d31704
  Piotr Mitros committed May 17, 2012
  
  45d31704 Browse Files
- Update files after use guard to compile sources · 5494f46c
  Prem Sichanugrist committed May 17, 2012
  
  5494f46c Browse Files
- Add Guard to aid sass/coffeescript compilation · 71112c13
```
You can run this by do:

    bundle install (first time only)
    bundle exec guard
```
  Prem Sichanugrist committed May 17, 2012
  71112c13 Browse Files
- Passing i4x system deeper into capa_problem · fa4a240f
  Piotr Mitros committed May 17, 2012
  
  fa4a240f Browse Files
- Move accept header computations out of middleware · a271c71f
  Calen Pennington committed May 17, 2012
  
  a271c71f Browse Files
- Merge pull request #51 from MITx/el-courseware-bottom-border-alignment · 087a7cf9
```
changes the border and box-shadow of headings in courseware content so b...
```
  kylefiedler committed May 17, 2012
  087a7cf9 Browse Files
- cleans up visual style of accordion and sidebar links and fixes border alignment issues · ada08c84
  Galen Frechette committed May 17, 2012
  
  ada08c84 Browse Files
- Fixing typo from merge · fe3ef923
  Calen Pennington committed May 17, 2012
  
  fe3ef923 Browse Files
- Merge branch 'master' into specific-error-handling · 72f7c540
```
Conflicts:
	djangoapps/courseware/views.py
```
  Calen Pennington committed May 17, 2012
  72f7c540 Browse Files
- Cleaning up the envs/* files so that they will work with gunicorn_django · a8cff546
  Calen Pennington committed May 17, 2012
  
  a8cff546 Browse Files
- Make tests work by default, without having to create any extra directories · 47f502d8
  Calen Pennington committed May 17, 2012
  
  47f502d8 Browse Files
- Search the path for both django-admin.py and django-admin when running tests · 169d504e
  Calen Pennington committed May 17, 2012
  
  169d504e Browse Files
- Ignore long lines in pep8 · 550ffd5f
  Calen Pennington committed May 17, 2012
  
  550ffd5f Browse Files
- Clean up indentation in ssl_auth · 1d2d4969
  Calen Pennington committed May 17, 2012
  
  1d2d4969 Browse Files
- Have git create a folder that's required for the tests · 141dde68
  Calen Pennington committed May 17, 2012
  
  141dde68 Browse Files
- Fixing up check_course to pull in modules correctly · c37c5883
  Calen Pennington committed May 17, 2012
  
  c37c5883 Browse Files
- changes the border and box-shadow of headings in courseware content so bottom border is not hidden · 7f6c50ea
  Galen Frechette committed May 17, 2012
  
  7f6c50ea Browse Files
- changes text color of highlited section in courseware index from red to black · fb67d8ce
  Galen Frechette committed May 17, 2012
  
  fb67d8ce Browse Files
- improves communication of current selection in the courseware index sidebar · 739fd575
  Galen Frechette committed May 17, 2012
  
  739fd575 Browse Files
- handles the case of no title or sub title in the courseware index links · c45fdc25
  Galen Frechette committed May 17, 2012
  
  c45fdc25 Browse Files
- wip more defined week headings · 865b9838
  Galen Frechette committed May 17, 2012
  
  865b9838 Browse Files
- wip better communication of current page in course ware · 035fb933
  Galen Frechette committed May 17, 2012
  
  035fb933 Browse Files
- Ike's changes to enable multicourse, new response types, etc. · f1fefff5
  Isaac Chuang committed May 16, 2012
  
  f1fefff5 Browse Files
16 May, 2012 2 commits
- minor fixes for IE bugs · 5144c302
  Kyle Fiedler committed May 16, 2012
  
  5144c302 Browse Files
- Merge pull request #50 from MITx/el-border-radius-course-content-fix · c10dd962
```
Fixes border radius overflow issue on course content wrapper
```
  kylefiedler committed May 16, 2012
  c10dd962 Browse Files