summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 11:24:31 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 11:24:31 +0100
commitd25a009ebe56f669fd0b6e6e8ff579f24368abb7 (patch)
tree4154a7976dfb7e63544285f63d014d14f9d6d73f /README.md
parenteaad37485fe59d0306c37cc038dda6d210052910 (diff)
parent76a2cbbeab405f466f0fd53d7da2bf7a2f98e6a3 (diff)
Merge branch 'develop'
Diffstat (limited to 'README.md')
-rw-r--r--README.md23
1 files changed, 18 insertions, 5 deletions
diff --git a/README.md b/README.md
index a97ad3b..d0a758d 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,29 @@
GS5
===
+Gemeinschaft 5 by [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX. This Github repository is our development environment.
-Gemeinschaft 5 by the [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX.
+Bug reports
+===========
+Please open a new issue to report a bug. Please don't forget to include the URL in case you report a view related problem.
+
+Feature requests
+================
+Please open a new issue and mark it as a feature request.
+
+Roadmap
+=======
+We don't have a public roadmap. But we do track the future work with issues. So have a look at [https://github.com/amooma/GS5/issues](https://github.com/amooma/GS5/issues) for future features.
License
=======
-We use this repository to develop and we'd like to invite everybody to add new features or find bugs. There for the repository is not a private one. But the code in this repository is not GPL! Please go to [http://amooma.de/gemeinschaft/gs5](http://amooma.de/gemeinschaft/gs5) for a copy of this software with an other license.
+We use this public repository to develop. Do not use this code on a production system! Do not give away this code to your clients! This code is strictly for development purposes and GS5 is not a GPL project.
+
+DO NOT USE CODE FROM THE CONTENT OF THIS REPOSITORY FOR A PRODUCTION SYSTEM!
-DO NOT USE CODE FROM THIS REPO FOR A PRODUCTION SYSTEM!
+You can download a free and stable version of GS5 for your production system at [http://amooma.de/gemeinschaft/gs5](http://amooma.de/gemeinschaft/gs5).
Development How-to
==================
-There is a master and a develop branch in this repository. If you are familiar with [http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/) you are good to go. Please send a pull request and an e-mail to stefan.wintermeyer@amooma.de with some info about your code. Regular developer get access to the repository and a closed developer mailinglist.
+There is a master and a develop branch in this repository. If you are familiar with [http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/) you are good to go. Please send a pull request and an e-mail to stefan.wintermeyer@amooma.de with some info about your code. Regular developer get access to the repository, a closed developer mailinglist and hardware in case they need it.
-We only accept code which was written 100% by you and were you grant us the rights for this code. \ No newline at end of file
+We only accept code which was written 100% by you and were you grant us the rights for the code. \ No newline at end of file