Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to MIT license #2646

Merged
merged 8 commits into from
Sep 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,38 @@
Microsoft Public License (Ms-PL)
MIT License (MIT)

Copyright (c) 2016 MahApps

Unless indicated otherwise on a per-file basis all source and documentation herein
is licensed under the MIT license. Some included code is licensed under MS-PL which
is compatible with the terms of MIT.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

-----

Original code from RangeSlider (AvalonControlsLibrary), ToggleSwitch (Microsoft's Silverlight "Cosmopolitan"),
Callisto (@timheuer), WindowChrome (@Microsoft, @joecastro) and TransitioningContentControl from the
Silverlight Toolkit 5 are licensed under MS-PL which is compatible with the terms of MIT.

-----

Microsoft Public License (MS-PL)

This license governs use of the accompanying software. If you use the software, you
accept this license. If you do not accept the license, do not use the software.
Expand All @@ -19,4 +53,4 @@ A "contributor" is any person that distributes its contribution under this licen
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
32 changes: 0 additions & 32 deletions Licenses/avaloncontrolslibrary

This file was deleted.

25 changes: 0 additions & 25 deletions Licenses/callisto

This file was deleted.

32 changes: 0 additions & 32 deletions Licenses/silverlighttoolkit

This file was deleted.

2 changes: 1 addition & 1 deletion MahApps.Metro/MahApps.Metro.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>MahApps.Metro</title>
<authors>Jan Karger, Dennis Daume, Brendan Forster, Paul Jenkins, Jake Ginnivan, Alex Mitchell</authors>
<owners>punker76,shiftkey,aeoth,jakeginnivan</owners>
<licenseUrl>http://www.opensource.org/licenses/MS-PL</licenseUrl>
<licenseUrl>https://github.com/MahApps/MahApps.Metro/blob/develop/LICENSE</licenseUrl>
<projectUrl>https://github.com/MahApps/MahApps.Metro</projectUrl>
<iconUrl>https://raw.githubusercontent.com/MahApps/MahApps.Metro/master/mahapps.metro.logo2.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down
2 changes: 1 addition & 1 deletion MahApps.Metro/Themes/FlyoutsControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<Grid />
<Grid IsItemsHost="True" />
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
Expand Down
3 changes: 3 additions & 0 deletions docs/release-notes/1.3.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ MahApps.Metro v1.3.0 bug fix and feature release.

# Features / Changes (and Fixes)

- Switched from Ms-PL to MIT license #2646
- New `DateTimePicker` and `TimePicker` controls #2299 #2510 (@xxMUROxx)
- New Hotkey control `HotKeyBox` #2322 (@thoemmi)
- New 'Remember' CheckBox in `LoginDialog` #2308 #2305 (@manekovskiy)
Expand Down Expand Up @@ -194,3 +195,5 @@ MahApps.Metro v1.3.0 bug fix and feature release.
- #2598 DatePickerTextBoxBehavior NullReferenceException
- #2611 SliderHelper.EnableMouseWheel is working only once when using TabControl
- #2618 IgnoreTaskbarOnMaximize stopped working after windows 10 anniversary update. (@igorushi, @punker76)
- #2635 Showing any Window before Main Window causes Left and Right window commands not work properly.
- #2656 Flyout problem with ActualWidth
23 changes: 1 addition & 22 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,25 +170,4 @@ Now you can choose the templates at the `New Project` dialog.

## Licence

Microsoft Public License (Ms-PL)

This license governs use of the accompanying software. If you use the software, you
accept this license. If you do not accept the license, do not use the software.

1. Definitions
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the
same meaning here as under U.S. copyright law.
A "contribution" is the original software, or any additions or changes to the software.
A "contributor" is any person that distributes its contribution under this license.
"Licensed patents" are a contributor's patent claims that read directly on its contribution.

2. Grant of Rights
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.

3. Conditions and Limitations
(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
[MIT License (MIT)](./LICENSE)
6 changes: 3 additions & 3 deletions samples/MetroDemo/ExampleWindows/FlyoutDemo.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<Controls:FlyoutsControl x:Name="flyoutsControl">
<Controls:Flyout x:Name="settingsFlyout"
Controls:ControlsHelper.ContentCharacterCasing="Upper"
Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Controls:MetroWindow}, Path=ActualWidth}"
Margin="100 0 0 0"
Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Controls:FlyoutsControl}, Path=ActualWidth}"
Margin="200 0 0 0"
AreAnimationsEnabled="False"
FocusedElement="{Binding ElementName=firstTB}"
Header="Settings"
Expand Down Expand Up @@ -131,7 +131,7 @@
</Grid>
</Controls:Flyout>

<Controls:Flyout Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Controls:MetroWindow}, Path=ActualWidth, Mode=OneWay}"
<Controls:Flyout Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Controls:FlyoutsControl}, Path=ActualWidth, Mode=OneWay}"
AnimateOpacity="True"
CloseButtonIsCancel="True"
Header="New Goodness"
Expand Down