diff --git a/Install/agreement.html b/Install/agreement.html index 546052b6a1a3d64593597b8a8b891de74f6403d0..55c4a7b3cc91e17b3c101f3e8233fbe1d6a98635 100755 --- a/Install/agreement.html +++ b/Install/agreement.html @@ -43,62 +43,19 @@

安装协议

- 版权所有 (c) 2014-至今,ShopXO保留所有权利。
- - 感谢您选择ShopXO产品。希望我们的努力能为您提供一个高效快速、强大的企业级电商系统解决方案,ShopXO网址为 http://shopxo.net

- - 用户须知:本协议是您与ShopXO之间关于您使用ShopXO提供的各种软件产品及服务的法律协议。无论您是个人或组织、盈利与否、用途如何(包括以学习和研究为目的),均需仔细阅读本协议,包括免除或者限制ShopXO责任的免责条款及对您的权利限制。请您审阅并接受或不接受本服务条款。如您不同意本服务条款及/或ShopXO随时对其的修改,您应不使用或主动取消ShopXO提供的ShopXO产品。否则,您的任何对ShopXO产品中的相关服务的注册、登陆、下载、查看等使用行为将被视为您对本服务条款全部的完全接受,包括接受ShopXO对服务条款随时所做的任何修改。

- - 本服务条款一旦发生变更, ShopXO将在网页上公布修改内容。修改后的服务条款一旦在网站管理后台上公布即有效代替原来的服务条款。您可随时登陆ShopXO官方论坛查阅最新版服务条款。如果您选择接受本条款,即表示您同意接受协议各项条件的约束。如果您不同意本服务条款,则不能获得使用本服务的权利。您若有违反本条款规定,ShopXO有权随时中止或终止您对ShopXO产品的使用资格并保留追究相关法律责任的权利。

- - 在理解、同意、并遵守本协议的全部条款后,方可开始使用ShopXO产品。您可能与ShopXO直接签订另一书面协议,以补充或者取代本协议的全部或者任何部分。

- - ShopXO拥有本软件的全部知识产权。本软件只供许可协议,并非出售。ShopXO只允许您在遵守本协议各项条款的情况下复制、下载、安装、使用或者以其他方式受益于本软件的功能或者知识产权。

- - I. 协议许可的权利

- - 您可以在完全遵守本许可协议的基础上,将本软件应用于非商业用途,而不必支付软件版权许可费用。

- - 您可以在协议规定的约束和限制范围内修改ShopXO产品源代码(如果被提供的话)或界面风格以适应您的网站要求。

- - 您拥有使用本软件构建的网站中全部会员资料、文章及相关信息的所有权,并独立承担与使用本软件构建的网站内容的审核、注意义务,确保其不侵犯任何人的合法权益,独立承担因使用ShopXO软件和服务带来的全部责任,若造成ShopXO或用户损失的,您应予以全部赔偿。

- - 若您需将ShopXO软件或服务用户商业用途,必须另行获得ShopXO的书面许可,您在获得商业授权之后,您可以将本软件应用于商业用途,同时依据所购买的授权类型中确定的技术支持期限、技术支持方式和技术支持内容,自购买时刻起,在技术支持期限内拥有通过指定的方式获得指定范围内的技术支持服务。商业授权用户享有反映和提出意见的权力,相关意见将被作为首要考虑,但没有一定被采纳的承诺或保证。

- - 您可以从ShopXO提供的应用中心服务中下载适合您网站的应用程序,但应向应用程序开发者/所有者支付相应的费用。 - II. 协议规定的约束和限制

- - 未获ShopXO书面商业授权之前,不得将本软件用于商业用途(包括但不限于企业网站、经营性网站、以营利为目或实现盈利的网站)。购买商业授权请登陆http://shopxo.net参考相关说明。

- - 不得对本软件或与之关联的商业授权进行出租、出售、抵押或发放子许可证。

- - 无论如何,即无论用途如何、是否经过修改或美化、修改程度如何,只要使用ShopXO产品的整体或任何部分,未经书面许可,页面页脚处的ShopXO产品名称和ShopXO下属网站(http://shopxo.net、或 http://gong.gg 的链接都必须保留,而不能清除或修改。

- - 禁止在ShopXO产品的整体或任何部分基础上以发展任何派生版本、修改版本或第三方版本用于重新分发。

- - 您从应用中心下载的应用程序,未经应用程序开发者/所有者的书面许可,不得对其进行反向工程、反向汇编、反向编译等,不得擅自复制、修改、链接、转载、汇编、发表、出版、发展与之有关的衍生产品、作品等。

- - 如果您未能遵守本协议的条款,您的授权将被终止,所许可的权利将被收回,同时您应承担相应法律责任。 - III. 有限担保和免责声明

- - 本软件及所附带的文件是作为不提供任何明确的或隐含的赔偿或担保的形式提供的。

- - 用户出于自愿而使用本软件,您必须了解使用本软件的风险,在尚未购买产品技术服务之前,我们不承诺提供任何形式的技术支持、使用担保,也不承担任何因使用本软件而产生问题的相关责任。

- - ShopXO不对使用本软件构建的网站中或者论坛中的文章或信息承担责任,全部责任由您自行承担。

- - ShopXO无法全面监控由第三方上传至应用中心的应用程序,因此不保证应用程序的合法性、安全性、完整性、真实性或品质等;您从应用中心下载应用程序时,同意自行判断并承担所有风险,而不依赖于ShopXO。但在任何情况下,ShopXO有权依法停止应用中心服务并采取相应行动,包括但不限于对于相关应用程序进行卸载,暂停服务的全部或部分,保存有关记录,并向有关机关报告。由此对您及第三人可能造成的损失,ShopXO不承担任何直接、间接或者连带的责任。

- - ShopXO对ShopXO提供的软件和服务之及时性、安全性、准确性不作担保,由于不可抗力因素、ShopXO无法控制的因素(包括黑客攻击、停断电等)等造成软件使用和服务中止或终止,而给您造成损失的,您同意放弃追究ShopXO责任的全部权利。 6.ShopXO特别提请您注意,ShopXO为了保障公司业务发展和调整的自主权,ShopXO拥有随时经或未经事先通知而修改服务内容、中止或终止部分或全部软件使用和服务的权利,修改会公布于ShopXO网站相关页面上,一经公布视为通知。

ShopXO行使修改或中止、终止部分或全部软件使用和服务的权利而造成损失的,ShopXO不需对您或任何第三方负责。 - 有关ShopXO产品最终用户授权协议、商业授权与技术服务的详细内容,均由ShopXO独家提供。ShopXO拥有在不事先通知的情况下,修改授权协议和服务价目表的权利,修改后的协议或价目表对自改变之日起的新授权用户生效。

- - 一旦您开始安装ShopXO产品,即被视为完全理解并接受本协议的各项条款,在享有上述条款授予的权利的同时,受到相关的约束和限制。协议许可范围以外的行为,将直接违反本授权协议并构成侵权,我们有权随时终止授权,责令停止损害,并保留追究相关责任的权力。

- - 本许可协议条款的解释,效力及纠纷的解决,适用于中华人民共和国大陆法律。

- - 若您和ShopXO之间发生任何纠纷或争议,首先应友好协商解决,协商不成的,您在此完全同意将纠纷或争议提交ShopXO所在地上海市浦东新区人民法院管辖。ShopXO拥有对以上各项条款内容的解释权及修改权。

- - (正文完)
+

diff --git a/Install/static/css/install.css b/Install/static/css/install.css index c68129a99222a9023794b89bc949cca5b32ed57e..51325e8cf03ceb470a55f2891b2659a213d6bc2c 100755 --- a/Install/static/css/install.css +++ b/Install/static/css/install.css @@ -150,4 +150,19 @@ h2 { #out table tr:not(.yes) td { background: #ffbdb7; color: #f00; +} +.agreement ul { + padding: 0; + margin: 0; +} +.agreement ul li:not(.title) { + font-size: 14px; + line-height: 20px; + margin-bottom: 15px; + color: #777; +} +.agreement ul li.title { + font-size: 18px; + font-weight: 500; + margin: 30px 0 10px 0; } \ No newline at end of file diff --git a/Install/test.html b/Install/test.html index e66f6d57e4dfab8be2af8330d17d1ee1089331aa..301d5e0d82ab8908d6d23b4df8bb79c1c4343aa0 100755 --- a/Install/test.html +++ b/Install/test.html @@ -68,12 +68,12 @@ function TestClick(){ - + PHP版本 - >=5.4 + >=5.6 - =7) || ($php_version['0']>=5 && $php_version['1']>=4)): ?> + =7) || ($php_version['0']>=5 && $php_version['1']>=6)): ?> √ × diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + 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/README.md b/README.md index bea1cc12d358c84f4a50748925236c19bab74d94..4fd7a5207c03b515d13182fb577d1672f6901d83 100755 --- a/README.md +++ b/README.md @@ -190,8 +190,8 @@ shopxo # 如何贡献 非常欢迎您对ShopXO的开发作出贡献! 你可以选择以下方式向ShopXO贡献: -- 1.[Github - 发布issue进行问题反馈和建议](https://github.com/gongfuxiang/shopxo/pulls) -- 2.[码云/开源中国 - 发布issue进行问题反馈和建议](https://gitee.com/gongfuxiang/shopxo/pulls) +- [Github - 发布issue进行问题反馈和建议](https://github.com/gongfuxiang/shopxo/pulls) +- [码云/开源中国 - 发布issue进行问题反馈和建议](https://gitee.com/gongfuxiang/shopxo/pulls) - 通过Pull Request提交修复 - 完善我们的文档和例子