Merge branch 'refs/heads/master' into dev-blackboard-import
Masquerade

You can't add to a user's activity stream unless you're that user. Or you're masquerading as them. And calendar events are part of their activity stream.

Caught an error that's not a big deal… yet in sync.php.

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

Updated README

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Color Blocks

It's so… simple! All I need is a list of which courses meet when.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Color Blocks

…and, in fact, one can color-code the calendar if one is sufficiently bloody-minded about it.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Clean up "Future" Courses

Since I'm already hiding future courses from students, let's also remove the duplicate "future" courses that are really in the past but just aren't published.

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

Oy.

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

It helps not to write your CSS at 2 in the morning. Cleaned up to separately style events and assignments. Generating the CSS in a Google Spreadsheet.

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

Added the new All School course and the Canvas/Planner Training courses to the course color-coding.

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

Added another departmental resource link, hid Curricuplan from students.

(Still need to elegant-ify the department setup…)

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

An anachronistic call to PestCanvas was fixed.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-blackboard-import'
Scrollable Faculty Journal

Allow teachers to open a scrollable faculty journal page from their People listing for a course. Inserts a menu and next/prev buttons into the resulting faculty journal page to let teachers scroll through each student in their course, from within the faculty journal.

Signed-off-by: Seth Battis <seth@battis.net>
Consistent Instance

Updated the code to stay consistently on the test instance, for now (rather than switching midstream).

Signed-off-by: Seth Battis <seth@battis.net>