As a valued beta tester, you have the ability to invite your peers, colleagues and collaborators onto the platform.
Below is a personal invite link containing your unique access code, which can be used multiple times.
<% allMetacodeSets.each_with_index do |m, localindex| %>
Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
@@ -124,6 +131,9 @@ Devise.setup do |config|
# The time the user will be remembered without asking for credentials again.
config.remember_for = 2.weeks
+ # Invalidates all the remember me tokens when the user signs out.
+ config.expire_all_remember_me_on_sign_out = true
+
# If true, extends the user's remember period when remembered via cookie.
# config.extend_remember_period = false
@@ -145,9 +155,6 @@ Devise.setup do |config|
# time the user will be asked for credentials again. Default is 30 minutes.
# config.timeout_in = 30.minutes
- # If true, expires auth token on session timeout.
- # config.expire_auth_token_on_timeout = false
-
# ==> Configuration for :lockable
# Defines which strategy will be used to lock an account.
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
@@ -155,7 +162,7 @@ Devise.setup do |config|
# config.lock_strategy = :failed_attempts
# Defines which key will be used when locking and unlocking an account
- # config.unlock_keys = [ :email ]
+ # config.unlock_keys = [:email]
# Defines which strategy will be used to unlock an account.
# :email = Sends an unlock link to the user email
@@ -171,16 +178,23 @@ Devise.setup do |config|
# Time interval to unlock the account if :time is enabled as unlock_strategy.
# config.unlock_in = 1.hour
+ # Warn on the last attempt before the account is locked.
+ # config.last_attempt_warning = true
+
# ==> Configuration for :recoverable
#
# Defines which key will be used when recovering the password for an account
- # config.reset_password_keys = [ :email ]
+ # config.reset_password_keys = [:email]
# Time interval you can reset your password with a reset password key.
# Don't put a too small interval or your users won't have the time to
# change their passwords.
config.reset_password_within = 24.hours
+ # When set to false, does not sign a user in automatically after their password is
+ # reset. Defaults to true, so a user is signed in automatically after a reset.
+ # config.sign_in_after_reset_password = true
+
# ==> Configuration for :encryptable
# Allow you to use another encryption algorithm besides bcrypt (default). You can use
# :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
@@ -189,10 +203,6 @@ Devise.setup do |config|
# REST_AUTH_SITE_KEY to pepper)
# config.encryptor = :sha512
- # ==> Configuration for :token_authenticatable
- # Defines name of the authentication token params key
- # config.token_authentication_key = :auth_token
-
# ==> Scopes configuration
# Turn scoped views on. Before rendering "sessions/new", it will first check for
# "users/sessions/new". It's turned off by default because it's slower if you
@@ -240,12 +250,12 @@ Devise.setup do |config|
# is mountable, there are some extra configurations to be taken into account.
# The following options are available, assuming the engine is mounted as:
#
- # mount MyEngine, at: "/my_engine"
+ # mount MyEngine, at: '/my_engine'
#
# The router that invoked `devise_for`, in the example above, would be:
# config.router_name = :my_engine
#
- # When using omniauth, Devise cannot automatically set Omniauth path,
+ # When using OmniAuth, Devise cannot automatically set OmniAuth path,
# so you need to do it manually. For the users scope, it would be:
- # config.omniauth_path_prefix = "/my_engine/users/auth"
+ # config.omniauth_path_prefix = '/my_engine/users/auth'
end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index d01f375c..26a10f29 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -3,49 +3,50 @@
en:
devise:
confirmations:
- confirmed: "Your account was successfully confirmed. You are now signed in."
- send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
- send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
+ confirmed: "Your email address has been successfully confirmed."
+ send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+ send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
failure:
already_authenticated: "You are already signed in."
- inactive: "Your account was not activated yet."
- invalid: "Invalid email or password."
- invalid_token: "Invalid authentication token."
+ inactive: "Your account is not activated yet."
+ invalid: "Invalid %{authentication_keys} or password."
locked: "Your account is locked."
- not_found_in_database: "Invalid email or password."
- timeout: "Your session expired, please sign in again to continue."
+ last_attempt: "You have one more attempt before your account is locked."
+ not_found_in_database: "Invalid %{authentication_keys} or password."
+ timeout: "Your session expired. Please sign in again to continue."
unauthenticated: "You need to sign in or sign up before continuing."
- unconfirmed: "You have to confirm your account before continuing."
+ unconfirmed: "You have to confirm your email address before continuing."
mailer:
confirmation_instructions:
subject: "Confirmation instructions"
reset_password_instructions:
subject: "Reset password instructions"
unlock_instructions:
- subject: "Unlock Instructions"
+ subject: "Unlock instructions"
omniauth_callbacks:
failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
success: "Successfully authenticated from %{kind} account."
passwords:
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
- send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+ send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
- updated: "Your password was changed successfully. You are now signed in."
- updated_not_active: "Your password was changed successfully."
+ updated: "Your password has been changed successfully. You are now signed in."
+ updated_not_active: "Your password has been changed successfully."
registrations:
- destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+ destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
signed_up: "Welcome! You have signed up successfully."
signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
- signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
- update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
- updated: "You updated your account successfully."
+ signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+ update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+ updated: "Your account has been updated successfully."
sessions:
signed_in: "Signed in successfully."
signed_out: "Signed out successfully."
+ already_signed_out: "Signed out successfully."
unlocks:
- send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
- send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
+ send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+ send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
unlocked: "Your account has been unlocked successfully. Please sign in to continue."
errors:
messages:
diff --git a/config/routes.rb b/config/routes.rb
index e80b837a..a3ab6e3a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,7 +26,7 @@ Metamaps::Application.routes.draw do
get 'explore/mapper/:id', to: 'maps#index', as: :usermaps
resources :maps, except: [:new, :edit]
get 'maps/:id/contains', to: 'maps#contains', as: :contains
- get 'maps/:id/upload_screenshot', to: 'maps#screenshot', as: :screenshot
+ post 'maps/:id/upload_screenshot', to: 'maps#screenshot', as: :screenshot
devise_for :users, controllers: { registrations: 'users/registrations', passwords: 'users/passwords', sessions: 'devise/sessions' }, :skip => :sessions
diff --git a/config/secrets.yml.default b/config/secrets.yml.default
deleted file mode 100644
index 6859262d..00000000
--- a/config/secrets.yml.default
+++ /dev/null
@@ -1,12 +0,0 @@
-defaults: &defaults
- missing_map_png_url: '/assets/missing-map.png'
- user_png_url: '/assets/user.png'
-
-development:
- <<: *defaults
-
-test:
- <<: *defaults
-
-production:
- <<: *defaults
diff --git a/db/migrate/20151025083043_remove_asset_paths_from_metacodes.rb b/db/migrate/20151025083043_remove_asset_paths_from_metacodes.rb
deleted file mode 100644
index c5a5e842..00000000
--- a/db/migrate/20151025083043_remove_asset_paths_from_metacodes.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class RemoveAssetPathsFromMetacodes < ActiveRecord::Migration
- def change
- Metacode.all.each do |metacode|
- metacode.icon = metacode.icon.gsub(/^\/assets\//, '')
- metacode.save
- end
- end
-end
diff --git a/db/migrate/20151028061513_metacode_asset_path_update.rb b/db/migrate/20151028061513_metacode_asset_path_update.rb
new file mode 100644
index 00000000..be3607d1
--- /dev/null
+++ b/db/migrate/20151028061513_metacode_asset_path_update.rb
@@ -0,0 +1,9 @@
+class MetacodeAssetPathUpdate < ActiveRecord::Migration
+ def change
+ Metacode.all.each do |metacode|
+ if metacode.icon.start_with?("/assets/icons/")
+ metacode.update(icon: metacode.icon.gsub(/^\/assets\/icons/, "https://s3.amazonaws.com/metamaps-assets/metacodes"))
+ end
+ end
+ end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index b6bbd9ca..dc1d6906 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,14 +1,7 @@
# This file should contain all the record creation needed to seed the database with its default values.
# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-# Mayor.create(name: 'Emanuel', city: cities.first)
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
## USERS
-
User.create({
name: 'user',
email: 'user@user.com',
@@ -26,286 +19,288 @@ User.create({
joinedwithcode: 'iuytrewq',
admin: 'true',
})
+## END USERS
## METACODES
Metacode.create({
name: 'Action',
- icon: '/assets/icons/blueprint_96px/bp_action.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_action.png',
color: '#BD6C85',
})
Metacode.create({
name: 'Activity',
- icon: '/assets/icons/blueprint_96px/bp_activity.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_activity.png',
color: '#6EBF65',
})
Metacode.create({
name: 'Catalyst',
- icon: '/assets/icons/blueprint_96px/bp_catalyst.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_catalyst.png',
color: '#EF8964',
})
Metacode.create({
name: 'Closed',
- icon: '/assets/icons/blueprint_96px/bp_closedissue.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_closedissue.png',
color: '#ABB49F',
})
Metacode.create({
name: 'Process',
- icon: '/assets/icons/blueprint_96px/bp_process.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_process.png',
color: '#BDB25E',
})
Metacode.create({
- name: 'Future Dev',
- icon: '/assets/icons/blueprint_96px/bp_futuredev.png',
+ name: 'Future',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_futuredev.png',
color: '#25A17F',
})
Metacode.create({
name: 'Group',
- icon: '/assets/icons/blueprint_96px/bp_group.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_group.png',
color: '#7076BC',
})
Metacode.create({
name: 'Implication',
- icon: '/assets/icons/blueprint_96px/bp_implication.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_implication.png',
color: '#83DECA',
})
Metacode.create({
name: 'Insight',
- icon: '/assets/icons/blueprint_96px/bp_insight.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_insight.png',
color: '#B074AD',
})
Metacode.create({
name: 'Intention',
- icon: '/assets/icons/blueprint_96px/bp_intention.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_intention.png',
color: '#BAEAFF',
})
Metacode.create({
name: 'Knowledge',
- icon: '/assets/icons/blueprint_96px/bp_knowledge.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_knowledge.png',
color: '#60ACF7',
})
Metacode.create({
name: 'Location',
- icon: '/assets/icons/blueprint_96px/bp_location.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_location.png',
color: '#ABD9A7',
})
Metacode.create({
- name: 'Need ',
- icon: '/assets/icons/blueprint_96px/bp_need.png',
+ name: 'Need',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_need.png',
color: '#D2A7D4',
})
Metacode.create({
- name: 'Open Issue',
- icon: '/assets/icons/blueprint_96px/bp_openissue.png',
+ name: 'Open',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_openissue.png',
color: '#9BBF71',
})
Metacode.create({
name: 'Opportunity',
- icon: '/assets/icons/blueprint_96px/bp_opportunity.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_opportunity.png',
color: '#889F64',
})
Metacode.create({
name: 'Person',
- icon: '/assets/icons/blueprint_96px/bp_person.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_person.png',
color: '#DE925F',
})
Metacode.create({
name: 'Platform',
- icon: '/assets/icons/blueprint_96px/bp_platform.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_platform.png',
color: '#21C8FE',
})
Metacode.create({
name: 'Problem',
- icon: '/assets/icons/blueprint_96px/bp_problem.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_problem.png',
color: '#99CFC4',
})
Metacode.create({
name: 'Resource',
- icon: '/assets/icons/blueprint_96px/bp_resource.png',
- color: '#C98C63 ',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_resource.png',
+ color: '#C98C63',
})
Metacode.create({
name: 'Role',
- icon: '/assets/icons/blueprint_96px/bp_role.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_role.png',
color: '#A8595D',
})
Metacode.create({
name: 'Task',
- icon: '/assets/icons/blueprint_96px/bp_task.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_task.png',
color: '#3397C4',
})
Metacode.create({
name: 'Trajectory',
- icon: '/assets/icons/blueprint_96px/bp_trajectory.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_trajectory.png',
color: '#D3AA4C',
})
Metacode.create({
name: 'Argument',
- icon: '/assets/icons/generics_96px/gen_argument.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_argument.png',
color: '#7FAEFD',
})
Metacode.create({
name: 'Con',
- icon: '/assets/icons/generics_96px/gen_con.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_con.png',
color: '#CF7C74',
})
Metacode.create({
name: 'Subject',
- icon: '/assets/icons/generics_96px/gen_subject.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_subject.png',
color: '#8293D8',
})
Metacode.create({
name: 'Decision',
- icon: '/assets/icons/generics_96px/gen_decision.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_decision.png',
color: '#CCA866',
})
Metacode.create({
- name: 'Event ',
- icon: '/assets/icons/generics_96px/gen_event.png',
+ name: 'Event',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_event.png',
color: '#F5854B',
})
Metacode.create({
name: 'Example',
- icon: '/assets/icons/generics_96px/gen_example.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_example.png',
color: '#618C61',
})
Metacode.create({
name: 'Experience',
- icon: '/assets/icons/generics_96px/gen_experience.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_experience.png',
color: '#BE995F',
})
Metacode.create({
name: 'Feedback',
- icon: '/assets/icons/generics_96px/gen_feedback.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_feedback.png',
color: '#54A19D',
})
Metacode.create({
name: 'Aim',
- icon: '/assets/icons/generics_96px/gen_aim.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_aim.png',
color: '#B0B0B0',
})
Metacode.create({
- name: 'Good Practice',
- icon: '/assets/icons/generics_96px/gen_goodpractice.png',
+ name: 'Good',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_goodpractice.png',
color: '#BD9E86',
})
Metacode.create({
name: 'Idea',
- icon: '/assets/icons/generics_96px/gen_idea.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_idea.png',
color: '#C4BC5E',
})
Metacode.create({
name: 'List',
- icon: '/assets/icons/generics_96px/gen_list.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_list.png',
color: '#B7A499',
})
Metacode.create({
name: 'Media',
- icon: '/assets/icons/generics_96px/gen_media.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_media.png',
color: '#6D94CC',
})
Metacode.create({
name: 'Metamap',
- icon: '/assets/icons/generics_96px/gen_metamap.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_metamap.png',
color: '#AEA9FD',
})
Metacode.create({
name: 'Model',
- icon: '/assets/icons/generics_96px/gen_model.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_model.png',
color: '#B385BA',
})
Metacode.create({
name: 'Note',
- icon: '/assets/icons/generics_96px/gen_note.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_note.png',
color: '#A389A1',
})
Metacode.create({
name: 'Perspective',
- icon: '/assets/icons/generics_96px/gen_perspective.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_perspective.png',
color: '#2EB6CC',
})
Metacode.create({
name: 'Pro',
- icon: '/assets/icons/generics_96px/gen_pro.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_pro.png',
color: '#89B879',
})
Metacode.create({
name: 'Project',
- icon: '/assets/icons/generics_96px/gen_project.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_project.png',
color: '#85A050',
})
Metacode.create({
name: 'Question',
- icon: '/assets/icons/generics_96px/gen_question.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_question.png',
color: '#5CB3B3',
})
Metacode.create({
name: 'Reference',
- icon: '/assets/icons/generics_96px/gen_reference.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_reference.png',
color: '#A7A7A7',
})
Metacode.create({
name: 'Research',
- icon: '/assets/icons/generics_96px/gen_research.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_research.png',
color: '#CD8E89',
})
Metacode.create({
- name: 'Status update',
- icon: '/assets/icons/generics_96px/gen_status.png',
+ name: 'Status',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_status.png',
color: '#EFA7C0',
})
Metacode.create({
name: 'Tool',
- icon: '/assets/icons/generics_96px/gen_tool.png ',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_tool.png',
color: '#828282',
})
Metacode.create({
name: 'Wildcard',
- icon: '/assets/icons/generics_96px/gen_wildcard.png',
+ icon: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_wildcard.png',
color: '#73C7DE',
})
+## END METACODES
diff --git a/CHANGELOG.md b/doc/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to doc/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/doc/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to doc/CONTRIBUTING.md
diff --git a/MacInstallation.md b/doc/MacInstallation.md
similarity index 100%
rename from MacInstallation.md
rename to doc/MacInstallation.md
diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
deleted file mode 100644
index fe41f5cc..00000000
--- a/doc/README_FOR_APP
+++ /dev/null
@@ -1,2 +0,0 @@
-Use this README file to introduce your application and point to useful places in the API for learning more.
-Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.
diff --git a/UbuntuInstallation.md b/doc/UbuntuInstallation.md
similarity index 100%
rename from UbuntuInstallation.md
rename to doc/UbuntuInstallation.md
diff --git a/doc/WindowsInstallation.md b/doc/WindowsInstallation.md
new file mode 100644
index 00000000..7e601a08
--- /dev/null
+++ b/doc/WindowsInstallation.md
@@ -0,0 +1,47 @@
+Before you begin, you'll need to install stuff:
+
+Ruby, Git, and Rails: http://railsinstaller.org/en
+PostgreSQL 9.2: http://www.enterprisedb.com/products-services-training/pgdownload
+nodejs: http://nodejs.org/download
+
+During the installation of the PostgreSQL database, you'll need to choose a database password. Anything is fine, just note down what you choose.
+
+Once you are ready, create a new folder to hold this and any other git repositories. As an example, let's pretend you've chose C:\git, and made that folder writable by your user account.
+
+Open a command prompt ("cmd.exe"), and navigate to the folder you chose. Then use the gem command (which is part of Ruby) to install Ruby on Rails.
+
+ cd .\git
+ gem install rails -v 4.2
+
+Now you are ready to clone the Metamaps git repository:
+
+ git clone https://github.com/metamaps/metamaps_gen002.git --branch develop
+ cd metamaps_gen002
+ bundle install
+
+The third `bundle install` command downloads and installs the rubygem dependencies of Metamaps.
+
+At this point you should be in C:\git\metamaps_gen002, or whatever equivalent directory you've chosen. The next step is to set up your database configuration. From the metamaps_gen002 directory, run
+
+ start config
+
+This command will open a Windows Explorer window of the "config" directory of Metamaps. Copy database.yml.default, and rename the copy to database.yml. Edit the file and set the password to be whatever you set up with postgres earlier. Once you're done, then move back into the command prompt. The next few commands will fail unless database.yml is correctly configured and Postgres is running.
+
+ rake db:create
+ rake db:schema:load
+ rake db:fixtures:load
+
+And you're set up! At this point, you should be able to run the server at any time with only one command; you don't need to repeat any of the previous steps again. The command to run the server is:
+
+ rails s
+
+Navigate your browser to localhost:3000 once you have the server running
+
+Sign in with the default account
+
+ email: user@user.com
+ password: toolsplusconsciousness
+
+OR create a new account at /join, and use access code 'qwertyui'
+
+Start mapping and programming!
diff --git a/doc/metamaps-qa-steps.md b/doc/metamaps-qa-steps.md
new file mode 100644
index 00000000..a3f136ca
--- /dev/null
+++ b/doc/metamaps-qa-steps.md
@@ -0,0 +1,39 @@
+# Metamaps Tests
+
+Run these tests to be reasonably sure that your code changes haven't broken anything.
+
+### Users & Accounts
+
+ - Create an account using your join code
+ - Log in to the interface
+ - Check your user's "generation"
+ - Edit your profile picture, email, name, and password
+ - Remove your profile picture
+
+### Maps, Topics, Synapses, and Permissions
+
+ - Create three maps: private, public, and another public
+ - Change the last map's permissions to commons
+ - Change a map's name
+ - Create a topic on map #1
+ - Verify (in a private window or another browser) that the second user can't acccess map #1
+ - Create a topic on map #2
+ - Verify that the second user **can't** edit map #2
+ - Create a topic on map #3
+ - Verify that the second user **can** edit map #3
+ - Pull a topic from map #1 to map #3
+ - Create a private topic on map #1
+ - Verify that the private topic can be pulled from map #1 by the same user
+ - Verify that the private topic can't be pulled from map #1 by another user
+
+### Mappings
+
+ - Add a number of topics to one of your maps. Reload to see if they are still there.
+ - Add a number of synapses to one of your maps. Reload to see if they are still there.
+ - Rearrange one of your maps and save the layout. Reload to see if the layout is preserved.
+
+### Misc
+
+ - Login as admin. Change metacode sets.
+ - Set the screenshot for one of your maps, and verify the index of maps is updated.
+ - Open two browsers on map #3 and verify that realtime editing works (you'll need to be running the realtime server for this to work).
diff --git a/metamaps-qa-steps.txt b/metamaps-qa-steps.txt
deleted file mode 100644
index d7ef5b98..00000000
--- a/metamaps-qa-steps.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Metamaps Test Suite
-
-1) Log in to the interface
-2) Create an account using your join code
-3) Check your user's "generation"
-4) Create three maps: private, public, and another public
-5) Change the last map's permissions to commons
-6) Change a map's name
-7) Create a topic on map #1
-8) Verify (in a private window or another browser) that the second user can't acccess map #1
-9) Create a topic on map #2
-10) Verify that the second user can't edit map #2
-11) Create a topic on map #3
-12) Verify that the second can edit map #3
-13) Pull a topic from map #1 to map #3
-14) Create a private topic on map #1
-15) Verify that the private topic can be pulled from map #1 by the same user
-16) Verify that the private topic can't be pulled from map #1 by another user
-17) Login as admin. Change metacode sets.
-18) Add a number of topics to one of your maps. Reload to see if they are still there.
-19) Add a number of synapses to one of your maps. Reload to see if they are still there.
-20) Rearrange one of your maps. Reload to see if the layout is preserved.
-21) Set the screenshot for one of your maps, and verify the index of maps is updated.
-22) Open two browsers on map #3 and verify that realtime editing works.
-23) Log in as admin
-24) Open the metacodes editor, and create a metacode. Verify it behaves normally (its icon shows up, you can assign it to topics, etc)
-25) Create a new metacode set, and include metacodes. Switch to using this metacode set. Ensure the set shows up in the right click menu on a topic
diff --git a/public/404.html b/public/404.html
index 643a5ded..da435ea6 100644
--- a/public/404.html
+++ b/public/404.html
@@ -26,7 +26,7 @@
}
body {
- background: #d8d9da url(/assets/shattered_@2X.png);
+ background: #d8d9da url(https://s3.amazonaws.com/metamaps-assets/site/shattered_%402X.png);
font-family: 'din-regular', helvetica, sans-serif;
color: #424242;
text-align: justify;
@@ -61,7 +61,7 @@
border-radius: 225px;
-webkit-border-radius: 225px;
-moz-border-radius: 225px;
- background: url(/assets/monkeyselfie.jpg) no-repeat;
+ background: url(https://s3.amazonaws.com/metamaps-assets/site/monkeyselfie.jpg) no-repeat;
float: left;
background-position:50% 20%;
background-size: 100%;