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

223 Commits

Author SHA1 Message Date
ichuang
4d9140e151 multicourse: display course in mitxhome only if active = True for course 2012-05-26 22:35:54 -04:00
ichuang
dcc72a2a18 added csrf handling to quickedit 2012-05-26 22:34:19 -04:00
Calen Pennington
1e9e8847d3 Split the pipeline_mako templates from the namespace used by actual django-pipeline django templates 2012-05-24 10:28:41 -04:00
Calen Pennington
a0af847168 Switch to mako template syntax for inline_js template 2012-05-23 11:40:47 -04:00
Calen Pennington
8a89309338 Merge branch 'master' into asset-pipeline 
Conflicts:
	static/js/application.js
 2012-05-21 14:53:16 -04:00
Edward Loveall
4b842e7ac8 Adds ARIA labels to page elements 
This includes calculator open/close button, navigation, profile, and
book's table of content.
 2012-05-21 11:23:55 -04:00
Calen Pennington
ed3f081701 Merge branch 'master' into asset-pipeline 2012-05-21 10:22:59 -04:00
Calen Pennington
d2ec58c06e Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\! 2012-05-18 15:37:57 -04:00
Calen Pennington
6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard 2012-05-18 15:10:10 -04:00
ichuang
da64a16c23 cleaned up cruft in mathjax_include.html 2012-05-17 22:54:38 -04:00
ichuang
a76248251a fix quickedit (request.user_is_staff is not a function); small edit to problem.html 
to show quickedit when settings.QUICKEDIT is True.  add
mathjax_include.html because that is needed by quickedit.html
 2012-05-17 22:48:39 -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
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
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
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
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
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
f30596c499 Merge branch 'master' into specific-error-handling 
Conflicts:
	djangoapps/courseware/views.py
 2012-05-17 11:39:21 -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
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
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
Galen Frechette
d0a7326738 refactors some of the sequence nav styles 2012-05-15 16:34:21 -04:00
Galen Frechette
709faa4718 makes the sequence nav more semantic and replaces js hover with css 2012-05-15 16:00:27 -04:00
Kyle Fiedler
2d75118592 Added nav for sidebar links 2012-05-14 16:41:39 -04:00
Kyle Fiedler
89afc98f76 Made links in sidebar all in p> 2012-05-14 16:39:44 -04:00
Isaac Chuang
8989605cba Moving in Ike's new files, touches of multicourse 2012-05-13 20:33:29 -04:00
Isaac Chuang
232e758c7a Integrating some of Ike's courseware changes 2012-05-13 19:36:01 -04:00
Lyla Fischer
72dee8ba14 merge with master 2012-05-11 13:17:52 -04:00
ichuang
1494cbbd85 Merged root URL prefix from Ike. Errors should be attributed to pmitros. 2012-05-10 23:17:34 -04:00
Lyla Fischer
a4dae57751 merge with master 2012-05-10 12:25:33 -04:00
Calen Pennington
5011f60d45 Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py
 2012-05-10 09:17:26 -04:00
pmitros
c1b255fdf3 Merge pull request #18 from MITx/grade-refactor 
Grade refactor
 2012-05-09 15:00:25 -07:00
Reda Lemeden
3847dee605 Added official badge styling to staff questions 2012-05-09 15:30:12 -04:00
David Ormsbee
8bd00b34ed Merge pull request #37 from MITx/faq_addition 
added questions to faq
 2012-05-09 09:46:55 -07:00
Lyla Fischer
8ad1d3e17d added questions to faq 2012-05-09 12:31:55 -04:00
Kyle Fiedler
29dd45e517 Fix styles for play button 2012-05-08 14:43:49 -04:00