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.

Sign up for GitHub

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

Jump to bottom

docs: Updates issue and pull request templates #40

Merged
merged 1 commit into from
Jul 23, 2019
Merged

docs: Updates issue and pull request templates #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 23 additions & 23 deletions .releaser/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ORY Hydra
ORY Hive
Copyright (c) 2019 ORY GmbH

*** END USER LICENSE AGREEMENT ***
Expand All @@ -7,58 +7,58 @@ IMPORTANT: PLEASE READ THIS LICENSE CAREFULLY BEFORE USING THIS SOFTWARE.

1. LICENSE

By receiving, opening the file package, and/or using ORY Hydra ("Software") containing this software, you agree that
By receiving, opening the file package, and/or using ORY Hive ("Software") containing this software, you agree that
this End User User License Agreement(EULA) is a legally binding and valid contract and agree to be bound by it.
You agree to abide by the intellectual property laws and all of the terms and conditions of this Agreement.

Unless you have a different license agreement signed by ORY GmbH your use of ORY Hydra indicates
Unless you have a different license agreement signed by ORY GmbH your use of ORY Hive indicates
your acceptance of this license agreement and warranty.

Subject to the terms of this Agreement, ORY GmbH grants to you a limited, non-exclusive, non-transferable
license, without right to sub-license, to use ORY Hydra in accordance with this Agreement and any other written
agreement with ORY GmbH. ORY GmbH does not transfer the title of ORY Hydra to you; the license granted to you is not a
sale. This agreement is a binding legal agreement between ORY GmbH and the purchasers or users of ORY Hydra.
license, without right to sub-license, to use ORY Hive in accordance with this Agreement and any other written
agreement with ORY GmbH. ORY GmbH does not transfer the title of ORY Hive to you; the license granted to you is not a
sale. This agreement is a binding legal agreement between ORY GmbH and the purchasers or users of ORY Hive.

If you do not agree to be bound by this agreement, remove ORY Hydra from your computer now and, if applicable,
promptly return to ORY GmbH by mail any copies of ORY Hydra and related documentation and packaging in your possession.
If you do not agree to be bound by this agreement, remove ORY Hive from your computer now and, if applicable,
promptly return to ORY GmbH by mail any copies of ORY Hive and related documentation and packaging in your possession.

2. DISTRIBUTION

ORY Hydra and the license herein granted shall not be copied, shared, distributed, re-sold, offered for re-sale,
ORY Hive and the license herein granted shall not be copied, shared, distributed, re-sold, offered for re-sale,
transferred or sub-licensed in whole or in part except that you may make one copy for archive purposes only. For
information about redistribution of ORY Hydra contact ORY GmbH.
information about redistribution of ORY Hive contact ORY GmbH.

3. USER AGREEMENT

3.1 Use

Your license to use ORY Hydra is limited to the number of licenses purchased by you. You shall not allow others to use,
copy or evaluate copies of ORY Hydra.
Your license to use ORY Hive is limited to the number of licenses purchased by you. You shall not allow others to use,
copy or evaluate copies of ORY Hive.

3.2 Use Restrictions

You shall use ORY Hydra in compliance with all applicable laws and not for any unlawful purpose. Without limiting the
foregoing, use, display or distribution of ORY Hydra together with material that is pornographic, racist, vulgar,
You shall use ORY Hive in compliance with all applicable laws and not for any unlawful purpose. Without limiting the
foregoing, use, display or distribution of ORY Hive together with material that is pornographic, racist, vulgar,
obscene, defamatory, libelous, abusive, promoting hatred, discriminating or displaying prejudice based on religion,
ethnic heritage, race, sexual orientation or age is strictly prohibited.

Each licensed copy of ORY Hydra may be used on one single computer location by one user. Use of ORY Hydra means that you have loaded, installed, or run ORY Hydra on a computer or similar device. If you install ORY Hydra onto a multi-user platform, server or network, each and every individual user of ORY Hydra must be licensed separately.
Each licensed copy of ORY Hive may be used on one single computer location by one user. Use of ORY Hive means that you have loaded, installed, or run ORY Hive on a computer or similar device. If you install ORY Hive onto a multi-user platform, server or network, each and every individual user of ORY Hive must be licensed separately.

You may make one copy of ORY Hydra for backup purposes, providing you only have one copy installed on one computer being used by one person. Other users may not use your copy of ORY Hydra . The assignment, sublicense, networking, sale, or distribution of copies of ORY Hydra are strictly forbidden without the prior written consent of ORY GmbH. It is a violation of this agreement to assign, sell, share, loan, rent, lease, borrow, network or transfer the use of ORY Hydra. If any person other than yourself uses ORY Hydra registered in your name, regardless of whether it is at the same time or different times, then this agreement is being violated and you are responsible for that violation!
You may make one copy of ORY Hive for backup purposes, providing you only have one copy installed on one computer being used by one person. Other users may not use your copy of ORY Hive . The assignment, sublicense, networking, sale, or distribution of copies of ORY Hive are strictly forbidden without the prior written consent of ORY GmbH. It is a violation of this agreement to assign, sell, share, loan, rent, lease, borrow, network or transfer the use of ORY Hive. If any person other than yourself uses ORY Hive registered in your name, regardless of whether it is at the same time or different times, then this agreement is being violated and you are responsible for that violation!

3.3 Copyright Restriction

This Software contains copyrighted material, trade secrets and other proprietary material. You shall not, and shall not attempt to, modify, reverse engineer, disassemble or decompile ORY Hydra. Nor can you create any derivative works or other works that are based upon or derived from ORY Hydra in whole or in part.
This Software contains copyrighted material, trade secrets and other proprietary material. You shall not, and shall not attempt to, modify, reverse engineer, disassemble or decompile ORY Hive. Nor can you create any derivative works or other works that are based upon or derived from ORY Hive in whole or in part.

ORY GmbH's name, logo and graphics file that represents ORY Hydra shall not be used in any way to promote products developed with ORY Hydra . ORY GmbH retains sole and exclusive ownership of all right, title and interest in and to ORY Hydra and all Intellectual Property rights relating thereto.
ORY GmbH's name, logo and graphics file that represents ORY Hive shall not be used in any way to promote products developed with ORY Hive . ORY GmbH retains sole and exclusive ownership of all right, title and interest in and to ORY Hive and all Intellectual Property rights relating thereto.

Copyright law and international copyright treaty provisions protect all parts of ORY Hydra, products and services. No program, code, part, image, audio sample, or text may be copied or used in any way by the user except as intended within the bounds of the single user program. All rights not expressly granted hereunder are reserved for ORY GmbH.
Copyright law and international copyright treaty provisions protect all parts of ORY Hive, products and services. No program, code, part, image, audio sample, or text may be copied or used in any way by the user except as intended within the bounds of the single user program. All rights not expressly granted hereunder are reserved for ORY GmbH.

3.4 Limitation of Responsibility

You will indemnify, hold harmless, and defend ORY GmbH , its employees, agents and distributors against any and all claims, proceedings, demand and costs resulting from or in any way connected with your use of ORY GmbH's Software.

In no event (including, without limitation, in the event of negligence) will ORY GmbH , its employees, agents or distributors be liable for any consequential, incidental, indirect, special or punitive damages whatsoever (including, without limitation, damages for loss of profits, loss of use, business interruption, loss of information or data, or pecuniary loss), in connection with or arising out of or related to this Agreement, ORY Hydra or the use or inability to use ORY Hydra or the furnishing, performance or use of any other matters hereunder whether based upon contract, tort or any other theory including negligence.
In no event (including, without limitation, in the event of negligence) will ORY GmbH , its employees, agents or distributors be liable for any consequential, incidental, indirect, special or punitive damages whatsoever (including, without limitation, damages for loss of profits, loss of use, business interruption, loss of information or data, or pecuniary loss), in connection with or arising out of or related to this Agreement, ORY Hive or the use or inability to use ORY Hive or the furnishing, performance or use of any other matters hereunder whether based upon contract, tort or any other theory including negligence.

ORY GmbH's entire liability, without exception, is limited to the customers' reimbursement of the purchase price of the Software (maximum being the lesser of the amount paid by you and the suggested retail price as listed by ORY GmbH ) in exchange for the return of the product, all copies, registration papers and manuals, and all materials that constitute a transfer of license from the customer back to ORY GmbH.

Expand All @@ -72,13 +72,13 @@ This Agreement shall be governed by the law of the Germany applicable therein. Y

3.7 Termination

Any failure to comply with the terms and conditions of this Agreement will result in automatic and immediate termination of this license. Upon termination of this license granted herein for any reason, you agree to immediately cease use of ORY Hydra and destroy all copies of ORY Hydra supplied under this Agreement. The financial obligations incurred by you shall survive the expiration or termination of this license.
Any failure to comply with the terms and conditions of this Agreement will result in automatic and immediate termination of this license. Upon termination of this license granted herein for any reason, you agree to immediately cease use of ORY Hive and destroy all copies of ORY Hive supplied under this Agreement. The financial obligations incurred by you shall survive the expiration or termination of this license.

4. DISCLAIMER OF WARRANTY

THIS SOFTWARE AND THE ACCOMPANYING FILES ARE SOLD "AS IS" AND WITHOUT WARRANTIES AS TO PERFORMANCE OR MERCHANTABILITY OR ANY OTHER WARRANTIES WHETHER EXPRESSED OR IMPLIED. THIS DISCLAIMER CONCERNS ALL FILES GENERATED AND EDITED BY ORY Hydra AS WELL.
THIS SOFTWARE AND THE ACCOMPANYING FILES ARE SOLD "AS IS" AND WITHOUT WARRANTIES AS TO PERFORMANCE OR MERCHANTABILITY OR ANY OTHER WARRANTIES WHETHER EXPRESSED OR IMPLIED. THIS DISCLAIMER CONCERNS ALL FILES GENERATED AND EDITED BY ORY Hive AS WELL.

5. CONSENT OF USE OF DATA

You agree that ORY GmbH may collect and use information gathered in any manner as part of the product support services provided to you, if any, related to ORY Hydra.ORY GmbH may also use this information to provide notices to you which may be of use or interest to you.
You agree that ORY GmbH may collect and use information gathered in any manner as part of the product support services provided to you, if any, related to ORY Hive.ORY GmbH may also use this information to provide notices to you which may be of use or interest to you.

12 changes: 6 additions & 6 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to ORY Hydra
# Contributing to ORY Hive

<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
Expand All @@ -16,22 +16,22 @@

## Introduction

Please note: We take ORY Hydra's security and our users' trust very seriously. If you believe you have found a
security issue in ORY Hydra, please responsibly disclose by contacting us at [email protected].
Please note: We take ORY Hive's security and our users' trust very seriously. If you believe you have found a
security issue in ORY Hive, please responsibly disclose by contacting us at [email protected].

First: if you're unsure or afraid of anything, just ask or submit the issue or pull request anyways. You won't be
yelled at for giving it your best effort. The worst that can happen is that you'll be politely asked to change
something. We appreciate any sort of contributions, and don't want a wall of rules to get in the way of that.

That said, if you want to ensure that a pull request is likely to be merged, talk to us! You can find out our thoughts
and ensure that your contribution won't clash or be obviated by ORY Hydra's normal direction. A great way to do this is via
and ensure that your contribution won't clash or be obviated by ORY Hive's normal direction. A great way to do this is via
the [ORY Community](https://community.ory.sh/) or join the [ORY Chat](https://www.ory.sh/chat).

## Contributing Code

Unless you are fixing a known bug, we **strongly** recommend discussing it with the core team via a GitHub issue or
[in our chat](https://www.ory.sh/chat) before getting started to ensure your work is consistent with
ORY Hydra's roadmap and architecture.
ORY Hive's roadmap and architecture.

All contributions are made via pull request. Note that **all patches from all contributors get reviewed**. After a pull
request is made other contributors will offer feedback, and if the patch passes review a maintainer will accept it with
Expand Down Expand Up @@ -87,7 +87,7 @@ we've got your back.
behavior that excludes people in socially marginalized groups.
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or
made uncomfortable by a community member, please contact one of the channel ops or a member of the ORY
Hydra core team immediately.
Hive core team immediately.
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.

We welcome discussion about creating a welcoming, safe, and productive environment for the community. If you have any questions, feedback, or concerns [please let us know](https://www.ory.sh/chat).