Skip to content

Commit

Permalink
Merge branch 'release-0.13.0'
Browse files Browse the repository at this point in the history
Conflicts:
	Makefile
  • Loading branch information
Christian Neumann committed Jul 22, 2015
2 parents 0bb3caf + 59630d4 commit 00bca60
Show file tree
Hide file tree
Showing 38 changed files with 1,747 additions and 698 deletions.
5 changes: 4 additions & 1 deletion .gitignore
@@ -1,4 +1,7 @@
go/
example/monsti-example-module/go
example/monsti-example-module/monsti-example-module
static/lib/
dist/
example/data/example/cache/
templates/example
example/data/localhost/cache/
14 changes: 14 additions & 0 deletions CHANGES
@@ -1,3 +1,17 @@
* 0.13.0 - released 2015/07/22
- New features:
+ Fields of contact forms are configurable.
+ Added RenderNode signal (replaces NodeContext signal).
+ Added GUI for list fields.
- Changes:
+ Deprecated NodeContext signal (use RenderNode signal!).
+ Moved contact form to separate module.
+ Changed fields (Method, FormData, Form, PostForm) of service.Request.
+ Refactored service.Field.
- Fixed:
+ Now calling FinishSignal in WaitSignal if an error occurs.
+ Stop waiting for signal responses if an error occured.

* 0.12.0 - released 2015/06/05
- New features:
+ Migrations to new releases will be as pleasant as possible and
Expand Down
15 changes: 15 additions & 0 deletions CODE_OF_CONDUCT.md
@@ -0,0 +1,15 @@
# Contributor Code of Conduct

As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.

We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.

Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.

This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.

This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -5,11 +5,11 @@ GO_GET=$(GO) get $(GO_COMMON_OPTS)
GO_BUILD=$(GO) build $(GO_COMMON_OPTS)
GO_TEST=$(GO) test $(GO_COMMON_OPTS)

MODULES=daemon
MODULES=daemon base

LOCALES=de

MONSTI_VERSION=0.12.0
MONSTI_VERSION=0.13.0
DEB_VERSION=1

DIST_PATH=dist/monsti-$(MONSTI_VERSION)
Expand Down Expand Up @@ -143,7 +143,7 @@ locale/monsti-daemon.pot:
%.po: locale/monsti-daemon.pot
msgmerge -s -U $@ $<

doc: doc/manual.html
doc: doc/manual.html doc/release_notes.html

doc/%.html: doc/%.adoc
asciidoc $<
Expand All @@ -156,6 +156,6 @@ example/monsti-example-module/monsti-example-module:
example-module: go/bin/monsti-example-module

go/bin/monsti-example-module: example/monsti-example-module/monsti-example-module
cp example/monsti-example-module/monsti-example-module $(GOPATH)/bin
cp -f example/monsti-example-module/monsti-example-module $(GOPATH)/bin
rm -f templates/example
ln -sf ../example/monsti-example-module/templates templates/example
7 changes: 7 additions & 0 deletions README.md
Expand Up @@ -53,6 +53,13 @@ Project
Website: http://www.monsti.org/
Code: http://www.gitorious.org/monsti | http://github.com/monsti

Contributions
-------------

Please note that this project is released with a
[Contributor Code of Conduct](CODE_OF_CONDUCT.md).
By participating in this project you agree to abide by its terms.

Acknowledgements
----------------

Expand Down

0 comments on commit 00bca60

Please sign in to comment.