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

245 Commits

Author SHA1 Message Date
Calen Pennington
b574dcb8e8 Check for None with is rather than == 2012-06-01 12:18:43 -04:00
pmitros
585e4c8d52 Merge pull request #68 from MITx/enable-enrollment 
Add enrollment link back to main page for development purposes, until we...
 2012-05-31 10:43:21 -07:00
Prem Sichanugrist
92971127b3 Minor code style and assets fix 
* Change looping code style in seq_module
* Clone and keep the latest version of jasmine-jquery locally
* Use django-pipeline asset tags
 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
89194892e6 Move CoffeeScripts to asset pipeline 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
60094a1772 Add test coverage for JavaScript 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
b1daa59cea Refactor video caption to use binary search 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
8a87a4ba8b Make staff problem histogram work again 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
4298c920b8 Make show answer button toggleable 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
fc4d4c8295 Fix section convention and code highlight 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
5eac6ffa1d Refactor Problem from changes upstream 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
2bc68c0f25 Add path prefix to all AJAX requests 
This will handle the case where the site was deployed under a
path prefix.
 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
d393a503e6 Remove unused JavaScript on the page bottom 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
59b453488a Rewrite Tab module, refactor Sequence module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
1abe15d4d9 Rewrite Problem module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
8e7bf4c182 Fix broken test case 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
afde79da33 Fix the broken caption select 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
823843cd2f Make sure video is working in sequence module 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
dfb05bbb01 Refactor and removed unused code 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
e58674f220 Rebuild controls in JavaScript to reduce bandwidth 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
80c97c6592 Refactor module loading using class detection 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
8624927fc4 Rewritten video module 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
0b26609846 Rewrite Sequence module to use unobtrusive JS 2012-05-31 13:24:23 -04:00
Calen Pennington
c524ee7b88 Add enrollment link back to main page for development purposes, until we have the multicourse enrollment stuff worked out 2012-05-29 10:46:01 -04:00
Piotr Mitros
2c2072dae3 Converted to use more semantic tags. Working snapshot. 2012-05-27 07:39:09 -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