Skip to content

Commit

Permalink
Merge branch 'master' into 1758_pagination_defafult
Browse files Browse the repository at this point in the history
  • Loading branch information
jarednova committed Sep 11, 2018
2 parents 772cc26 + 112e0b9 commit 87bd475
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 3 deletions.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Bug report
about: Create a report to help us improve

---

Is this a support or usage question? Please post to [StackOverflow](http://stackoverflow.com/questions/tagged/timber) using the Timber tag

### Expected behavior
<!-- Please describe what output you expect to see from Timber -->

### Actual behavior
<!-- Please describe what you see instead. Please provide samples of HTML output or screenshots -->

### Steps to reproduce behavior
<!-- Please include complete code samples in-line or linked from [gists](https://gist.github.com/) -->

### What version of WordPress, PHP and Timber are you using?
<!-- Example: WordPress 4.4.1, PHP 5.4, Timber 0.22.5 -->

### How did you install Timber? (for example, from GitHub, Composer/Packagist, WP.org?)
<!-- Example: Upgraded to newest version via plugin updater in WordPress dashboard -->
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/support-question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
name: Support Question
about: Need guidance/clarification? Get it here

---

Hey, that was actually a bit of a trick, sorry. Please post your question to [StackOverflow](http://stackoverflow.com/questions/tagged/timber) using the Timber tag. To help us keep (or start to keep) the Issues section a bit cleaner, we're going to close support question-ish issues. StackOverflow is the best place for these — thanks!
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
First off, hello! Thanks for submitting a PR. We love/welcome PRs (especially if it's your first). Have any questions? Read [this section in CONTRIBUTING.md](https://github.com/timber/timber/blob/master/CONTRIBUTING.md#pull-requests)

**Ticket**: # <!-- Ignore this if not relevant -->

#### Issue
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

### Pull Requests

Pull requests are highly appreciated. More than fifty people have written parts of Timber (so far). Here are some guidelines to help:
Pull requests are highly appreciated. Almost 150 people have written parts of Timber (so far). Here are some guidelines to help:

1. **Solve a problem** – Features are great, but even better is cleaning-up and fixing issues in the code that you discover.
2. **Write tests** – This helps preserve functionality as the codebase grows and demonstrates how your change affects the code.
Expand Down
4 changes: 2 additions & 2 deletions lib/PostPreview.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function read_more( $readmore = 'Read More' ) {
}

/**
* @param boolean|string $strip strip the tags or what? You can also provide a list of allowed tags
* @param boolean|string $strip strip the tags or what? You can also provide a list of allowed tags (e.g. '<p><a>')
*/
public function strip( $strip = true ) {
$this->strip = $strip;
Expand Down Expand Up @@ -164,4 +164,4 @@ protected function run() {
return trim($text);
}

}
}

0 comments on commit 87bd475

Please sign in to comment.