Merge branch 'master' of github.com:houdiniproject/houdini

This commit is contained in:
Eric Schultz 2018-06-07 11:20:41 -05:00
commit 140a9bc30d

View file

@ -160,15 +160,15 @@ This generator creates a basic Typescript module along with a test file.
**Note: This is not legal advice and provides a suggestion which may be compliant. You should talk with your legal counsel if you have **Note: This is not legal advice and provides a suggestion which may be compliant. You should talk with your legal counsel if you have
questions or concerns with how to comply with the various licenses of Houdini** questions or concerns with how to comply with the various licenses of Houdini**
Providing the complete, corresponding source code (CCS) of your project to comply with the license of Houdini. There are two methods for doing so right now: Providing the complete, corresponding source code (CCS) of your project is a requirement of some of the licensed used by Houdini. There are two methods for doing so right now:
1. Providing a tarball of the current running code 1. Providing a tarball of the current running code
2. Providing a link to Github where the code is pulled from 2. Providing a link to Github where the code is pulled from
The easiest method is to provide a tarball. Houdini automatically provides a link on the Terms & Privacy page. The easiest method is to provide a tarball. Houdini automatically provides a link on the Terms & Privacy page which generates a tarball for the current running code at runtime.
For this to work though, the following characteristics must be true: For this to work though, the following characteristics must be true:
* Your have to have any changes you made to the project in `HEAD` in your git repository * Your have to have committed any changes you made to the project in `HEAD` in your git repository
* The `.git` folder for your repository must be a direct subfolder of your `$RAILS_ROOT` * The `.git` folder for your repository must be a direct subfolder of your `$RAILS_ROOT`
* Your web server must be able to run `git archive`. * Your web server must be able to run `git archive`.
@ -181,6 +181,7 @@ For this to work though, the following characteristics must be true:
#### New frontend code #### New frontend code
- All new front end code should be written in Typescript - All new front end code should be written in Typescript
and React (using TSX files). Please use the React Generators for creation. and React (using TSX files). Please use the React Generators for creation.
- 2 spaces for tabs
#### Legacy Javascript #### Legacy Javascript
- 2 spaces for tabs - 2 spaces for tabs