Merge branch 'refs/heads/master' into dev-canvas-api
Merge branch 'refs/heads/master' into dev-canvas-api
Merge branch 'refs/heads/master' into dev-faculty-journal
Merge branch 'refs/heads/master' into dev-resources-menu
Retimed Faculty Journal Button

It is now independent of resources-menu.js (around which there seemed to be some timing issues), but instead simply checking if this is a user who can add people to the class (like a teacher or TA) before adding the Faculty Journal button.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
2013-2014 All School

Updated enrollments and switched over to current year All School course.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-resources-menu'
W3C-compliant

Oy. InnerText is really IE (but everyone except Firefox supports it). innerHTML works better (textContent didn't seem to work at all, even though MDN says it should be used instead of innerText.)

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Re-Fixing Permission Check

Somehow we reverted back to checking userClass. Should be checking for Add People button.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-faculty-journal'
Quotes

Some people's names have 'em. They need to be escaped or it breaks string quoting.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
All HTTPS, All The Time

Something shifted overnight on October 3, and suddenly Chrome and a few other browsers started to treat this script like a cross-site scripting attack. To get around  that, everything is being accessed via HTTPS now.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-javascript'
Disabled.

Removed the triggering JavaScript from global.js, pending fuller discussion of the use of the Faculty Journal after the Parents' Weekend updates have been completed.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-faculty-journal'
Objectified CanvasApi

Finally got around to implementing an object-oriented Canvas API wrapper class. This allows for nested, paginated API calls. Whee!

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-canvas-api'
Merge branch 'refs/heads/master' into dev-javascript