Skip to content

Commit

Permalink
merged master to dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Lednerb committed Sep 8, 2018
2 parents a036339 + 14a03a3 commit 54900ec
Show file tree
Hide file tree
Showing 12 changed files with 332 additions and 13 deletions.
183 changes: 183 additions & 0 deletions .all-contributorsrc
@@ -0,0 +1,183 @@
{
"projectName": "bilberry-hugo-theme",
"projectOwner": "Lednerb",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 100,
"commit": true,
"contributors": [
{
"login": "Lednerb",
"name": "Sascha Brendel",
"avatar_url": "https://avatars1.githubusercontent.com/u/2056876?v=4",
"profile": "https://sascha-brendel.de",
"contributions": [
"question",
"blog",
"code",
"design",
"doc",
"translation"
]
},
{
"name": "Anna Brendel",
"avatar_url": "https://avatars1.githubusercontent.com/u/2056876?v=4",
"profile": "https://anna-brendel.de",
"contributions": [
"ideas",
"translation"
]
},
{
"login": "gigovich",
"name": "Givi Khojanashvili",
"avatar_url": "https://avatars2.githubusercontent.com/u/1560404?v=4",
"profile": "https://www.linkedin.com/in/khojanashvili/",
"contributions": [
"code"
]
},
{
"login": "anhchungite",
"name": "Chung Tran Anh",
"avatar_url": "https://avatars2.githubusercontent.com/u/28822504?v=4",
"profile": "https://github.com/anhchungite",
"contributions": [
"code",
"translation"
]
},
{
"login": "cripplet",
"name": "Minke Zhang",
"avatar_url": "https://avatars0.githubusercontent.com/u/3048682?v=4",
"profile": "http://blogzhang.com",
"contributions": [
"code"
]
},
{
"login": "aerohub",
"name": "Pavel Kanyshev",
"avatar_url": "https://avatars1.githubusercontent.com/u/16353578?v=4",
"profile": "https://github.com/aerohub",
"contributions": [
"code",
"translation"
]
},
{
"login": "marcelkraus",
"name": "Marcel Kraus",
"avatar_url": "https://avatars3.githubusercontent.com/u/3541050?v=4",
"profile": "https://www.marcelkraus.de",
"contributions": [
"code"
]
},
{
"login": "NickBusey",
"name": "Nick Busey",
"avatar_url": "https://avatars2.githubusercontent.com/u/280825?v=4",
"profile": "http://nickbusey.com/",
"contributions": [
"code"
]
},
{
"login": "lkorzen",
"name": "lkorzen",
"avatar_url": "https://avatars1.githubusercontent.com/u/4789253?v=4",
"profile": "https://github.com/lkorzen",
"contributions": [
"translation"
]
},
{
"login": "ChrisStayte",
"name": "Chris Stayte",
"avatar_url": "https://avatars1.githubusercontent.com/u/12019608?v=4",
"profile": "http://www.chrisstayte.com",
"contributions": [
"bug"
]
},
{
"login": "meAmidos",
"name": "Dmitry Matrosov",
"avatar_url": "https://avatars0.githubusercontent.com/u/405277?v=4",
"profile": "https://twitter.com/amidos_me",
"contributions": [
"code"
]
},
{
"login": "Embraser01",
"name": "Marc-Antoine",
"avatar_url": "https://avatars2.githubusercontent.com/u/8802277?v=4",
"profile": "https://marca.finch4.xyz/",
"contributions": [
"code",
"bug"
]
},
{
"login": "nnja",
"name": "Nina Zakharenko",
"avatar_url": "https://avatars1.githubusercontent.com/u/2030983?v=4",
"profile": "http://nnja.io",
"contributions": [
"code"
]
},
{
"login": "nisargap",
"name": "Nisarga",
"avatar_url": "https://avatars1.githubusercontent.com/u/7719018?v=4",
"profile": "https://github.com/nisargap",
"contributions": [
"code"
]
},
{
"login": "pdoro",
"name": "Pablo Domingo Rojo",
"avatar_url": "https://avatars2.githubusercontent.com/u/2817480?v=4",
"profile": "https://github.com/pdoro",
"contributions": [
"code"
]
},
{
"login": "rabarar",
"name": "Rob Baruch",
"avatar_url": "https://avatars3.githubusercontent.com/u/4433144?v=4",
"profile": "https://github.com/rabarar",
"contributions": [
"code"
]
},
{
"login": "GMpet",
"name": "Taoshi",
"avatar_url": "https://avatars0.githubusercontent.com/u/9339576?v=4",
"profile": "https://github.com/GMpet",
"contributions": [
"translation"
]
},
{
"login": "nonumeros",
"name": "nonumeros",
"avatar_url": "https://avatars1.githubusercontent.com/u/11535575?v=4",
"profile": "https://github.com/nonumeros",
"contributions": [
"code"
]
}
]
}
15 changes: 14 additions & 1 deletion CHANGELOG.md
Expand Up @@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [1.9.1] - 2018-08-30
### Fixed
- Issues with the GoHugo Theme's requirements for the themes.gohugo.io site


## [1.9.0] - 2018-08-30
### Added
- All-Contributors list to README.md
- Chinese language, thanks to @AgennyBrof
- Korean language, thanks to @hithat (user at poeditor.com)

## [1.8.1] - 2018-08-16
### Added
- Africans language
Expand Down Expand Up @@ -132,7 +143,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Some typos


[Unreleased]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.8.1...master
[Unreleased]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.9.1...master
[1.9.1]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.9.0...1.9.1
[1.9.0]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.8.1...1.9.0
[1.8.1]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.8.0...1.8.1
[1.8.0]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.7.1...1.8.0
[1.7.1]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.7.0...1.7.1
Expand Down
27 changes: 21 additions & 6 deletions README.md
@@ -1,4 +1,5 @@
## Bilberry Hugo Theme
[![All Contributors](https://img.shields.io/badge/all_contributors-18-orange.svg?style=flat-square)](#contributors)
[![GitHub version](https://img.shields.io/github/release/Lednerb/bilberry-hugo-theme/all.svg?style=flat-square)](https://github.com/Lednerb/bilberry-hugo-theme/releases)
[![License](https://img.shields.io/github/license/Lednerb/bilberry-hugo-theme.svg?style=flat-square)](https://github.com/Lednerb/bilberry-hugo-theme/blob/master/LICENSE.md)
[![Discord](https://img.shields.io/discord/479643633814077465.svg?style=flat-square&label=Discord%20Chat&colorB=7289da)](https://discord.gg/vZVHJ4j)
Expand Down Expand Up @@ -33,8 +34,9 @@ If you like this theme and/or use it for commercial purposes, please support me!
- [CSS and JS modules](#css-and-js-modules)
- [Translations](#translations)
- [Credits](#credits)
- [License](#license)
- [Support and Discussions](#support-and-discussions)
- [Contributors](#contributors)
- [License](#license)


## Quick Start
Expand Down Expand Up @@ -242,12 +244,25 @@ Bilberry is a theme for the great [HUGO static site generator](https://gohugo.io

A big thank you goes to [@Ipstenu](https://github.com/Ipstenu) for his help in [this thread](https://discourse.gohugo.io/t/search-index-json-file-for-lunr-js/6286/5?u=lednerb) that helped me to create the `index.json` for the algolia export.


## License
The Bilberry Theme for HUGO is licensed under the MIT license.


## Support and Discussions
If you enjoy this theme and want to stay up to date or just want to say thanks, have a look at this Discord Channel:

[![Discord](https://img.shields.io/discord/479643633814077465.svg?style=for-the-badge&label=Discord%20Chat&colorB=7289da)](https://discord.gg/vZVHJ4j)

## Contributors

Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
| [<img src="https://avatars1.githubusercontent.com/u/2056876?v=4" width="100px;"/><br /><sub><b>Sascha Brendel</b></sub>](https://sascha-brendel.de)<br />[💬](#question-Lednerb "Answering Questions") [📝](#blog-Lednerb "Blogposts") [💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=Lednerb "Code") [🎨](#design-Lednerb "Design") [📖](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=Lednerb "Documentation") [🌍](#translation-Lednerb "Translation") | [<img src="https://avatars1.githubusercontent.com/u/2056876?v=4" width="100px;"/><br /><sub><b>Anna Brendel</b></sub>](https://anna-brendel.de)<br />[🤔](#ideas "Ideas, Planning, & Feedback") [🌍](#translation "Translation") | [<img src="https://avatars2.githubusercontent.com/u/1560404?v=4" width="100px;"/><br /><sub><b>Givi Khojanashvili</b></sub>](https://www.linkedin.com/in/khojanashvili/)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=gigovich "Code") | [<img src="https://avatars2.githubusercontent.com/u/28822504?v=4" width="100px;"/><br /><sub><b>Chung Tran Anh</b></sub>](https://github.com/anhchungite)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=anhchungite "Code") [🌍](#translation-anhchungite "Translation") | [<img src="https://avatars0.githubusercontent.com/u/3048682?v=4" width="100px;"/><br /><sub><b>Minke Zhang</b></sub>](http://blogzhang.com)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=cripplet "Code") | [<img src="https://avatars1.githubusercontent.com/u/16353578?v=4" width="100px;"/><br /><sub><b>Pavel Kanyshev</b></sub>](https://github.com/aerohub)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=aerohub "Code") [🌍](#translation-aerohub "Translation") |
| :---: | :---: | :---: | :---: | :---: | :---: |
| [<img src="https://avatars3.githubusercontent.com/u/3541050?v=4" width="100px;"/><br /><sub><b>Marcel Kraus</b></sub>](https://www.marcelkraus.de)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=marcelkraus "Code") | [<img src="https://avatars2.githubusercontent.com/u/280825?v=4" width="100px;"/><br /><sub><b>Nick Busey</b></sub>](http://nickbusey.com/)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=NickBusey "Code") | [<img src="https://avatars1.githubusercontent.com/u/4789253?v=4" width="100px;"/><br /><sub><b>lkorzen</b></sub>](https://github.com/lkorzen)<br />[🌍](#translation-lkorzen "Translation") | [<img src="https://avatars1.githubusercontent.com/u/12019608?v=4" width="100px;"/><br /><sub><b>Chris Stayte</b></sub>](http://www.chrisstayte.com)<br />[🐛](https://github.com/Lednerb/bilberry-hugo-theme/issues?q=author%3AChrisStayte "Bug reports") | [<img src="https://avatars0.githubusercontent.com/u/405277?v=4" width="100px;"/><br /><sub><b>Dmitry Matrosov</b></sub>](https://twitter.com/amidos_me)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=meAmidos "Code") | [<img src="https://avatars2.githubusercontent.com/u/8802277?v=4" width="100px;"/><br /><sub><b>Marc-Antoine</b></sub>](https://marca.finch4.xyz/)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=Embraser01 "Code") [🐛](https://github.com/Lednerb/bilberry-hugo-theme/issues?q=author%3AEmbraser01 "Bug reports") |
| [<img src="https://avatars1.githubusercontent.com/u/2030983?v=4" width="100px;"/><br /><sub><b>Nina Zakharenko</b></sub>](http://nnja.io)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=nnja "Code") | [<img src="https://avatars1.githubusercontent.com/u/7719018?v=4" width="100px;"/><br /><sub><b>Nisarga</b></sub>](https://github.com/nisargap)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=nisargap "Code") | [<img src="https://avatars2.githubusercontent.com/u/2817480?v=4" width="100px;"/><br /><sub><b>Pablo Domingo Rojo</b></sub>](https://github.com/pdoro)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=pdoro "Code") | [<img src="https://avatars3.githubusercontent.com/u/4433144?v=4" width="100px;"/><br /><sub><b>Rob Baruch</b></sub>](https://github.com/rabarar)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=rabarar "Code") | [<img src="https://avatars0.githubusercontent.com/u/9339576?v=4" width="100px;"/><br /><sub><b>Taoshi</b></sub>](https://github.com/GMpet)<br />[🌍](#translation-GMpet "Translation") | [<img src="https://avatars1.githubusercontent.com/u/11535575?v=4" width="100px;"/><br /><sub><b>nonumeros</b></sub>](https://github.com/nonumeros)<br />[💻](https://github.com/Lednerb/bilberry-hugo-theme/commits?author=nonumeros "Code") |
<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!


## License
The Bilberry Theme for HUGO is licensed under the MIT license.
2 changes: 1 addition & 1 deletion exampleSite/config.toml
@@ -1,5 +1,5 @@
title = "My cool new Blog"
baseURL = "https://lednerb.github.io/bilberry-hugo-theme"
baseURL = "https://example.com"
theme = "bilberry-hugo-theme"

enableRobotsTXT = true
Expand Down
36 changes: 36 additions & 0 deletions i18n/ko.toml
@@ -0,0 +1,36 @@
[categories]
other = "카테고리"

[authors]
other = "글쓴이"

[tags]
other = "태그"

[socialMedia]
other = "소셜 미디어"

[latestPosts]
other = "최근 글"

[search]
other = "검색 ..."

[noSearchResults]
other = "검색 결과가 없습니다."

[olderPosts]
other = "이전 글"

[newerPosts]
other = "최근 글"

[footnoteReturnText]
other = "[되돌아가기]"

[continueReading]
other = "더보기"

[otherLanguages]
other = "다국어"

36 changes: 36 additions & 0 deletions i18n/zh-CN.toml
@@ -0,0 +1,36 @@
[categories]
other = "分类"

[authors]
other = "作者"

[tags]
other = "标签"

[socialMedia]
other = "社交媒体"

[latestPosts]
other = "最新帖子"

[search]
other = "搜索"

[noSearchResults]
other = "什么都没找到"

[olderPosts]
other = "以前的帖子"

[newerPosts]
other = "较新的帖子"

[footnoteReturnText]
other = "【返回】"

[continueReading]
other = "继续阅读"

[otherLanguages]
other = "其他语言"

36 changes: 36 additions & 0 deletions i18n/zh-TW.toml
@@ -0,0 +1,36 @@
[categories]
other = "分類"

[authors]
other = "作者"

[tags]
other = "標籤"

[socialMedia]
other = "社交媒體"

[latestPosts]
other = "最新帖子"

[search]
other = "搜索..."

[noSearchResults]
other = "什麼都沒找到。"

[olderPosts]
other = "以前的帖子"

[newerPosts]
other = "較新的帖子"

[footnoteReturnText]
other = "[返回]"

[continueReading]
other = "繼續閱讀"

[otherLanguages]
other = "其他語言"

Binary file removed images/patreon-button.png
Binary file not shown.
Binary file modified images/screenshot.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/tn.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 54900ec

Please sign in to comment.