mautic · dennisameling · Apr 8, 2015 · Apr 9, 2015 · Apr 15, 2015 · Apr 15, 2015
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1 @@
+Please indicate clearly what you're currently missing in the docs, or what's written incorrectly. If possible, we would be incredibly grateful if you could provide a PR (Pull Request) as well.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,3 @@
+!!!!! STOP AND READ !!!!!
+
+If the dropdown above says "base repository: slatedocs/slate", you are submitting your change to ALL USERS OF SLATE, not just to the Mautic docs. This is probably not what you want. Click "base fork" to change it to the right place (`mautic-documentation/master`).
diff --git a/.gitignore b/.gitignore
@@ -15,10 +15,11 @@ tmp
 *.DS_STORE
 build/
 .cache
+.vagrant
+.sass-cache
 
 # YARD artifacts
 .yardoc
 _yardoc
 doc/
 .idea/
-/.project
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,11 @@
+sudo: false
+
+language: ruby
+
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2.5
+  - 2.3.3
+  - 2.4.0
+
+cache: bundler
+script: bundle exec middleman build
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,75 @@
 # Changelog
 
+## Version 1.5.0
+
+*February 23, 2017*
+
+- Add [multiple tabs per programming language](https://github.com/lord/slate/wiki/Multiple-language-tabs-per-programming-language) feature
+- Upgrade Middleman to add Ruby 1.4.0 compatibility
+- Switch default code highlighting color scheme to better highlight JSON
+- Various small typo and bug fixes
+
+## Version 1.4.0
+
+*November 24, 2016*
+
+- Upgrade Middleman and Rouge gems, should hopefully solve a number of bugs
+- Update some links in README
+- Fix broken Vagrant startup script
+- Fix some problems with deploy.sh help message
+- Fix bug with language tabs not hiding properly if no error
+- Add `!default` to SASS variables
+- Fix bug with logo margin
+- Bump tested Ruby versions in .travis.yml
+
+## Version 1.3.3
+
+*June 11, 2016*
+
+Documentation and example changes.
+
+## Version 1.3.2
+
+*February 3, 2016*
+
+A small bugfix for slightly incorrect background colors on code samples in some cases.
+
+## Version 1.3.1
+
+*January 31, 2016*
+
+A small bugfix for incorrect whitespace in code blocks.
+
+## Version 1.3
+
+*January 27, 2016*
+
+We've upgraded Middleman and a number of other dependencies, which should fix quite a few bugs.
+
+Instead of `rake build` and `rake deploy`, you should now run `bundle exec middleman build --clean` to build your server, and `./deploy.sh` to deploy it to Github Pages.
+
+## Version 1.2
+
+*June 20, 2015*
+
+**Fixes:**
+
+- Remove crash on invalid languages
+- Update Tocify to scroll to the highlighted header in the Table of Contents
+- Fix variable leak and update search algorithms
+- Update Python examples to be valid Python
+- Update gems
+- More misc. bugfixes of Javascript errors
+- Add Dockerfile
+- Remove unused gems
+- Optimize images, fonts, and generated asset files
+- Add chinese font support
+- Remove RedCarpet header ID patch
+- Update language tabs to not disturb existing query strings
+
 ## Version 1.1
 
-*July 27th, 2014*
+*July 27, 2014*
 
 **Fixes:**
 

diff --git a/Dockerfile b/Dockerfile
diff --git a/Gemfile b/Gemfile
@@ -1,33 +1,12 @@
-# If you have OpenSSL installed, we recommend updating
-# the following line to use "https"
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem "rouge", "1.7.2"
-
-gem "middleman", "~>3.3.0"
-
-# For syntax highlighting
-gem "middleman-syntax"
-
-# Plugin for middleman to generate Github pages
-gem 'middleman-gh-pages'
+# Middleman
+gem 'middleman', '~>4.2.1'
+gem 'middleman-syntax', '~> 3.0.0'
+gem 'middleman-autoprefixer', '~> 2.7.0'
+gem "middleman-sprockets", "~> 4.1.0"
+gem 'rouge', '~> 2.0.5'
+gem 'redcarpet', '~> 3.4.0'
 
 # For deploying to Mautic's live server
 gem 'middleman-deploy', '~> 1.0'
-
-# Live-reloading plugin
-gem "middleman-livereload", "~> 3.3.0"
-
-gem 'redcarpet', '~> 3.2.1'
-
-# For faster file watcher updates on Windows:
-gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
-
-# Cross-templating language block fix for Ruby 1.8
-platforms :mri_18 do
-  gem "ruby18_source_location"
-end
-
-gem "rake", "~> 12.3.3"
-
-gem 'therubyracer', :platforms => :ruby
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Please indicate clearly what you're currently missing in the docs, or what's written incorrectly. If possible, we would be incredibly grateful if you could provide a PR (Pull Request) as well.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		!!!!! STOP AND READ !!!!!

		If the dropdown above says "base repository: slatedocs/slate", you are submitting your change to ALL USERS OF SLATE, not just to the Mautic docs. This is probably not what you want. Click "base fork" to change it to the right place (`mautic-documentation/master`).