Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (65 commits)
  fix theme-next#815 (theme-next#828)
  Update IPC url (theme-next#827)
  List items appeared correctly in mobile with `mobile_layout_economy` option (theme-next#817)
  New translations en.yml (French) (theme-next#819)
  Improve French translation (theme-next#818)
  Fix wrong sidebar style on mobile (theme-next#808)
  Delete inactive reviewer
  New translations en.yml (Spanish) (theme-next#806)
  CSS bug in Codeblock if string longer than viewport (theme-next#803)
  Commented Project
  Temporairly turn off Project checking
  Disable Projects compairing
  Fix `vv` for Release Drafter
  Spanish translation (theme-next#801)
  Optimize images (theme-next#802)
  Release v7.1.0
  Change Algolia link in config
  Reduce reviewers for remove scrolling in PR's (theme-next#797)
  Disable add Assigners in Auto Assign bot (theme-next#795)
  Bug Fix: PDF won't display in particular situation (theme-next#794)
  ...
  • Loading branch information
invkrh committed Apr 13, 2019
2 parents 03be32a + d39666e commit 77c47c9
Show file tree
Hide file tree
Showing 120 changed files with 1,111 additions and 788 deletions.
21 changes: 15 additions & 6 deletions .all-contributorsrc
Expand Up @@ -22,7 +22,10 @@
"blog",
"review",
"test",
"translation"
"translation",
"design",
"infra",
"maintenance"
]
},
{
Expand Down Expand Up @@ -132,7 +135,8 @@
"code",
"doc",
"review",
"test"
"test",
"projectManagement"
]
},
{
Expand Down Expand Up @@ -405,7 +409,8 @@
"contributions": [
"bug",
"code",
"doc"
"doc",
"infra"
]
},
{
Expand All @@ -416,7 +421,9 @@
"contributions": [
"bug",
"code",
"doc"
"doc",
"translation",
"review"
]
},
{
Expand All @@ -427,7 +434,9 @@
"contributions": [
"bug",
"code",
"doc"
"doc",
"review",
"translation"
]
},
{
Expand All @@ -441,5 +450,5 @@
]
}
],
"contributorsPerLine": 7
"contributorsPerLine": 6
}
37 changes: 32 additions & 5 deletions .github/CONTRIBUTING.md
Expand Up @@ -12,6 +12,7 @@ First of all, thanks for taking your time to contribute and help make our projec

* [Before Submitting An Issue](#before-submitting-an-issue)
* [Reporting Bugs](#reporting-bugs)
* [Reporting Security Bugs](#reporting-security-bugs)
* [Suggesting Enhancements](#suggesting-enhancements)
* [Submitting a Pull Request](#submitting-a-pull-request)
* [Creating Releases](#creating-releases)
Expand All @@ -24,11 +25,13 @@ First of all, thanks for taking your time to contribute and help make our projec
* [Commit Messages Rules](#commit-messages-rules)

<a name="how-can-i-contribute"></a>

## How Can I Contribute?

Main Theme-Next repository was rebased from [iissnan's](https://github.com/iissnan/hexo-theme-next) profile to [Theme-Next](https://github.com/theme-next) organization on GitHub. Most libraries under the `next/source/lib` directory was moved out to [external repos](https://github.com/theme-next) under NexT organization. Version 5 works fine at most cases, but for frequent users, you maybe need to [upgrade version 5 to 6](https://github.com/theme-next/hexo-theme-next/blob/master/docs/UPDATE-FROM-5.1.X.md) to get features and supports in new [Theme-Next](https://github.com/theme-next/hexo-theme-next) repository.

<a name="before-submitting-an-issue"></a>

### Before Submitting An Issue

If you just have a question, you'll get faster results by checking the FAQs for a list of common questions and problems (Work in progress) or the [Β«NexTΒ» Documentation Site](https://theme-next.org/docs/) (Work in progress).
Expand All @@ -40,6 +43,7 @@ If you find a bug in the source code, most importantly, please check carefully i
[submit a Pull Request](#submitting-a-pull-request) with a fix.

<a name="reporting-bugs"></a>

### Reporting Bugs

Before creating bug reports, please check [this list](#before-submitting-an-issue) as you might find out that you don't need to create one. After you've determined the repository your bug is related to, create an issue on that repository and provide the information as many details as possible by filling in [the required template](ISSUE_TEMPLATE.md).
Expand All @@ -58,6 +62,16 @@ Following these guidelines helps maintainers and the community understand your r
* Describe the behavior you observed after following the steps and point out what exactly is the problem with that behavior.
* Explain which behavior you expected to see instead and why.

<a name="reporting-security-bugs"></a>

#### Reporting Security Bugs

If you find a security issue, please act responsibly and report it not in the public issue tracker, but directly to us, so we can fix it before it can be exploited. Please send the related information to security@theme-next.com (desirable with using PGP for e-mail encryption).

We will gladly special thanks to anyone who reports a vulnerability so that we can fix it. If you want to remain anonymous or pseudonymous instead, please let us know that; we will gladly respect your wishes.

<a name="suggesting-enhancements"></a>

### Suggesting Enhancements

Before creating enhancement suggestions, please check [this list](#before-submitting-an-issue) as you might find out that you don't need to create one. After you've determined the repository your enhancement suggestion is related to, create an issue on that repository and provide the information as many details as possible by filling in [the required template](ISSUE_TEMPLATE.md).
Expand All @@ -68,6 +82,8 @@ Following these guidelines helps maintainers and the community understand your s
* Describe the current behavior and explain which behavior you expected to see instead and Explain why this enhancement would be useful to most users.
* Provide specific examples to demonstrate the suggestion. Include links to files (screenshots or GIFs) or live demo.

<a name="submitting-a-pull-request"></a>

### Submitting a Pull Request

Before creating a Pull Request (PR), please check [this list](#before-submitting-an-issue) as you might find out that you don't need to create one. After you've determined the repository your pull request is related to, create a pull request on that repository. The detailed document of creating a pull request can be found [here](https://help.github.com/articles/creating-a-pull-request/).
Expand Down Expand Up @@ -97,6 +113,8 @@ Following these guidelines helps maintainers and the community understand your p
* Fill in [the required template](PULL_REQUEST_TEMPLATE.md) as many details as possible.
* All features or bug fixes must be tested in all schemes. And provide specific examples to demonstrate the pull request. Include links to files (screenshots or GIFs) or live demo.

<a name="creating-releases"></a>

### Creating Releases

Releases are a great way to ship projects on GitHub to your users.
Expand All @@ -112,16 +130,24 @@ Releases are a great way to ship projects on GitHub to your users.
5. If you'd like to include binary files along with your release, such as compiled programs, drag and drop or select files manually in the binaries box.
6. If the release is unstable, select **This is a pre-release** to notify users that it's not ready for production. If you're ready to publicize your release, click **Publish release**. Otherwise, click **Save draft** to work on it later.

<a name="guides"></a>

## Guides

<a name="coding-rules"></a>

### Coding Rules

This project and everyone participating in it is governed by the [Code of Conduct](CODE_OF_CONDUCT.md) to keep open and inclusive. By participating, you are expected to uphold this code.

<a name="coding-standards"></a>

### Coding Standards

To be continued.

<a name="labels-rules"></a>

### Labels Rules

We use "labels" in the issue tracker to help classify pull requests and issues. Using labels enables maintainers and users to quickly find issues they should look into, either because they experience them, or because it meets their area of expertise.
Expand All @@ -134,6 +160,7 @@ Issues related: `types`+`contents`+`results`
- `Irrelevant`: An irrelevant issue for Next
- `Duplicate`: An issue which had been mentioned
- `Bug`: A detected bug that needs to be confirmed
- `Improvement Need`: An issue that needs to be improvement
- `Feature Request`: An issue that wants a new feature
- `High Priority`: A detected bugs or misprints with high priority
- `Low Priority`: A detected bugs or misprints with low priority
Expand All @@ -154,7 +181,6 @@ Issues related: `types`+`contents`+`results`
- `Configurations`: An issue related to configurations
- `CSS`: An issue related to CSS
- `Custom`: An issue related to custom things
- `Optimization`: An issue that needs to be optimized
- By results
- `Wontfix`: An issue that will not to be fixed
- `Need More Info`: Need more information for solving the issue
Expand All @@ -174,13 +200,14 @@ Pull requests related:
- `Docs`: A Pull requests that Instruction document has been added
- `New Feature`: A Pull requests that provides a new feature
- `Feature`: A Pull requests that provides an option or addition to existing feature
- `Configurations`: A Pull requests related to configurations
- `Optimization`: A Pull requests that optimizates the Next
- `Improvement`: A Pull requests that improves NexT
- `i18n`: A Pull requests that makes new languages translation
- `Performance`: A Pull requests that improves the performance
- `Discussion`: A Pull requests that needs to be discussed
- `v6.x`: A Pull requests that bug fixes and some optimizations related to old NexT version 6
- `v7.x`: A Pull requests that bug fixes and some optimizations, related to old NexT version 7
- `v6.x`: A Pull requests that bug fixes and some improvements, related to old NexT version 6
- `v7.x`: A Pull requests that bug fixes and some improvements, related to old NexT version 7

<a name="commit-messages-rules"></a>

### Commit Messages Rules

Expand Down
22 changes: 22 additions & 0 deletions .github/auto_assign.yml
@@ -0,0 +1,22 @@
# Configuration for Auto Assign - https://github.com/kentaro-m/auto-assign

# Set to true to add reviewers to pull requests
addReviewers: true

# Set to true to add assignees to pull requests
addAssignees: false

# A list of reviewers to be added to pull requests (GitHub user name)
reviewers:
- ivan-nginx
- maple3142
- sli1989
- stevenjoezhang

# A number of reviewers added to the pull request
# Set 0 to add all the reviewers (default: 0)
numberOfReviewers: 0

# A list of keywords to be skipped the process that add reviewers if pull requests include it
skipKeywords:
- wip
63 changes: 63 additions & 0 deletions .github/config.yml
@@ -0,0 +1,63 @@
# =============================================================================================== #
# Configuration for welcome - https://github.com/behaviorbot/welcome

# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Thanks for opening this issue, maintainers will get back to you as soon as possible!
# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Thanks so much for opening your first PR here!
# Comment to be posted to on pull requests merged by a first time user
firstPRMergeComment: >
Congrats on merging your first pull request here! :tada: How awesome!
# =============================================================================================== #
# Configuration for request-info - https://github.com/behaviorbot/request-info

# *OPTIONAL* Label to be added to Issues and Pull Requests with insufficient information given
requestInfoLabelToAdd: Need More Info

# *OPTIONAL* Add a list of people whose Issues/PRs will not be commented on
# keys must be GitHub usernames
requestInfoUserstoExclude:
- 1v9
- Acris
- flashlab
- geekrainy
- iissnan
- ivan-nginx
- JiangTJ
- LEAFERx
- liolok
- maple3142
- Raincal
- sli1989
- stevenjoezhang
- tsanie
- wafer-li

# =============================================================================================== #
# Configuration for sentiment-bot - https://github.com/behaviorbot/sentiment-bot

# *Required* toxicity threshold between 0 and .99 with the higher numbers being the most toxic
# Anything higher than this threshold will be marked as toxic and commented on
sentimentBotToxicityThreshold: .6

# *Required* Comment to reply with
sentimentBotReplyComment: >
Please be sure to review the [code of conduct](https://github.com/theme-next/hexo-theme-next/blob/master/.github/code-of-conduct.md) and be respectful of other users. cc/ @theme-next/next
# =============================================================================================== #
lockThreads:
toxicityThreshold: .7
numComments: 2
setTimeInHours: 72
replyComment: >
This thread is being locked due to exceeding the toxicity minimums. cc/ @theme-next/next
# =============================================================================================== #
# Configuration for todo-bot - https://github.com/JasonEtco/todo
todo:
label: 'πŸ—’ To-Do'
8 changes: 8 additions & 0 deletions .github/eslint-disable-bot.yml
@@ -0,0 +1,8 @@
# Configuration for ESLint Disable Watcher - https://github.com/koddsson/eslint-disable-probot

# Change this to set the number of comments the watcher should comment on a given PR.
commentLimit: 10
# The message the bot will post on any lines containing a eslint disable comment.
commentMessage: Please don't disable eslint rules :pray:
# A optional regular expression that will match against the branch name and not comment on it if it matches.
skipBranchMatching: null
39 changes: 39 additions & 0 deletions .github/lock.yml
@@ -0,0 +1,39 @@
# Configuration for Lock Threads - https://github.com/dessant/lock-threads

# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 365

# Skip issues and pull requests created before a given timestamp. Timestamp must
# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
skipCreatedBefore: false

# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
exemptLabels:
- backlog

# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: πŸ”’ Locked

# Comment to post before locking. Set to `false` to disable
lockComment: >
This thread has been automatically locked since there has not been
any recent activity after it was closed. It is possible issue was
solved or at least outdated. Feel free to open new for related bugs.
# Assign `resolved` as the reason for locking. Set to `false` to disable
setLockReason: true

# Limit to only `issues` or `pulls`
only: issues

# Optionally, specify configuration settings just for `issues` or `pulls`
# issues:
# exemptLabels:
# - help-wanted
# lockLabel: outdated

# pulls:
# daysUntilLock: 30

# Repository to extend settings from
# _extends: repo
29 changes: 29 additions & 0 deletions .github/mergeable.yml
@@ -0,0 +1,29 @@
# Configuration for Mergeable - https://github.com/jusx/mergeable

version: 2
mergeable:
- when: pull_request.*
validate:
- do: description
no_empty:
enabled: false

- do: title
must_exclude:
regex: ^\[WIP\]

- do: label
must_include:
regex: 'feat|imp|fix|doc|i18n'
must_exclude:
regex: 'wip|work in progress'

#- do: project
# no_empty:
# enabled: true
# must_include:
# regex: 'feat|imp|fix|doc|loc'

- do: milestone
no_empty:
enabled: true
34 changes: 34 additions & 0 deletions .github/release-drafter.yml
@@ -0,0 +1,34 @@
# Configuration for Release Drafter - https://github.com/toolmantim/release-drafter

name-template: v$NEXT_MINOR_VERSION
tag-template: v$NEXT_MINOR_VERSION
categories:
- title: πŸ’₯ Breaking Changes
label: Breaking Change

- title: 🌟 New Features
label: New Feature

- title: ⭐ Features
label: Feature

- title: πŸ›  Improvements
label: Improvement

- title: 🐞 Bug Fixes
label: Bug Fix

- title: πŸ“– Documentation
label: Docs

- title: 🌍 Localization
label: i18n

change-template: '- $TITLE (#$NUMBER)'
no-changes-template: '- No changes'
template: |
$CHANGES
***
For full changes, see the [comparison between $PREVIOUS_TAG and v$NEXT_MINOR_VERSION](https://github.com/theme-next/hexo-theme-next/compare/v$PREVIOUS_TAG...v$NEXT_MINOR_VERSION)

0 comments on commit 77c47c9

Please sign in to comment.