From e11daa0867ea6fdf75fb1a793d4338fd03f52db1 Mon Sep 17 00:00:00 2001 From: Zero Date: Mon, 30 Nov 2020 09:52:25 +0800 Subject: [PATCH 1/3] Update LICENSE --- LICENSE | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index cb4b563c0..0b9ce01e4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,44 @@ +FlowLauncher are licensed under the terms of the MIT license, reproduced below. + + +A. HISTORY OF THE SOFTWARE +========================== + +- Copyright (c) 2015-2019 Wox. All rights reserved. +- Copyright (c) 2019-2020+ Flow-Launcher. All rights reserved. + + +B. FlowLauncher LICENSE +========================== + The MIT License (MIT) -Copyright (c) 2015 Wox +Copyright (c) 2019-2020+ Flow-Launcher. All rights reserved. + +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. + + +C. Wox LICENSE +========================== + +The MIT License (MIT) + +Copyright (c) 2020 Wox https://github.com/Wox-launcher/Wox 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 From 42f8bbe6972db523540ddd74a63533ba3b9250fc Mon Sep 17 00:00:00 2001 From: Zero Date: Sun, 6 Dec 2020 19:18:57 +0800 Subject: [PATCH 2/3] Update LICENSE --- LICENSE | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 0b9ce01e4..b4ba8d542 100644 --- a/LICENSE +++ b/LICENSE @@ -4,8 +4,15 @@ FlowLauncher are licensed under the terms of the MIT license, reproduced below. A. HISTORY OF THE SOFTWARE ========================== -- Copyright (c) 2015-2019 Wox. All rights reserved. -- Copyright (c) 2019-2020+ Flow-Launcher. All rights reserved. +- Copyright (c) 2015-2019 Wox +- Copyright (c) 2019-2020+ Flow-Launcher + +Flow's roots came from a rebrand of the JJW24/Wox fork and WoX. +A big thank you and all credits to Bao, the author of WoX, +and its contrbutors for all the amazing work. +The JJW24/Wox fork started adding new changes on top of +main WoX repo's code base from release v1.3.524. +Flow is a continuation of the work from JJW24/Wox B. FlowLauncher LICENSE @@ -13,7 +20,7 @@ B. FlowLauncher LICENSE The MIT License (MIT) -Copyright (c) 2019-2020+ Flow-Launcher. All rights reserved. +Copyright (c) 2019-2020+ Flow-Launcher 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 @@ -38,7 +45,7 @@ C. Wox LICENSE The MIT License (MIT) -Copyright (c) 2020 Wox https://github.com/Wox-launcher/Wox +Copyright (c) 2015 Wox 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 From 006eac23d4ddad8d6a7ac7ba21d0c9bd3f06862f Mon Sep 17 00:00:00 2001 From: Zero Date: Tue, 15 Dec 2020 20:36:03 +0800 Subject: [PATCH 3/3] :page_facing_up: wox -> flow, update owner --- LICENSE | 46 +--------------------------------------------- README.md | 7 ------- attribution.md | 6 ++++++ 3 files changed, 7 insertions(+), 52 deletions(-) create mode 100644 attribution.md diff --git a/LICENSE b/LICENSE index b4ba8d542..8be14c31d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,50 +1,6 @@ -FlowLauncher are licensed under the terms of the MIT license, reproduced below. - - -A. HISTORY OF THE SOFTWARE -========================== - -- Copyright (c) 2015-2019 Wox -- Copyright (c) 2019-2020+ Flow-Launcher - -Flow's roots came from a rebrand of the JJW24/Wox fork and WoX. -A big thank you and all credits to Bao, the author of WoX, -and its contrbutors for all the amazing work. -The JJW24/Wox fork started adding new changes on top of -main WoX repo's code base from release v1.3.524. -Flow is a continuation of the work from JJW24/Wox - - -B. FlowLauncher LICENSE -========================== - -The MIT License (MIT) - -Copyright (c) 2019-2020+ Flow-Launcher - -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. - - -C. Wox LICENSE -========================== - The MIT License (MIT) +Copyright (c) 2019 Flow-Launcher Copyright (c) 2015 Wox Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/README.md b/README.md index 206f3f7d9..f0c08d8a0 100644 --- a/README.md +++ b/README.md @@ -80,10 +80,3 @@ Install .Net Core 3.1 SDK via Visual Studio installer or manually from [here](ht ## Documentation [Wiki](https://github.com/Flow-Launcher/Flow.Launcher/wiki) - -## A history of the flow -Flow's roots came from a rebrand of the [JJW24/Wox fork](https://github.com/jjw24/Wox/issues/156) and WoX. - -A big thank you and all credits to [Bao](https://github.com/bao-qian), the author of WoX, and its contrbutors for all the amazing work. - -The JJW24/Wox fork started adding new changes on top of main WoX repo's code base from release v1.3.524. Flow is a continuation of the work from JJW24/Wox diff --git a/attribution.md b/attribution.md new file mode 100644 index 000000000..c47542d6a --- /dev/null +++ b/attribution.md @@ -0,0 +1,6 @@ +Flow's roots came from a rebrand of the [JJW24/Wox fork](https://github.com/jjw24/Wox/issues/156) and [WoX](https://github.com/Wox-launcher/Wox). + +A big thank you and all credits to [Bao](https://github.com/bao-qian), the author of WoX, and its contributors for all the amazing work. + +The JJW24/Wox fork started adding new changes on top of main WoX repo's code base from release v1.3.524. +Flow is a continuation of the work from JJW24/Wox.