Merge branch 'release/3.3.4'

Update CHANGELOG and bump version to 3.3.4
- Close #378, close #379
2016-07-26 15:43:31 -04:00 · 2016-07-26 15:43:13 -04:00 · 2016-07-26 15:35:02 -04:00 · 2016-07-26 15:34:21 -04:00 · 2016-07-26 15:30:09 -04:00 · 2016-07-26 15:13:38 +02:00
8 changed files with 71 additions and 13 deletions
@@ -1,3 +1,14 @@
+## [3.3.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.4)
+
+### Enhancements
+
+- Add support for configurable feed URL to use a service like FeedBurner instead of linking directly to `feed.xml` in `<head>` and the site footer. [#378](https://github.com/mmistakes/minimal-mistakes/issues/378), [#379](https://github.com/mmistakes/minimal-mistakes/pull/379), [#406](https://github.com/mmistakes/minimal-mistakes/pull/406)
+- Add Turkish localized UI text. [#403](https://github.com/mmistakes/minimal-mistakes/pull/403)
+
+### Maintenance
+
+- Update gems: `activesupport` (4.2.7), `ffi` (1.9.14), `github-pages` (88), `jekyll-redirect-from` (0.11.0), `jekyll-watch` (1.5.0).
+
 ## [3.3.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.3)

 ### Enhancements
@@ -1,7 +1,7 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (4.2.6)
+    activesupport (4.2.7)
      i18n (~> 0.7)
      json (~> 1.7, >= 1.7.7)
      minitest (~> 5.1)
@@ -18,10 +18,11 @@ GEM
    execjs (2.7.0)
    faraday (0.9.2)
      multipart-post (>= 1.2, < 3)
-    ffi (1.9.13)
-    ffi (1.9.13-x64-mingw32)
+    ffi (1.9.14)
+    ffi (1.9.14-x64-mingw32)
    gemoji (2.1.0)
-    github-pages (86)
+    github-pages (88)
+      activesupport (= 4.2.7)
      github-pages-health-check (= 1.1.0)
      jekyll (= 3.1.6)
      jekyll-coffeescript (= 1.0.1)
@@ -30,7 +31,7 @@ GEM
      jekyll-github-metadata (= 2.0.2)
      jekyll-mentions (= 1.1.3)
      jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.10.0)
+      jekyll-redirect-from (= 0.11.0)
      jekyll-sass-converter (= 1.3.0)
      jekyll-seo-tag (= 2.0.0)
      jekyll-sitemap (= 0.10.0)
@@ -47,8 +48,8 @@ GEM
      octokit (~> 4.0)
      public_suffix (~> 1.4)
      typhoeus (~> 0.7)
-    html-pipeline (2.4.1)
-      activesupport (>= 2, < 5)
+    html-pipeline (2.4.2)
+      activesupport (>= 2)
      nokogiri (>= 1.4)
    i18n (0.7.0)
    jekyll (3.1.6)
@@ -72,14 +73,14 @@ GEM
      html-pipeline (~> 2.3)
      jekyll (~> 3.0)
    jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.10.0)
+    jekyll-redirect-from (0.11.0)
      jekyll (>= 2.0)
    jekyll-sass-converter (1.3.0)
      sass (~> 3.2)
    jekyll-seo-tag (2.0.0)
      jekyll (~> 3.1)
    jekyll-sitemap (0.10.0)
-    jekyll-watch (1.4.0)
+    jekyll-watch (1.5.0)
      listen (~> 3.0, < 3.1)
    jemoji (0.6.2)
      gemoji (~> 2.0)
@@ -1,7 +1,11 @@
-# Minimal Mistakes Jekyll Theme
+# [Minimal Mistakes Jekyll Theme](https://mmistakes.github.io/minimal-mistakes/)
+
+[![GitHub release](https://img.shields.io/github/release/mmistakes/minimal-mistakes.svg)](https://github.com/mmistakes/minimal-mistakes/releases) [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/mmistakes/minimal-mistakes/master/LICENSE)

 Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your personal site, blog, or portfolio on GitHub or self-hosting on your own server. As the name implies --- styling is purposely minimalistic to be enhanced and customized by you :smile:.

+See what's new in the [CHANGELOG](CHANGELOG.md).
+
 [![Minimal Mistakes live preview][2]][1]

 [1]: https://mmistakes.github.io/minimal-mistakes/
@@ -21,6 +25,7 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages)
 - Optional header images, sidebars, table of contents, galleries, related posts, breadcrumb links, and more.
 - Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), and custom).
 - Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom).
+- UI localized text: English (default), Spanish, French, and Turkish.

 #### Demo Pages

@@ -63,6 +68,14 @@ To help me out try to avoid creating pull requests on `master` and instead branc

 ## Credits

+### Creator
+
+**Michael Rose**
+
+- <https://mademistakes.com>
+- <https://twitter.com/mmistakes>
+- <https://github.com/mmistakes>
+
 ### Icons + Demo Images:

 - [The Noun Project](https://thenounproject.com) -- Garrett Knoll, Arthur Shlain, and [tracy tam](https://thenounproject.com/tracytam)
@@ -28,6 +28,8 @@ comments:
    appid                :
    num_posts            : # 5 (default)
    colorscheme          : # "light" (default), "dark"
+atom_feed:
+  path                   : # blank (default) uses feed.xml

 # SEO Related
 google_site_verification :
@@ -102,5 +102,36 @@ fr-BE:
 fr-CH:
  <<: *DEFAULT_FR

+# Turkish
+# -----------------
+tr: &DEFAULT_TR
+  page                  : "Sayfa"
+  pagination_previous   : "Önceki"
+  pagination_next       : "Sonraki"
+  breadcrumb_home_label : "Ana Sayfa"
+  breadcrumb_separator  : "/"
+  toc_label             : "İçindekiler"
+  ext_link_label        : "Doğrudan Bağlantı"
+  less_than             : "Şu süreden az: "
+  minute_read           : "dakika tahmini okuma süresi"
+  share_on_label        : "Paylaş"
+  meta_label            :
+  tags_label            : "Etiketler:"
+  categories_label      : "Kategoriler:"
+  date_label            : "Güncelleme tarihi:"
+  comments_label        : "Yorum yapın"
+  more_label            : "Daha fazlasını öğrenin"
+  related_label         : "Bunlar ilginizi çekebilir:"
+  follow_label          : "Takip et:"
+  feed_label            : "RSS"
+  powered_by            : "Emeği geçenler: "
+  website_label         : "Web sayfası"
+  email_label           : "E-posta"
+  recent_posts          : "Son yazılar"
+  undefined_wpm         : "_config.yml dosyasında tanımlanmamış words_per_minute parametresi"
+tr-TR:
+  <<: *DEFAULT_TR
+
+
 # Another locale
 # --------------
@@ -17,7 +17,7 @@
    {% if site.author.bitbucket %}
      <li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
    {% endif %}
-    <li><a href="{{ base_path }}/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label }}</a></li>
+    <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label }}</a></li>
  </ul>
 </div>

@@ -4,7 +4,7 @@

 {% include seo.html %}

-<link href="{{ base_path }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
+<link href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">

 <!-- http://t.co/dKP3o1e -->
 <meta name="HandheldFriendly" content="True">
@@ -1,6 +1,6 @@
 {
  "name": "minimal-mistakes",
-  "version": "3.3.3",
+  "version": "3.3.4",
  "description": "Minimal Mistakes Jekyll theme npm build scripts",
  "repository": {
    "type": "git",
Author	SHA1	Message	Date
Michael Rose	86f27cdee1	Merge branch 'release/3.3.4'	2016-07-26 15:43:31 -04:00
Michael Rose	2cfad13f51	Update CHANGELOG and bump version to 3.3.4 - Close #378, close #379	2016-07-26 15:43:13 -04:00
Michael Rose	a76fa288c9	Merge branch 'feature/custom-feed' into develop	2016-07-26 15:35:02 -04:00
Michael Rose	d238a0de83	Add external feed URL conditional to `<head>`	2016-07-26 15:34:21 -04:00
Michael Rose	1c6b42484d	Merge branch 'master' of https://github.com/gabor-meszaros/minimal-mistakes into feature/custom-feed	2016-07-26 15:30:09 -04:00
Gabor Meszaros	5a2d54f64f	Add external atom feed URL config possibility	2016-07-26 15:13:38 +02:00
Michael Rose	74775e830d	Merge branch 'feature/tr-locale' into develop	2016-07-25 08:22:23 -04:00
Michael Rose	1814d6c1a5	Add localized text supported by the theme	2016-07-25 08:22:10 -04:00
Ekrem Karaca	97ef2d2985	Update ui-text.yml Turkish locale values...	2016-07-24 16:23:26 +03:00
Michael Rose	70aa1e26e1	Update gems - activesupport (4.2.7) - ffi (1.9.14) - github-pages (88) - jekyll-redirect-from (0.11.0) - html-pipeline (2.4.2) - jekyll-watch (1.5.0)	2016-07-21 14:36:27 -04:00
Michael Rose	534adff39d	Update README to include version, link to CHANGELOG, and creator info.	2016-07-21 08:30:34 -04:00
Michael Rose	51b6c6ed59	Update README to include version, link to CHANGELOG, and creator info.	2016-07-21 08:29:21 -04:00
Michael Rose	ca9e90658b	Merge branch 'release/3.3.3' into develop	2016-07-20 16:10:35 -04:00