Skip to content

Commit

Permalink
Merge branch 'master' into unstable
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-duponchelle committed Dec 11, 2015
2 parents ce5a29b + a2f0745 commit ad45018
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 5 deletions.
17 changes: 16 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Change Log

## 1.3.13 11/12/2015

* Update links for new website.

## 1.3.12 11/12/2015

* Contributing instructions
* Correctly display log messages.
* Tentative fix for "WinError 64 The specified network name is no longer available" issues.
* Fix minor errors reported by codacy.com
* Add doc on how to got code coverage
* Raise an error when you use a port outside the ranges
* Fix asyncio error when closing the app
* Release UDP ports when closing a Qemu VM. Fixes #323.

## 1.4.0rc2 10/12/2015

* Add log about wher iou capture packet
Expand Down Expand Up @@ -70,7 +85,7 @@
* Do not require a TAP interface to already exist. Fixes #321.
* Do not automatically delete Dynamips bootflash file because they are necessary to restore VLANs on the c3600 platform.

# 1.3.11 07/10/2015
## 1.3.11 07/10/2015

* Escape other usage of glob
* Fix Dynamips identifier is already used by another router
Expand Down
50 changes: 50 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Contributing to GNS3

We welcome contributions and bugs reports from everyone.
We are friendly so don't be afraid to ask questions.

## Bug reports

Before reporting an issue:
* check our website over at https://gns3.com
* check if an issue already exists on https://github.com/GNS3/gns3-gui
* check if an issue already exists on https://github.com/GNS3/gns3-server

Please post on our community website if you are unsure you found a bug,
you will get faster support and be able to exchange with more users.

If you are unsure which project you should create an issue for, just do
it on https://github.com/GNS3/gns3-gui we will take care of the triage.

For bugs specific to the GNS3 VM, please report on https://github.com/GNS3/gns3-vm

## Asking for new features

The best is to start a discussion on the community website in order to get feedback
from the whole community.


## Contributing code

We welcome code contribution from everyone including beginners.
Don't be afraid to submit a half finished or mediocre contribution and we will help you.

Don't hesitate to share your plans before starting working on a contribution, we can help
you to find the best approach.

### Contributors License Agreements

We at GNS3 are eager to work with you. For small changes — little bugfixes, correcting typos, and the like — please just submit pull requests to any of our projects. For larger changes, though, we have to ask you to jump through a little hoop.

In particular, in order for us to accept any major patches from you, you will have to electronically sign a statement that indicates two things:

- You are willingly licensing your contributions under the terms of the open source license of the project that you’re contributing to.
- You are legally able to license your contributions as stated.

The reason we do this is to ensure, to the extent possible, that we don’t “taint” the projects we manage with contributions that turn out to be improper. This protects everyone who wants to use the projects, including you!

More information there: https://github.com/GNS3/cla

### Pull requests

Creating a pull request is the easiest way to contribute code. Do not hesitate to create one early when contributing for new feature in order to get our feedback.
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Welcome to API documentation!
======================================

.. WARNING::
The API is not stable, feel free to send comment on GNS3 Jungle
https://community.gns3.com/
The API is not stable, feel free to post comments on our website
https://gns3.com/

.. toctree::
general
Expand Down
2 changes: 1 addition & 1 deletion gns3server/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h3>
Welcome to GNS3.
</h3>
<ul>
<li><a href="http://community.gns3.com">Community</a></li>
<li><a href="https://gns3.com">Website</a></li>
<li><a href="http://api.gns3.net">API documentation</a></li>
<li><a href="/upload">Upload images & backup</a></li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion tests/handlers/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ def test_index(server):
response = server.get('/', api_version=None)
assert response.status == 200
html = response.html
assert "Community" in html
assert "Website" in html
assert __version__ in html

0 comments on commit ad45018

Please sign in to comment.