Rebased with master in progress
yet another commit rebase
updated doc rebase and new views

rebasing continues
still rebasing

merging with master rebase

rebasing checkpoint
merge rebase with master
rebasing merge master

rebase merge master
squash merge with master
heroku compatability fix

gemfile change

Added user state field to task and code + specs for managing it via
params['u'], which should unmarshal to a hash

Setup @submit_to view variable for form path

moved task routing specs to spec/routing/

moved developer-facing README into doc/README_FOR_APP.md and made the toplevel README.md researcher-facing.  From now on please add developer-specific info to doc/README_FOR_APP.md.

added chat feature

Gemfile now contains 'gem capybara'

rebased with Armando, then added a heroku deploy debug tip and a few instructions for running the app locally to doc/README_FOR_APP.md

set chatpage.js.erb to run after chatpage finished loading

moved chat form to a partial

updated chat_backend.rb to support multiple chat pages and tweaked chatpage.js.erb to make path name adaptable also added test view

locked rspec to 2.x, enabled per-branch dev and test databases

latest schema.rb

merging with master

Created basic waiting_room model, spec file, and migration

added WaitingList ref to task.rb, rearranged code and rdoc for better readability

Fixed syntax error in migration, committing new schema
Added factory and sanity-check spec for WaitingRoom

Basic specs for adding a task to waiting room and making sure no
duplicate tasks in waiting room

moved developer-facing README into doc/README_FOR_APP.md and made the toplevel README.md researcher-facing.  From now on please add developer-specific info to doc/README_FOR_APP.md.

Added preferred & minimum group size to Condition, including
validations, specs, and changes to scaffolded
views/conditions/_form.html.erb partial.
Changed Condition factory to specify group sizes, since required for validity.

added condition spec

Added conditions spec and changes to conditions controller spec to allow
passing with the validations on the group size attributes

Added date_validator gem to Gemfile to use for datetime validations on
models
Added start and end time and starts-every fields to ActivitySchema,
including validations, specs, and changes to the view
(views/activity_schema/_form.html.erb)
Modified activity schema factory and controller spec to include these
required attributes

documented new @chat_group template field in README

initial model and specs for WaitingRoom

squash works top down

per-branch DB now works when branch names have slashes

allow derrick's seed to work on my computer
ready for deploy
Rebasing commit

allow derrick's seed to work on my computer

just css and no less bootstrap

css update

illegal remove of id

css updated

fixed bug in view

params question added