Commit graph

1608 commits

Author SHA1 Message Date
Michael Rose
4249b87c66 Merge branch 'release/3.2.3' into develop 2016-06-03 15:04:31 -04:00
Michael Rose
a7b749650e Merge branch 'release/3.2.3' 2016-06-03 15:04:27 -04:00
Michael Rose
89c252e347 Update CHANGELOG 2016-06-03 15:04:09 -04:00
Michael Rose
400111c58b Merge branch 'feature/discourse-comments' into develop 2016-06-03 12:03:34 -04:00
Michael Rose
5bbf801d8c Remove last blank line 2016-06-03 12:03:19 -04:00
Michael Rose
d9ac4a7940 Merge branch 'feature-discourse-comments' of https://github.com/rriemann/minimal-mistakes into feature/discourse-comments 2016-06-03 12:01:08 -04:00
Michael Rose
b3c0b79b92 Replace contains "http" with contains "://" 2016-06-03 11:59:19 -04:00
Robert Riemann
e186ee3650 take into account an optional basepath 2016-06-03 10:57:52 +02:00
Robert Riemann
f6f7d0cd97 javascript to embed comments from discourse forum
The comment system can be changed to embed topics from the Discourse
forum software: http://discourse.org/

More details: https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963
2016-06-03 00:34:14 +02:00
Michael Rose
9b833feb7d Update CHANGELOG 2016-06-01 21:53:35 -04:00
Michael Rose
8b793dde76 Update CHANGELOG 2016-06-01 21:53:03 -04:00
Michael Rose
449051d9c9 Merge branch 'release/3.2.2' into develop 2016-06-01 21:33:54 -04:00
Michael Rose
5bc7f00f91 Merge branch 'release/3.2.2'
# Conflicts:
#	CHANGELOG.md
2016-06-01 21:32:55 -04:00
Michael Rose
34d2bdf049 Update CHANGELOG 2016-06-01 21:31:45 -04:00
Michael Rose
b7185c8155 Add support for gallery image captions in Magnific Popup overlays
- Apply optional `title` attribute to image anchors that trigger Magnific Popup overlays
- Close #334
2016-06-01 21:26:14 -04:00
Michael Rose
9fa7b23507 Update CHANGELOG 2016-05-31 12:37:41 -04:00
Michael Rose
2a05b6e907 Update CHANGELOG 2016-05-31 12:37:17 -04:00
Michael Rose
952f7b500b Merge branch 'hotfix/3.2.1' into develop 2016-05-31 12:32:09 -04:00
Michael Rose
15f4ac9641 Merge branch 'hotfix/3.2.1' 2016-05-31 12:32:04 -04:00
Michael Rose
68b02cd8d8 Use CSS3 transform instead of change in width for masthead menu underline effect 2016-05-31 12:31:39 -04:00
Michael Rose
213e2fe3f3 Update gems 2016-05-31 12:22:57 -04:00
Michael Rose
cec8d40bc1 Add issue template for GitHub 2016-05-31 11:57:10 -04:00
Michael Rose
63aa6104a8 Remove >>>>>> conflict text from CHANGELOG 2016-05-31 11:03:27 -04:00
Michael Rose
87baf36b3a Merge branch 'release/3.2.0' into develop 2016-05-29 21:16:16 -04:00
Michael Rose
02f0e8c6c4 Merge branch 'release/3.2.0' 2016-05-29 21:16:16 -04:00
Michael Rose
9a8eea6e14 Update CHANGELOG 2016-05-29 21:15:54 -04:00
Michael Rose
f1a7470d3b Merge branch 'feature/update-dependencies' into develop 2016-05-29 21:13:09 -04:00
Michael Rose
45f3a7a8ee Rename tag/category archive variables to avoid possible conflicts with site.tags and site.categories
- Fixes #329
2016-05-29 21:12:24 -04:00
Michael Rose
21d15c9cf9 Update gems 2016-05-29 20:44:33 -04:00
Michael Rose
28f85dfc4d Merge branch 'release/3.1.8' into develop 2016-05-16 09:57:08 -04:00
Michael Rose
3812f708fa Merge branch 'release/3.1.8' 2016-05-16 09:57:04 -04:00
Michael Rose
8e5d47d82f Update CHANGELOG 2016-05-16 09:56:47 -04:00
Michael Rose
86d08455e8 Remove duplicate fa-twitter and fa-twitter-square classes from _utilities.scss
- Fixes #302
2016-05-16 09:48:16 -04:00
Michael Rose
55efbd1782 Make page.title conditional in <h1>
- Fix #312
2016-05-16 09:42:16 -04:00
Michael Rose
6a3d24dac9 Merge branch 'release/3.1.7' into develop 2016-05-13 10:43:07 -04:00
Michael Rose
d285f9d7bd Merge branch 'release/3.1.7' 2016-05-13 10:43:03 -04:00
Michael Rose
22a232365a Update CHANGELOG 2016-05-13 10:42:47 -04:00
Michael Rose
c1a37c72c9 Merge branch 'feature/translate-recent-posts-title' into develop 2016-05-13 10:40:01 -04:00
Michael Rose
ab2f7043b1 Merge branch 'master' of https://github.com/flohw/minimal-mistakes into feature/translate-recent-posts-title 2016-05-13 10:38:29 -04:00
Michael Rose
500ed4453f Merge branch 'feature/underline-fix' into develop 2016-05-13 10:37:41 -04:00
Michael Rose
cfc32ac5e5 Merge branch 'fix-ws' of https://github.com/tobie/minimal-mistakes into feature/underline-fix 2016-05-13 10:33:47 -04:00
Flohw
ee25653da2 Translate index page title 2016-05-13 07:24:06 +02:00
Michael Rose
d80c24629f Merge branch 'release/3.1.6' into develop 2016-05-10 08:27:04 -04:00
Michael Rose
aceb6cdd7f Merge branch 'release/3.1.6' 2016-05-10 08:27:01 -04:00
Michael Rose
5385a84205 Bump version to 3.1.6 2016-05-10 08:26:45 -04:00
Michael Rose
188e0e8911 Update dependencies 2016-05-10 08:24:26 -04:00
Tobie Langel
9582a1b117 Fix whitespace issue using CSS. 2016-05-05 23:43:04 +02:00
Michael Rose
efb4d14248 Merge branch 'release/3.1.5' into develop 2016-05-02 11:55:00 -04:00
Michael Rose
7b7bafe3a4 Merge branch 'release/3.1.5' 2016-05-02 11:54:55 -04:00
Michael Rose
ed2b26461d Update CHANGELOG for 3.1.5 2016-05-02 11:54:34 -04:00