Merge branch 'master' into master-into-freecen

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/advert_control.js
	app/assets/javascripts/cookie_control.js
	app/assets/javascripts/jquery.cookiesDirective.js
	app/assets/stylesheets/styles/css/freereg_content.css
	app/assets/stylesheets/styles/css/icons.fallback.css
	app/assets/stylesheets/styles/css/icons.fallback.css.erb
	app/assets_freebmd/styles/css/icons.fallback.css.erb
	app/controllers/application_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/freereg_contents_controller.rb
	app/controllers/manage_counties_controller.rb
	app/controllers/manage_resources_controller.rb
	app/controllers/manage_syndicates_controller.rb
	app/controllers/messages_controller.rb
	app/controllers/places_controller.rb
	app/controllers/search_queries_controller.rb
	app/controllers/search_records_controller.rb
	app/controllers/userid_details_controller.rb
	app/helpers/application_helper.rb
	app/mailers/user_mailer.rb
	app/models/contact.rb
	app/models/country.rb
	app/models/message.rb
	app/models/place.rb
	app/models/register.rb
	app/models/search_record.rb
	app/models/userid_detail.rb
	app/uploaders/screenshot_uploader.rb
	app/views/contacts/edit.html.erb
	app/views/contacts/index.html.erb
	app/views/contacts/show.html.erb
	app/views/feedbacks/_form.html.erb
	app/views/freereg1_csv_entries/_blank_index.html.erb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/_main_nav.html.erb
	app/views/layouts/application.html.erb
	app/views/manage_resources/actions.html.erb
	app/views/messages/_form.html.erb
	app/views/messages/send_message.html.erb
	app/views/messages/show.html.erb
	app/views/messages/show_waitlist_msg.html.erb
	app/views/search_queries/new.html.erb
	app/views/search_queries/show.html.erb
	app/views/search_records/show.html.erb
	app/views/user_mailer/coordinator_data_problem.html.erb
	app/views/user_mailer/datamanager_data_question.html.erb
	app/views/user_mailer/enhancement.html.erb
	app/views/user_mailer/feedback.html.erb
	app/views/user_mailer/genealogy.html.erb
	app/views/user_mailer/general.html.erb
	app/views/user_mailer/publicity.html.erb
	app/views/user_mailer/volunteer.html.erb
	app/views/user_mailer/website.html.erb
	app/views/userid_details/_form.html.erb
	app/views/userid_details/my_own.html.erb
	app/views/userid_details/show.html.erb
	app/views/userid_details/transcriber_registration.html.erb
	app/views/userid_details/transcriber_statistics.html.erb
	config/application.rb
	config/environments/test.rb
	config/initializers/development_mail_interceptor.rb
	config/initializers/errbit.rb
	config/initializers/refinery/pages.rb
	config/mongoid.example.yml
	config/routes.rb
	doc/release_notes/release-notes-2018-07-04.md
	doc/release_notes/release-notes-2018-07-18.md
	doc/release_notes/release-notes-2018-08-01.md
	doc/release_notes/release-notes-2018-08-15.md
	doc/release_notes/release-notes-2018-08-30.md
	doc/release_notes/release-notes-2018-09-14.md
	doc/release_notes/release-notes-2018-09-28.md
	doc/release_notes/release-notes-2018-10-12.md
	doc/release_notes/release-notes-2018-11-08.md
	doc/release_notes/release-notes-2018-11-22.md
	doc/release_notes/release-notes-2018-12-21.md
	doc/release_notes/release-notes-2019-01-11.md
	lib/tasks/create_release_notes.rake
	lib/userid_role.rb

.gitignore

@@ -33,6 +33,10 @@ mongo.log
 /public/assets/
 /test_data/warning/
 
+# Cloud9
+mongod
+start_dbs
+
 # Ignore RVM-related files
 .rvmrc
 
@@ -131,6 +135,7 @@ vendor/extensions/**/spec/dummy
 
 
 # Ignore application configuration
+config/initializers/development_mail_interceptor.rb
 config/application.yml
 config/database.yml
 config/errbit.yml
@@ -143,3 +148,5 @@ app/assets/copy_of_assets_free*
 config/initializers/setup_mail.rb
 data/*
 
+.robocop.yml
+app/assets/copy_of_assets_freecen/

.rubocop.yml

@@ -0,0 +1,22 @@
+Rails:
+  Enabled: true
+
+# Commonly used screens these days easily fit more than 80 characters.
+Metrics/LineLength:
+  Max: 150
+
+# Too short methods lead to extraction of single-use methods, which can make
+# the code easier to read (by naming things), but can also clutter the class
+Metrics/MethodLength:
+  Max: 50
+
+# The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
+Metrics/ClassLength:
+  Max: 1500
+
+# Mixing the styles looks just silly.
+Style/HashSyntax:
+  EnforcedStyle: ruby19_no_mixed_keys
+
+Metrics/AbcSize:
+  Max: 120

CONTRIBUTING.md

@@ -0,0 +1,104 @@
+# Thank you for contributing.  This is a placeholder document while we develop our contribution guidelines.
+
+Thank you for your interest in Free UK Genealogy and the MyopicVicar 
+genealogical records database and search engine!
+
+# Get Started
+
+Please begin by filling in our new tech volunteer form and letting us know a bit about you. We will also use this to add you to our Slack community.
+
+https://docs.google.com/forms/d/1QX4-Cw5-d4ipZVZ4uvl2QPcCvnA5Sm0Aj-IWJhP7igA/
+
+Ensure you let us know what idea you might like to help develop, or indeed if you have a new idea you would like to discuss. We will update the ideas as often as possible, however it is always a good idea to check them out on Github too (see below for instructions).
+
+If you are interested in Google’s Summer of Code, please read and apply here: https://summerofcode.withgoogle.com/get-started/.
+
+## Our Code of Conduct
+
+Free UK Genealogy, including its software development team, operates 
+under a [code of 
+conduct](https://www.freeukgenealogy.org.uk/files/Documents/Code-of-Conduct.pdf).
+
+The short version is, _Be excellent to each other_.  (See the full version at 
+https://www.freeukgenealogy.org.uk/files/Documents/Code-of-Conduct.pdf)
+
+## How We Develop Software
+
+Free UK Genealogy development operates on a modified Agile methodology, 
+working in two-week sprints.  Technical teams developing MyopicVicar and 
+related tools meet via a Google Hangout videoconference every two on 
+Wednesday at 1530 GMT/1030 EST (FreeCEN) or 1630 GMT/1130 EST (FreeREG).  
+Participants in this meeting review the previous sprint's work, discuss 
+blocked issues, and schedule work for the next sprint.  Attendance at 
+these meetings is not mandatory, but an email update from developers 
+unable to attend is appreciated.
+
+All development is tracked in Github issues, and organized and 
+prioritized using Waffle.io, which provides a kanban-style interface.
+
+* The [FreeREG Waffle Board](https://waffle.io/freeukgen/myopicvicar)
+* The [FreeCEN Waffle Board](https://waffle.io/freeukgen/freecenmigration)
+
+
+
+## How We Communicate
+
+The Free UK Genealogy development team communicates through several channels.  
+
+* A traditional mailing list allows developers and system administrators 
+to discuss production issues and large-scale architectural changes.
+* A [Slack team](https://freeukgenealogy.slack.com) provides more immediate communication among developers on 
+different projects and supports occasional asynchronous discussion.
+* Google Hangouts allow video and live-chat meetings.
+
+In addition, several projects have Google Groups for discussion among 
+volunteers transcribing records.
+
+## How You Can Contribute
+
+There are many ways to contribute to Free UK Genealogy projects without 
+developing a line of software.
+
+### Transcribing Records
+
+Each project needs volunteers to help transcribe records.  In addition 
+to benefiting the needs of the projects, this provides a deep 
+introduction to the project aims and the perspective of our users.
+
+[Learn more about transcribing](https://www.freeukgenealogy.org.uk/about/volunteer/transcriber-volunteering-opportunities/)
+
+### Product Research and Testing
+
+Frequently, user-reported issues need specific reproduction steps and 
+suggestions of correct behavior.  Attempting to reproduce, document, and 
+define these issues is a valuable contribution to the project and also a 
+great way to learn about the details of the tools and their users.
+
+One way to find these bugs is to go to the waffle boards listed above and look for the "Good First Issue" label.
+
+### Code
+
+Projects also need developers to contribute code, whether that be bug 
+fixes, data analysis, or new and improved features.
+
+_We highly recommend that volunteer developers contact our volunteer coordinator [denise.colbert@freeukgenealogy.org.uk](mailto:denise.colbert@freeukgenealogy.org.uk) to be 
+partnered with a mentor.  This mentor can help answer questions and 
+smooth over difficulties faced by people new to the codebase._
+
+While some developers install a full Ruby on Rails/MongoDB/MySQL stack 
+on their development machines, the easiest way to get up and running is 
+to develop code in a virtual workspace provided by Cloud9.
+
+[See instructions for getting set up on Cloud9](https://docs.google.com/document/d/1OWbya7erLmyyFstMwuBJwkquJZG4i4YrMWIHHI4Jvjk/edit#heading=h.r8mtsch418p2)
+
+
+## Contributing A Patch
+
+1. Ask your mentor (or another member of the technical team) to add you as a contributor to the repository.
+1. Create a branch for your change off of `master` or (for FreeCEN-specific features) `freecen_parsing`
+1. Develop and test your changes locally.
+1. Push your changes to Github.
+1. Create a pull request to merge your branch into `master` (or `freecen_parsing`).
+1. Assign the pull request to your mentor to review and merge.
+
+

Gemfile

@@ -1,108 +1,47 @@
-source 'https://rubygems.org'
-
-gem 'rails', '4.2.8'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-#changes demanded by rails 4
-#gem 'activeadmin', github: 'activeadmin'
-gem 'tzinfo-data' #needed by windows
-gem 'protected_attributes' # smooth transition to rails 4
-gem 'mysql2'
-#gem 'web-console', '~> 2.0'
-gem 'rails_12factor', group: :production
-
-#gem 'actionpack-xml_parser', '~> 2.0'
-#gem 'mysql2', '0.3.12'
-
-gem 'refinerycms', '~> 3.0', '>= 3.0.3'
-gem 'refinerycms-authentication-devise', '~> 1.0.4'
-gem 'refinerycms-wymeditor', '~> 1.0', '>= 1.0.6'
-
-#gem 'refinerycms', '~> 2.1.1'
-#gem 'refinerycms-authentication',  '~> 2.1.1'
-# MongoDB
-#gem 'bson_ext'
-gem 'mongoid', '5.1.4'
-gem 'mongo', '2.3.0'
-#gem "mongoid", "~> 3.1"
-#gem "moped", "~> 1"
-gem 'execjs'
-gem 'libv8', '~>3.16.14.7'
-gem 'mobvious'
-gem 'formtastic', '~> 3.1'
-gem 'inherited_resources', '~> 1.6'
-gem "therubyracer", :platforms => :ruby # avoid loading on windows
-
-gem 'airbrake', '~> 5.0'
-gem 'bcrypt', '>= 3.1.9'
-gem 'text'
-gem 'json'
-gem 'pry'
-gem 'pry-byebug'
-gem 'pry-stack_explorer'
-gem 'email_veracity'
-gem "unicode", "~> 0.4.3"
-gem 'kaminari', '0.17.0'
-gem 'kaminari-mongoid', '0.1.2'
-gem "gretel"
-gem 'geocoder', '1.3.7' #appears to be a regression in 1.4
-#gem 'activeadmin'
-#gem "meta_search",    '>= 1.1.0.pre'
-
-gem 'bourbon', '~> 2.1'
-gem 'mail-logger'
-#gem 'activeadmin-mongoid', '~> 0.3.0'#
-gem 'devise'
-gem 'devise-encryptable'
-gem 'nokogiri'
-gem "osgb", :git => 'git://github.com/FreeUKGen/osgb.git'
-gem 'quiet_assets', :group => :development
-#gem 'rmagick', "2.13.2", require: false   #version added by kirk as windows requires this version
-gem 'rubyzip', "~> 0.9.9"
-
-gem 'rspec-rails'
-
-gem "fog"
-gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
-
-gem 'simple_form'
-
-
-gem 'newrelic_rpm'
-#gem 'newrelic_moped'
-gem 'octokit'
-
-gem 'traceroute'
-
-# Gems used only for assets and not required
-# in production environments by default.
-#group :assets do removed for rails 4
-gem 'sass-rails' #,   '~> 3.2.3'
-gem 'coffee-rails'#, '~> 3.2.1'
-
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', :platform => :ruby
-
-gem 'uglifier'#, '>= 1.0.3'
-#end
-
-gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug'
-
-
-gem 'refinerycms-county_pages', :path => 'vendor/extensions'
+source 'https://rubygems.org'
+
+gem 'rails'
+gem 'tzinfo-data' #needed by windows
+gem 'mysql2'
+gem 'refinerycms'
+gem 'refinerycms-authentication-devise'
+gem 'refinerycms-wymeditor'
+gem 'mongoid'
+gem 'mongo'
+gem 'execjs'
+gem 'libv8'
+gem 'mobvious'
+gem 'formtastic'
+gem 'therubyracer', platforms: :ruby # avoid loading on windows
+gem 'airbrake'
+gem 'bcrypt', platforms: :ruby  # avoid loading on windows
+gem 'text'
+gem 'json'
+gem 'pry'
+gem 'pry-byebug'
+gem 'email_veracity'
+gem 'unicode'
+gem 'kaminari'
+gem 'kaminari-mongoid'
+gem 'gretel'
+gem 'geocoder', '1.3.7' #appears to be a regression in 1.4
+gem 'bourbon'
+gem 'mail-logger'
+gem 'devise'
+gem 'devise-encryptable'
+gem 'nokogiri'
+gem 'osgb', git: 'https://github.com/FreeUKGen/osgb.git'
+gem 'rubyzip'
+gem 'zip-zip'
+gem 'rspec-rails'
+gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
+gem 'simple_form'
+gem 'newrelic_rpm'
+gem 'octokit'
+gem 'traceroute'
+gem 'sass-rails' #,   '~> 3.2.3'
+gem 'coffee-rails'#, '~> 3.2.1'
+gem 'uglifier'#, '>= 1.0.3'
+gem 'jquery-rails'
+gem 'refinerycms-county_pages', :path => 'vendor/extensions'
+gem 'rubocop', '~> 0.62.0', require: false