# Conflicts:
#   _data/links.yml

Whilst I was removing the old theme files, I tweaked a number of the category and location pages to
make sure they were working and to improve the way they work
Removed some additional extraneous files that were missed on the moved to GitLab

Having problems with the site build so trying to add a custom redirect 
template to see if that will help

Remove the category links for richard.perry-online.me.uk from the links.yml data file as the posts no longer have categories attached to them

 - Added photos to the following posts
   - A Very Long Journey
   - Ha Long Bay
   - Back to Hanoi
   - Blue Lagoon
   - Gullfoss & Geysir
   - Northern Lights Hunting
   - The Land of Fire & Ice
 - Started changing the site structure, now posts are going to be sorted into folder based on the
   trip and then tags will be added to display the location. This will reduce the length of the
   urls, and make it easier to find posts in the source (hopefully).
 - As part of the restructure, added location icons to the metadata
 - More to follow shortly 😃

- Added the following Gems that can be used with GitLab Pages natively (actually,
  anything can be used with GitLab Pages and their shared runners setup. No more
  safe mode Jekyll for me 😃)
  - jemoji
  - jekyll-paginate
  - jekyll-gist
  - jekyll-redirect-from
  - jekyll-sitemap
- Removed the pages.rb plugin and moved the pages into the Pages folder so that
  Jekyll would process them.
- Removed the redirect pages and added the necessary YAML frontmatter for the
  jekyll-redirect-from gem
- Removed the RSS Feed xsl and css files
- Removed the need for the Rakefile, Gruntfile etc
- Put the css into a sass file so Jekyll could combine them itself and added the
  sas declarations to _config.yml
- Removed the sitemap.xml file in lieu of the jekyll-sitemap gem
- Removed the defunct javascript files
- Removed the CNAME file as it isn't needed in GitLab
- Changed back to the old Flickr plugin as it seems to work better
- Added site.baseurl to a couple of the asset links as best practice

- Added the following Gems that can be used with GitLab Pages natively (actually,
  anything can be used with GitLab Pages and their shared runners setup. No more
  safe mode Jekyll for me 😃)
  - jemoji
  - jekyll-paginate
  - jekyll-gist
  - jekyll-redirect-from
  - jekyll-sitemap
- Removed the pages.rb plugin and moved the pages into the Pages folder so that
  Jekyll would process them.
- Removed the redirect pages and added the necessary YAML frontmatter for the
  jekyll-redirect-from gem
- Removed the RSS Feed xsl and css files
- Removed the need for the Rakefile, Gruntfile etc
- Put the css into a sass file so Jekyll could combine them itself and added the
  sas declarations to _config.yml
- Removed the sitemap.xml file in lieu of the jekyll-sitemap gem
- Removed the defunct javascript files
- Removed the CNAME file as it isn't needed in GitLab
- Changed back to the old Flickr plugin as it seems to work better

Now I just have to work out how to merge this back into the source branch and
then rename that to pages so we don't have any unnecessary branches lying
around 😃

Changed the deploy task to clean the temporary directory to ensure that deleted files are removed from the deployed
site
Adjusted the other tasks to match the ones I am now used to with the main blog

Added category archive pages for China/Yanghuo, UK and UK/Cornwall because these were missed for some reason
Also added category archive pages for future posts including UK/North East, France, France/Paris
Added an archive by location page to easily navigate post by the place they describe. I guess this is really in
preparation for the future where we will potentially revisit some of the places we've been previously.

Made a few changes to the Flickr plugins to improve the display of Mailchimp email campaigns
Changed the gallery wrapper to a div with spans per image instead of using a list
Changed the 'summary' selection from 6 images to 8 images to improve how it looks on the home
page

Corrected file extensions of all posts to .md
Moved unpublished posts to the _drafts folder
Updated links.yml to match the rest of the network
Updated the authors.yml for the same reason
Revised post categories so the trip is at the end in case we visit places again
Also set redirect pages for the trips i.e.
      /china/beijing/china-2009/ redirects to /china-2009/
Updated CNAME file with live site domain