Skip to content

Commit

Permalink
Merge branch 'release/2.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
cwensley committed Feb 15, 2018
2 parents 26cd68d + a91fb0d commit bd331f4
Show file tree
Hide file tree
Showing 2,511 changed files with 98,744 additions and 81,315 deletions.
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!-- Thanks for taking the time to report an issue! Some things to consider:
- If you can, please try to reproduce the problem using the develop branch first as your issue may already be fixed.
- If you have an enhancement request, you can remove the sections that don't apply.
- Please be detailed and ensure there isn't already an open issue for your bug/request.
-->

## Expected Behavior


## Actual Behavior


## Steps to Reproduce the Problem

1.
2.
3.

<!-- Supplying code that demonstrates the problem expedites a fix (and a response)! -->
## Code that Demonstrates the Problem

```
[Paste your code here]
```

<!-- Please specify the version of Eto and all platforms this can be reproduced in -->
## Specifications

- Version:
- Platform(s): (WPF, WinForms, Gtk2, Gtk3, Mac, XamMac, etc)
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
*.suo
bin/
obj/
/BuildOutput
*.shfbproj_*
UpgradeLog*.htm
Source/Components
/src/Components
AppPackages
packages/
.vs/
[Tt]humbs.db
/artifacts
packages/
16 changes: 16 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Eto.Test.Gtk",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build_gtk",
"program": "${workspaceFolder}/artifacts/test/Debug/netcoreapp2.0/Eto.Test.Gtk.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart"
}
]
}
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"editor.insertSpaces": false,
"editor.detectIndentation": false
}
15 changes: 15 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build_gtk",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj"
],
"problemMatcher": "$msCompile"
}
]
}
46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

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, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
26 changes: 0 additions & 26 deletions LICENSE

This file was deleted.

26 changes: 26 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
The BSD-3 License.

AUTHORS
Copyright © 2011-2018 Curtis Wensley. All Rights Reserved.
Copyright © 2012-2013 Vivek Jhaveri. All Rights Reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions
and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
and the following disclaimer in the documentation and/or other materials provided with the
distribution.

3. The name of the author may not be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Binary file removed Libraries/GtkSharp3/libatksharpglue-3.so
Binary file not shown.
Binary file removed Libraries/GtkSharp3/libgiosharpglue-3.so
Binary file not shown.
Binary file removed Libraries/GtkSharp3/libgtksharpglue-3.so
Binary file not shown.
Binary file removed Libraries/GtkSharp3/libpangosharpglue-3.so
Binary file not shown.
Binary file removed Libraries/GtkSharp3/webkitgtk-sharp.dll
Binary file not shown.
6 changes: 0 additions & 6 deletions Libraries/GtkSharp3/webkitgtk-sharp.dll.config

This file was deleted.

104 changes: 0 additions & 104 deletions Libraries/MGSplitViewController/MGSplitViewController-License.rtf

This file was deleted.

Binary file not shown.
Binary file removed Libraries/MonoMac/MonoMac.CFNetwork.dll
Binary file not shown.
Binary file removed Libraries/MonoMac/MonoMac.dll
Binary file not shown.
Binary file removed Libraries/MonoMac64/MonoMac.CFNetwork.dll
Binary file not shown.
Binary file removed Libraries/MonoMac64/MonoMac.dll
Binary file not shown.
Binary file removed Libraries/WPFColorPicker/ColorPicker.dll
Binary file not shown.
Loading

0 comments on commit bd331f4

Please sign in to comment.