Calen Pennington
8a89309338
Merge branch 'master' into asset-pipeline
...
Conflicts:
static/js/application.js
2012-05-21 14:53:16 -04:00
Calen Pennington
431704ac88
Make courseware work with multicourse disabled
2012-05-21 12:59:51 -04:00
David Ormsbee
77edc4ceee
Merge pull request #62 from MITx/newrelic-handler
...
Add newrelic handler, rather than custom function to log exceptions
2012-05-21 09:19:06 -07:00
Calen Pennington
03a9be7e78
Add newrelic handler, rather than custom function to log exceptions
2012-05-21 12:12:16 -04:00
Edward Loveall
7332a11394
Merge pull request #61 from MITx/el-add-aria-labels-to-nav
...
Adds ARIA labels to navigation
2012-05-21 08:36:28 -07: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
David Ormsbee
4fe22be501
Merge pull request #59 from MITx/pmitros/modular-refactor
...
First part of courseware refactor
2012-05-21 06:21:43 -07:00
Piotr Mitros
bb66cad68b
Code review -- comments and better exceptions
2012-05-21 09:18:40 -04:00
David Ormsbee
fb146bf5c8
Merge pull request #58 from MITx/new-settings
...
Delete settings.py in favor of envs/*.py, and add a rake task to run a d...
2012-05-21 05:35:35 -07:00
Piotr Mitros
abdd696f7e
Modular refactor: Fixed bugs. Tests work.
2012-05-20 16:08:10 -04:00
Piotr Mitros
e9468a0e5e
Modular refactor: Very minor changes (comments, etc.)
2012-05-20 15:22:39 -04:00
Piotr Mitros
d95a5e462d
Modular refactor: Better names (grade to get_score, etc.
2012-05-20 14:52:48 -04:00
pmitros
da77cec954
Merge pull request #57 from MITx/fix-multicourse
...
fix multicourse; fix bug in I4xSystem - self.filestore not set when
2012-05-20 10:47:04 -07:00
Piotr Mitros
29f565dd6e
Modular refactor: Input types register in SimpleInput with decorator
2012-05-20 13:38:02 -04:00
Piotr Mitros
cd67ec8fc1
Modular refactor: Input types look more like x_module
2012-05-20 13:31:37 -04:00
Calen Pennington
fe4f7bb2e3
Compress sass and js, except in dev environments
2012-05-18 17:00:43 -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
Calen Pennington
8823346a0c
Merge branch 'new-settings' into asset-pipeline
2012-05-18 12:07:19 -04:00
Calen Pennington
a2eb8fcada
Delete settings.py in favor of envs/*.py, and add a rake task to run a dev server locally from those settings
2012-05-18 11:59:08 -04:00
Calen Pennington
9d00bbf839
Merge branch 'master' into asset-pipeline
...
Conflicts:
static/css
static/css/application.css
2012-05-18 11:29:36 -04:00
Calen Pennington
d0172d5d28
Correctly use the regex replacement function to substitute all urls in a particular chunk of text
2012-05-18 11:26:42 -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
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
