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

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ichuang
22c75cf748 make courseware/capa/util.py contextualize_text return gracefully if text = None 2012-05-17 22:39:20 -04:00
ichuang
5e8fbcdc8d fix multicourse; fix bug in I4xSystem - self.filestore not set when 
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
 2012-05-17 22:29:45 -04:00
David Ormsbee
b8b9928a09 Merge pull request #54 from MITx/pmitros/removing-fs-refs-pull 
More code transitioned to pyfilesystem
 2012-05-17 14:24:41 -07:00
Reda Lemeden
71f864b517 Merge pull request #55 from MITx/rl-comments 
Added comments to Askbot stylesheets
 2012-05-17 13:57:13 -07:00
Reda Lemeden
d6fbda39b4 Added comments to Askbot stylesheets 2012-05-17 16:56:34 -04:00
Kyle Fiedler
ba8fb95d72 added fix for lists in updates 2012-05-17 16:55:44 -04:00
Calen Pennington
092247fd2a Merge branch 'master' into asset-pipeline 2012-05-17 16:55:27 -04:00
Calen Pennington
03c7b37b30 Bring envs/common.py up to par with settings.py 2012-05-17 16:53:56 -04:00
Calen Pennington
58693a6165 Merge branch 'master' into asset-pipeline 
Conflicts:
	envs/dev.py
 2012-05-17 16:51:05 -04:00
Calen Pennington
156c4f1636 Renable debugging in envs/dev.py 2012-05-17 16:50:36 -04:00
Calen Pennington
dd6637947b Merge branch 'master' into asset-pipeline 2012-05-17 16:50:03 -04:00
Calen Pennington
411d822605 Remove references to the Accept middleware 2012-05-17 16:49:44 -04:00
Calen Pennington
1831ab4ea5 Merge remote-tracking branch 'origin/master' into asset-pipeline 
Conflicts:
	envs/dev.py
	sass/README
	static/css
	static/css/application.css
	static/css/marketing-ie.css
	static/css/marketing.css
 2012-05-17 16:48:17 -04:00
Calen Pennington
b80d1904ad Make scss urls relative to the directory that they are in 2012-05-17 16:44:36 -04:00
pmitros
3632f6a748 Merge pull request #49 from MITx/specific-error-handling 
Specific error handling
 2012-05-17 13:43:13 -07:00
Calen Pennington
bc823d3bfe Merge branch 'master' into asset-pipeline 
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
 2012-05-17 16:32:39 -04:00
Piotr Mitros
0e3349706a Fix minor bugs, commenting out future code 2012-05-17 15:48:47 -04:00
Prem Sichanugrist
5c82af3a5c Update files after use guard to compile sources 2012-05-17 15:41:47 -04:00
Prem Sichanugrist
0a97979a0e Add Guard to aid sass/coffeescript compilation 
You can run this by do:

    bundle install (first time only)
    bundle exec guard
 2012-05-17 15:41:43 -04:00
Piotr Mitros
cad13b30a1 Passing i4x system deeper into capa_problem 2012-05-17 15:37:08 -04:00
Calen Pennington
9859e8546d Move accept header computations out of middleware 2012-05-17 13:23:20 -04:00
kylefiedler
67061f1b25 Merge pull request #51 from MITx/el-courseware-bottom-border-alignment 
changes the border and box-shadow of headings in courseware content so b...
 2012-05-17 08:58:34 -07:00
Galen Frechette
cb8224cbcd cleans up visual style of accordion and sidebar links and fixes border alignment issues 2012-05-17 11:47:28 -04:00
Calen Pennington
e7ab1aa9be Fixing typo from merge 2012-05-17 11:42:56 -04:00
Calen Pennington
f30596c499 Merge branch 'master' into specific-error-handling 
Conflicts:
	djangoapps/courseware/views.py
 2012-05-17 11:39:21 -04:00
Calen Pennington
cc6e0c55c4 Cleaning up the envs/* files so that they will work with gunicorn_django 2012-05-17 11:18:32 -04:00
Calen Pennington
a61cbab3d1 Make tests work by default, without having to create any extra directories 2012-05-17 11:02:54 -04:00
Calen Pennington
37abb7aad1 Search the path for both django-admin.py and django-admin when running tests 2012-05-17 10:50:41 -04:00
Calen Pennington
2efc013316 Ignore long lines in pep8 2012-05-17 10:12:10 -04:00
Calen Pennington
4a9a28c76b Clean up indentation in ssl_auth 2012-05-17 10:12:00 -04:00
Calen Pennington
56e8ecdf42 Have git create a folder that's required for the tests 2012-05-17 10:11:40 -04:00
Calen Pennington
d387843ccc Fixing up check_course to pull in modules correctly 2012-05-17 09:18:36 -04:00
Galen Frechette
2bb7a77d01 changes the border and box-shadow of headings in courseware content so bottom border is not hidden 2012-05-17 09:08:51 -04:00
Galen Frechette
1652ec38de changes text color of highlited section in courseware index from red to black 2012-05-17 09:06:16 -04:00
Galen Frechette
2d7e36b409 improves communication of current selection in the courseware index sidebar 2012-05-17 09:06:16 -04:00
Galen Frechette
2b4437c951 handles the case of no title or sub title in the courseware index links 2012-05-17 09:06:16 -04:00
Galen Frechette
12eb7cf6f3 wip more defined week headings 2012-05-17 09:06:15 -04:00
Galen Frechette
825cf0e03e wip better communication of current page in course ware 2012-05-17 09:06:15 -04:00
Isaac Chuang
ad44882835 Ike's changes to enable multicourse, new response types, etc. 2012-05-16 21:18:47 -04:00
Kyle Fiedler
e45eb9fbe1 minor fixes for IE bugs 2012-05-16 17:16:40 -04:00
kylefiedler
5053ba4b99 Merge pull request #50 from MITx/el-border-radius-course-content-fix 
Fixes border radius overflow issue on course content wrapper
 2012-05-16 13:12:41 -07:00
Edward Loveall
5148746d0a Fixes border radius overflow issue on course content wrapper 2012-05-16 14:48:53 -04:00
Calen Pennington
69321b4497 Display the appropriate type of error message depending on the type of the incoming request 2012-05-16 13:45:00 -04:00
Calen Pennington
698d0a167e Display specific error messages when parts of the courseware break, rather than returning a 500 indicating that the whole site is down 2012-05-16 11:46:09 -04:00
Kyle Fiedler
1e8ab2240e Added msising marketing files 2012-05-16 11:05:23 -04:00
Galen Frechette
ea87d82cc6 Merge pull request #47 from MITx/kf-scss-cleanup 
Kf scss cleanup
 2012-05-16 08:04:44 -07:00
Calen Pennington
c6c53be2c1 Migrate changes to settings.py to envs/*.py settings files 2012-05-16 11:01:23 -04:00
Kyle Fiedler
b17d83a459 Cleaned up unused functions now in bourbon and unused variables 2012-05-16 10:45:31 -04:00
Kyle Fiedler
60bd63a594 Removed print.scss, moved index to marketing, started to alphabatize 2012-05-15 16:55:53 -04:00
kylefiedler
ff366ad6b2 Merge pull request #44 from MITx/gf-sequence-nav 
makes the sequence nav more semantic and replaces js hover with css
 2012-05-15 13:40:27 -07:00