Commit graph

2694 commits

Author SHA1 Message Date
Michael Rose
ea52f84fdf Merge branch 'feature/data-files' into develop 2016-06-27 15:55:27 -04:00
Michael Rose
4ea28fa4e6 Default locale to en 2016-06-27 11:02:44 -04:00
Michael Rose
ac8e419062 Change navigation links to sample data 2016-06-27 10:22:37 -04:00
Michael Rose
e536f049ce Add English default UI text for Canada, Great Britain, and Australia
- Close #377
2016-06-27 10:14:51 -04:00
Michael Rose
6a9e5eebc6 Merge branch 'release/3.2.12' into develop 2016-06-24 15:45:19 -04:00
Michael Rose
b8076e1109 Merge branch 'release/3.2.12' 2016-06-24 15:45:14 -04:00
Michael Rose
c259fe907b Update CHANGELOG and bump version to 3.2.12 2016-06-24 15:44:56 -04:00
Michael Rose
c1fef02d44 Merge branch 'feature/author-override-check' into develop 2016-06-24 15:39:12 -04:00
Michael Rose
074d994fb5 Merge branch 'author-profile-update' of https://github.com/ZenHarbinger/minimal-mistakes into feature/author-override-check 2016-06-24 15:38:41 -04:00
Michael Rose
6a748cbcc1 Merge branch 'feature/sidebar-visibility-sticky-check' into develop 2016-06-24 15:32:39 -04:00
Michael Rose
1edc062f40 Merge branch 'follow-button-viz-update' of https://github.com/ZenHarbinger/minimal-mistakes into feature/sidebar-visibility-sticky-check 2016-06-24 15:30:43 -04:00
Matthew Aguirre
c3e2272a6f Updated check for button vizability instead of window width. 2016-06-23 21:00:40 -04:00
Matthew Aguirre
301e325ec9 Updated author-profile.html in the event that there is no authors.yml file. 2016-06-23 20:59:02 -04:00
Michael Rose
15f34c83a1 Merge branch 'release/3.2.11' into develop 2016-06-23 10:13:41 -04:00
Michael Rose
356121e355 Merge branch 'release/3.2.11' 2016-06-23 10:13:36 -04:00
Michael Rose
50caefd8dd Update CHANGELOG and bump version to 3.2.11 2016-06-23 10:13:15 -04:00
Michael Rose
91ad41be87 Build CSS 2016-06-23 10:08:23 -04:00
Michael Rose
7840044799 Merge branch 'feature/update-dependencies' into develop 2016-06-23 10:06:27 -04:00
Michael Rose
e86c60a042 Update Font Awesome to 4.6.3 2016-06-23 10:05:34 -04:00
Michael Rose
f7c6ddf490 Update vendor JS and build
- Update jQuery to 1.12.4
- Update Stickyfill.js to 1.1.4
2016-06-23 09:59:34 -04:00
Michael Rose
9e1fad00cd Update gems
- Update github-pages, jekyll-github-metadata, kramdown gems
2016-06-23 09:53:10 -04:00
Michael Rose
9e7a663b51 Merge branch 'feature/fix-disappearing-menu' into develop 2016-06-23 09:50:45 -04:00
Michael Rose
4c1eac7407 Build JS
- Close #372
2016-06-23 09:47:51 -04:00
Michael Rose
099f612ce9 Merge branch 'master' of https://github.com/ZenHarbinger/minimal-mistakes into feature/fix-disappearing-menu 2016-06-23 09:42:06 -04:00
Matthew Aguirre
9bd96ec92f Fixed disappearing menu. 2016-06-22 18:59:16 -04:00
Michael Rose
8dbf7fc80e Merge branch 'hotfix/3.2.10' into develop 2016-06-21 14:51:54 -04:00
Michael Rose
5267be3bf1 Merge branch 'hotfix/3.2.10' 2016-06-21 14:51:49 -04:00
Michael Rose
32e66c7856 Update CHANGELOG and bump version to 3.2.10 2016-06-21 14:51:29 -04:00
Michael Rose
7a519e8c34 Add contributing guidelines 2016-06-21 14:50:13 -04:00
Michael Rose
dbd1818cb9 Merge branch 'release/3.2.9' into develop 2016-06-13 12:27:26 -04:00
Michael Rose
7be7490c7f Merge branch 'release/3.2.9' 2016-06-13 12:27:21 -04:00
Michael Rose
f997b7e744 Update CHANGELOG and bump version to 3.2.9 2016-06-13 12:27:05 -04:00
Michael Rose
13c3014ef9 Merge branch 'feature/og-overlay-image' into develop 2016-06-13 12:17:46 -04:00
Michael Rose
9524b60f7e Merge branch 'master' of https://github.com/jhabdas/minimal-mistakes into feature/og-overlay-image 2016-06-13 12:14:29 -04:00
Josh Habdas
beaaa884ff Use header overlay images for Open Graph image 2016-06-13 11:03:48 -05:00
Michael Rose
66553093d6 Update github-pages gem and dependencies 2016-06-13 10:44:58 -04:00
Michael Rose
cd019f496c Remove minutes_read to avoid awkward reading time wording
- Issue #356
2016-06-13 10:25:15 -04:00
Michael Rose
b8934b19a9 Merge branch 'release/3.2.8' 2016-06-12 22:31:53 -04:00
Michael Rose
f95f725c50 Merge branch 'release/3.2.8' into develop 2016-06-12 22:31:53 -04:00
Michael Rose
309c1f32e8 Update CHANGELOG and bump version to 3.2.8 2016-06-12 22:31:46 -04:00
Michael Rose
166b8f71bb Remove pointer cursor on author__urls that appears on white-space surrounding links.
- Close #354
2016-06-12 22:27:14 -04:00
Michael Rose
26f92debe1 Add contributing info to README
- Close #357
2016-06-12 22:26:18 -04:00
Michael Rose
bf0e0df084 Merge branch 'release/3.2.7' into develop 2016-06-10 14:21:58 -04:00
Michael Rose
e79d4e2a5a Merge branch 'release/3.2.7' 2016-06-10 14:21:54 -04:00
Michael Rose
0c86bb7e50 Update CHANGELOG and bump version to 3.2.7 2016-06-10 14:21:38 -04:00
Michael Rose
6f708cc505 Merge branch 'feature/yandex-alexa-patch' into develop 2016-06-10 14:18:27 -04:00
Michael Rose
427ff7d123 Merge branch 'patch-1' of https://github.com/jhabdas/minimal-mistakes into feature/yandex-alexa-patch 2016-06-10 14:17:56 -04:00
Michael Rose
866da4b829 Merge branch 'feature/fr-ui-text' into develop 2016-06-10 14:16:40 -04:00
Michael Rose
92faaaacdf Merge branch 'ui_texts' of https://github.com/flohw/minimal-mistakes into feature/fr-ui-text 2016-06-10 14:15:55 -04:00
Josh Habdas
f3e5e0dafd Fix branch logic for Yandex and Alexa. Closes #347 2016-06-09 11:56:40 -05:00