Skip to content

Commit 313b65a

Browse files
authored
Merge pull request #68 from felixedel/version-1.1.0
Bump version to 1.1.0
2 parents 2d16a87 + ac941ef commit 313b65a

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## [Unreleased]
44

5+
## [v1.1.0] - 2020-04-02
6+
57
### Features
68
- Flirror now provides a plugin mechanism that allows custom modules to be
79
developed and included. For more information take a look at the
@@ -56,6 +58,7 @@
5658

5759
Initial release
5860

59-
[Unreleased]: https://github.com/felixedel/flirror/compare/v1.0.1...HEAD
61+
[Unreleased]: https://github.com/felixedel/flirror/compare/v1.1.0...HEAD
62+
[v1.1.0]: https://github.com/felixedel/flirror/compare/v1.0.1...v1.1.0
6063
[v1.0.1]: https://github.com/felixedel/flirror/compare/v1.0.0...v1.0.1
6164
[v1.0.0]: https://github.com/felixedel/flirror/releases/tag/v1.0.0

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,10 @@ register the module's view function in Flirror. Using this decorator will
322322
register a new route `/awesome_module/` on the underlying Flask application.
323323
Flirror-web will then request this route while providing the `module_id` as GET
324324
parameter. The helper function `basic_get()` will evaluate this GET parameter,
325-
look up the data which is stored in the database for this module_id and populate
326-
the data to the template provided via the `template_name` parameter. Finally, it
327-
returns the rendered template so that flirror-web can integrate it in its UI.
325+
look up the data which is stored in the database for this `module_id` and
326+
populate the data to the template provided via the `template_name` parameter.
327+
Finally, it returns the rendered template so that flirror-web can integrate it
328+
in its UI.
328329

329330
To store the data in the database, we provide a crawler function decorated with
330331
`@awesome_module.crawler()`. This registers the function as crawler for this
@@ -344,9 +345,9 @@ Flirror.
344345

345346
The `templates/awesome_module/index.html` file contains the view's HTML code in
346347
form of a [Jinja2](https://jinja.palletsprojects.com/en/2.11.x/) template. It
347-
might look redundant that the module names is specified again in the path to the
348-
template. That's necessary to avoid overriding templates of other modules. More
349-
information on this can be found in the
348+
might look redundant that the module's name is specified again in the path to
349+
the template. That's necessary to avoid overriding templates of other modules.
350+
More information on this can be found in the
350351
[Templates](https://flask.palletsprojects.com/en/1.1.x/blueprints/#templates)
351352
section of Flask's Blueprint documentation.
352353

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "flirror"
3-
version = "1.0.1"
3+
version = "1.1.0"
44
description = "A smartmirror based on Flask"
55
authors = ["Felix Edel <[email protected]>"]
66
license = "MIT"

0 commit comments

Comments
 (0)