From ca6b63c4e204ed8c7deda6fc114c4823e3b22489 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Wed, 14 Aug 2013 18:18:50 +0200
Subject: [PATCH] Document the installation a bit, run last 3 migrations

---
 README.md    | 19 +++++++++++++++++--
 db/schema.rb |  9 ++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c0d5b867..904b7720 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,19 @@
-osem
+OSEM
 ====
+The Open Source Event Manager. An event management tool tailored to Free and Open Source Software conferences.
 
-Open Source Event Manager
\ No newline at end of file
+Installation
+============
+* cp config/config.yml.example config/config.yml
+* cp config/database.yml.example config/database.yml
+* bundle install
+* bundle exec rake db:setup
+* bundle exec rake db:seed
+* GOTO http://0.0.0.0:3000 and register a user
+
+Configuration
+=============
+To make the first registered user an admin
+* rails console
+  -> hero = User.find('1')
+  -> hero.role_ids=[3]
diff --git a/db/schema.rb b/db/schema.rb
index 49028ecf..75658aca 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130705055128) do
+ActiveRecord::Schema.define(:version => 20130712072609) do
 
   create_table "call_for_papers", :force => true do |t|
     t.date     "start_date",    :null => false
@@ -145,6 +145,12 @@ ActiveRecord::Schema.define(:version => 20130705055128) do
     t.text     "proposal_additional_speakers"
     t.string   "video_id"
     t.string   "video_type"
+    t.boolean  "require_registration"
+  end
+
+  create_table "events_registrations", :id => false, :force => true do |t|
+    t.integer "registration_id"
+    t.integer "event_id"
   end
 
   create_table "people", :force => true do |t|
@@ -180,6 +186,7 @@ ActiveRecord::Schema.define(:version => 20130705055128) do
     t.text     "other_dietary_choice"
     t.boolean  "handicapped_access_required", :default => false
     t.text     "other_special_needs"
+    t.boolean  "attended",                    :default => false
   end
 
   create_table "registrations_social_events", :id => false, :force => true do |t|