From 9c9a0d51f3e539381d6d8900ea013b830f5b7806 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 17:04:08 -0700 Subject: [PATCH 01/17] Update LICENSE.txt to Apache 2.0 --- LICENSE.txt | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++ License.txt | 5 -- 2 files changed, 202 insertions(+), 5 deletions(-) create mode 100644 LICENSE.txt delete mode 100644 License.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/License.txt b/License.txt deleted file mode 100644 index 6abd425dd0..0000000000 --- a/License.txt +++ /dev/null @@ -1,5 +0,0 @@ - - -XXXXXX - TODO - -someone needs to update \ No newline at end of file From 2a2f5fb0fd208c9b696bf88a92690216c89267a7 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 17:15:57 -0700 Subject: [PATCH 02/17] Create NOTICES.txt XXXXXX TODO: Replace sample text with references to 3rd party libraries used --- NOTICES.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 NOTICES.txt diff --git a/NOTICES.txt b/NOTICES.txt new file mode 100644 index 0000000000..07c6a8bf4f --- /dev/null +++ b/NOTICES.txt @@ -0,0 +1,4 @@ +Mattermost Platform Preview +Copyright 2015 SpinPunch, Inc. + +Regular expression support is provided by the PCRE library package, which is open source software, written by Philip Hazel, and copyright by the University of Cambridge, England. The original software is available from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ From 1c3c4e9fb929d467decf1d07812c845daf6239f1 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 17:18:39 -0700 Subject: [PATCH 03/17] Rename NOTICES.txt to NOTICE.txt --- NOTICES.txt => NOTICE.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename NOTICES.txt => NOTICE.txt (100%) diff --git a/NOTICES.txt b/NOTICE.txt similarity index 100% rename from NOTICES.txt rename to NOTICE.txt From 555bb6921dca2c843c23c0b5498564d85e93d9ee Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 18:46:05 -0700 Subject: [PATCH 04/17] Update README.md Adding preamble, taking out boiler plate instructions From 0b36f7e5f30d333bdfcdcaa315de359a0fc3265d Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 18:48:43 -0700 Subject: [PATCH 05/17] Update README.md From 143a994136d08fdebc1035077eb6202dc8d3ac93 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 18:56:09 -0700 Subject: [PATCH 06/17] Update README.md From 424e0a6d8f898d5b673c1e3c3981d17ff41c3b7f Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 18:59:45 -0700 Subject: [PATCH 07/17] Update README.md From 636f43cec45c731741f4c853e09b769250846e00 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 19:03:00 -0700 Subject: [PATCH 08/17] Update README.md From d42d0e89d2382ba568792964e3955d1823a9c4a1 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 19:07:36 -0700 Subject: [PATCH 09/17] Fix typo, "ip" should be "IP" From 0b5a37a3e65048dfffab02d0b269cc36d07fe125 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 19:11:58 -0700 Subject: [PATCH 10/17] Update README.md From 568ed3a8b35dade28aed249c37409a1929c093bd Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 19:12:35 -0700 Subject: [PATCH 11/17] Update README.md From 789c52d381ccfb3eaf607c162a742daf97e8ba97 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 15 Jun 2015 19:15:10 -0700 Subject: [PATCH 12/17] Update README.md From 29a25a2c832873bee5f5b0fb411622c77fa544ee Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 16 Jun 2015 05:22:44 -0700 Subject: [PATCH 13/17] More caveats in README.md From 804223c51dde41b2f30a0772094a94fc2cce8859 Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 16 Jun 2015 07:57:54 -0700 Subject: [PATCH 14/17] Update README.md From 89896e69ff5a35ede425a14b33c84a190a8f8d8e Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 16 Jun 2015 08:24:55 -0700 Subject: [PATCH 15/17] Reducing number of steps in Mattermost Setup From 6dd39393c42c36de26ff3ed13779cb069b0dee58 Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 16 Jun 2015 08:28:56 -0700 Subject: [PATCH 16/17] Update README.md From 594850d8e34d52bc0c985fdeea538a7f377df247 Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 16 Jun 2015 08:40:45 -0700 Subject: [PATCH 17/17] Update README.md