Commit Graph

24 Commits

Author SHA1 Message Date
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
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
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
Calen Pennington
7dcc6b38ae Moving sass compilation to django-pipeline 2012-04-20 14:20:09 -04:00
Bridger Maxwell
e3b397870f Moved the weighting of problems to when problem scores are retrieved. 2012-04-16 16:57:24 -04:00
Bridger Maxwell
60caf0aa10 Added grades SectionPercentage namedtuple. Fixed bug where problem ids were being used for section labels in graph. 2012-04-05 16:56:16 -04:00
Kyle Fiedler
162fa59441 Merge branch 'master' into pmitros/name-change
Conflicts:
	static/css/application.css
	static/css/marketing.css
2012-03-29 11:08:41 -04:00
David Ormsbee
dbb4ff18b0 minor user message changes 2012-03-29 10:44:06 -04:00
Piotr Mitros
9a7c0451ab Better logging. Tested and fixed bugs in previous commits 2012-03-28 17:45:43 -04:00
Piotr Mitros
f6787bd8be Minor word smithing 2012-03-28 14:53:35 -04:00
Kyle Fiedler
d3771b16a8 Removed deactive and unenroll 2012-03-27 13:59:24 -04:00
Bridger Maxwell
e0e8e1e5e6 Fixes from pull request comments. Added Score namedtuple. 2012-03-26 09:38:58 -07:00
Bridger Maxwell
2f15424acc Merged in master branch 2012-03-25 15:05:37 -04:00
Kyle Fiedler
1be8d198ab Added a fake deactivate and unenroll links and some style for profile 2012-03-22 15:32:31 -04:00
Kyle Fiedler
84ac8a1d2a Added some styles for name and email change 2012-03-21 17:06:37 -04:00
Piotr Mitros
f2878b549c Merge. Note duplicate e-mail subject files 2012-03-21 11:03:01 -04:00
Piotr Mitros
bb288663db Last commit missing -a 2012-03-21 10:10:49 -04:00
Piotr Mitros
75c5c1ce74 Name changes work, but meta storage not tested 2012-03-20 22:27:30 -04:00
Piotr Mitros
2b173379e5 E-mail changes appear to work 2012-03-20 09:37:15 -04:00
Piotr Mitros
2e905dc70c More of e-mail change process works 2012-03-19 21:24:21 -04:00
Calen Pennington
fdc5cd94a9 Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
98dd48f9da Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
2f0b39189a Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00