Skip to content

Commit

Permalink
master: Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
lowitea committed May 23, 2021
2 parents 027c760 + 299c963 commit ad69969
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 5 deletions.
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
labels: bug
assignees: lowitea

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[FEATURE]"
labels: ''
assignees: lowitea

---

**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.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Version history
We follow [Semantic Versions](https://semver.org/).

## 1.2.0 - The parrot's name is now Kesha!

## 1.1.0 - Disable logs by default

### Important changes
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Build:
![build](https://github.com/NUTtech/Kesha/workflows/build/badge.svg)

Code quality:
[![codecov](https://github.com/NUTtech/Kesha/branch/develop/graph/badge.svg)](https://codecov.io/gh/NUTtech/Kesha)
[![codecov](https://codecov.io/gh/NUTtech/Kesha/branch/develop/graph/badge.svg?token=788OM63owZ)](https://codecov.io/gh/NUTtech/Kesha)
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/NUTtech/Kesha.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/NUTtech/Kesha/context:python)
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=NUTtech_Kesha&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=NUTtech_Kesha)
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=NUTtech_Kesha&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=NUTtech_Kesha)
Expand Down Expand Up @@ -42,3 +42,6 @@ We welcome all contributions!
See [CONTRIBUTING.md](CONTRIBUTING.md) if you want to contribute.
You can start with [issues that need some help](https://github.com/NUTtech/Kesha/issues)
right now.

## Note
The project was forked from https://github.com/Uma-Tech/parrot version 1.1.0. And this parrot now lives here.
2 changes: 1 addition & 1 deletion http_stubs/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def test_write_log(self, http_stub_factory, client):
log = LogEntry.objects.last()

def _datefmt(date) -> str: # noqa:WPS430
"""Converts date object to string.
"""Convert date object to string.
For comparing datetime and FakeDateTime.
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "kesha"
version = "1.1.0"
version = "1.2.0"
description = "Service for testing http requests and webhooks."
authors = ["Evgeniy <ea@lowit.ru>"]
maintainers = ["Evgeniy Mitin <ea@lowit.ru>"]
Expand All @@ -24,7 +24,7 @@ python = "~3.8"
django = "~3.1"
django-simpleui = "~2021.3"
uvicorn = "~0.13.4"
psycopg2 = "~2.8.6"
psycopg2-binary = "~2.8.6"
django-environ = "^0.4.5"
django-extensions = "^3.1.1"
django-debug-toolbar = "^3.1.1"
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/http_stubs/includes/fieldset.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
if (param) {
$.extend(this.default_params, param);
}
ip_global_img_list = [];
var ip_global_img_list = [];
var id = this.default_params.id;
if (typeof id == 'string') {
if ((ip_global_img_list = $("#"+id).find("img")).length == 0) {
Expand Down

0 comments on commit ad69969

Please sign in to comment.