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
|
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 |
|
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
|
7dcc6b38ae
|
Moving sass compilation to django-pipeline
|
2012-04-20 14:20:09 -04:00 |
|
Bridger Maxwell
|
68c47236fb
|
Merge branch 'mathjax-hotfix'
|
2012-04-06 19:09:38 -04:00 |
|
Bridger Maxwell
|
14cd055e5e
|
Two potential sources of error fixed for MathJax wiki bug.
|
2012-04-06 19:00:38 -04:00 |
|
Bridger Maxwell
|
8fce7066da
|
You can now edit a circuit directly on the edit page of the wiki. These edits show up in the history. This hasn't been tested much.
|
2012-03-25 20:39:21 -07:00 |
|
Calen Pennington
|
fdc5cd94a9
|
Move to subdirectory in prepartion for merge
|
2012-03-19 11:10:44 -04:00 |
|