Merge remote-tracking branch 'upstream/master' into origin/module-loa…

…der-only-js
bonanzakrak · Feb 24, 2017 · c3b26fa · c3b26fa
2 parents dcd64e1 + 61fe89b
commit c3b26fa
Show file tree

Hide file tree

Showing 98 changed files with 5,399 additions and 2,506 deletions.
diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
@@ -2,17 +2,18 @@
 ======================================================
 HELLO, and welcome to the (experimental) Sailsbot
 issue-submission system.  If you encounter any
-problems with this system, please contact
-[email protected]
+problems with this system, please contact us directly
+at http://sailsjs.com/contact.
 
-FIRST THINGS FIRST: before posting, please carefully 
-read the contribution guide (http://bit.ly/sails-issue-guide), 
-particularly if this is a security issue or an issue of a 
+FIRST THINGS FIRST: before posting, please carefully
+read the contribution guide (http://bit.ly/sails-issue-guide),
+particularly if this is a security issue or an issue of a
 non-technical nature (Github org issues, code of conduct
-issues, etc.).  Those should be sent directly to [email protected].
+issues, etc.).  Those should be sent directly at
+http://sailsjs.com/contact.
 
-NOW THEN: please fill out the following info 
-(Don't change text between **) 
+NOW THEN: please fill out the following info
+(Don't change text between **)
 ======================================================
 ### BEGIN VERSION INFO ###
 -->
@@ -22,19 +23,19 @@ NOW THEN: please fill out the following info
 **NPM version**:
 **Operating system**:
 
-<!-- 
+<!--
 ### END VERSION INFO ###
 ======================================================
-GREAT! - Now read carefully 
-(Sailsbot will know if you don't)!  
+GREAT! - Now read carefully
+(Sailsbot will know if you don't)!
 ======================================================
 
 Before you submit an issue for Sails, please make sure you have read the issue contribution guide (http://bit.ly/sails-issue-guide) carefully, and then verify the following by typing an X in between each set of [ ] brackets below (don't make any other changes to the text!):
 
 ### BEGIN PLEDGE ###
 - [ ] I am experiencing a concrete technical issue (aka a bug) with Sails (ideas and feature proposals should follow the guide for proposing features and enhancements (http://bit.ly/sails-feature-guide), which involves making a pull request).  If you're not 100% certain whether it's a bug or not, that's okay--you may continue.  The worst that can happen is that the issue will be closed and we'll point you in the right direction.
 
-- [ ] I am not asking a question about how to use Sails or about whether or not Sails has a certain feature (please refer to the documentation(http://sailsjs.org), or post on http://stackoverflow.com, our Google Group (http://bit.ly/sails-google-group) or our live chat (https://gitter.im/balderdashy/sails).
+- [ ] I am not asking a question about how to use Sails or about whether or not Sails has a certain feature (please refer to the documentation(http://sailsjs.com), or post on http://stackoverflow.com, our Google Group (http://bit.ly/sails-google-group) or our live chat (https://gitter.im/balderdashy/sails).
 
 - [ ] I have already searched for related issues, and found none open (if you found a related _closed_ issue, please link to it in your post).
 

diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
@@ -1,11 +1,11 @@
-<!-- 
+<!--
 ======================================================
 HELLO, and welcome to the (experimental) Sailsbot
 pr-submission system.  If you encounter any
-problems with this system, please contact
-[email protected]
+problems with this system, please contact us directly
+at http://sailsjs.com/contact.
 
-IMPORTANT - Read Carefully (Sailsbot will know if you don't)!  
+IMPORTANT - Read Carefully (Sailsbot will know if you don't)!
 ======================================================
 
 Before submitting a pull request for a new feature request, pretty-please read the Sails contribution guide section on proposing features and enhancements: http://bit.ly/sails-feature-guide.
@@ -20,7 +20,7 @@ If after all that, you're still ready to make a pull request, make sure that you
 [implements #<another PR number>]
 [fixes #<an issue number>]
 
-For example: 
+For example:
 [proposal] Add a Kraken to the `sails lift` sailboat image
 [implements #123] Adds Kraken to sailboat
 [patch] Fix the shading on the Kraken's tentacles

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,6 +73,10 @@ Sails v1.0 comes with a host of new features and improvements as well as some br
 * [REMOVAL] Removed deprecated `connect-flash` middleware [c5c4900](https://github.com/balderdashy/sails/commit/c5c49007f9d55ed74b3ca3062b465c470a15e82b)
 * [REMOVAL] Removed 16 unused dependencies (see full list [here](https://gist.github.com/sgress454/4a4930fec3520b24bdf0df552f70a45c))
 
+> Also see the [Waterline changelog](https://github.com/balderdashy/waterline/blob/a7cad817e831af5367be2d2c89c021d12a674b86/CHANGELOG.md#edge).
+
+
+
 ### 0.12.11
 
 * [BUGFIX] fix typo in error message (see https://github.com/balderdashy/sails/pull/3902)  Thanks [Johnny](https://github.com/Hiro-Nakamura) and [@appdevdesigns](https://github.com/appdevdesigns)!

diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md
@@ -1 +1 @@
-> The Code of Conduct now lives in the 'Contributing' section of the documentation: [https://github.com/balderdashy/sails-docs/tree/master/contributing/code-of-conduct.md](https://github.com/balderdashy/sails-docs/tree/master/contributing/code-of-conduct.md)
+> The Code of Conduct now lives in the 'Contributing' section of the documentation: [http://sailsjs.com/documentation/contributing/code-of-conduct](http://sailsjs.com/documentation/contributing/code-of-conduct)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1 +1 @@
-> The Contribution guide now lives in the 'Contributing' section of the documentation: [sailsjs.com/contribute](http://sailsjs.com/contribute)
+> The Contribution guide now lives in the 'Contributing' section of the documentation: [sailsjs.com/documentation/contributing](http://sailsjs.com/documentation/contributing)
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 --
 
-Copyright © 2012-2016 Mike McNeil & Balderdash Design Co.
+Copyright © 2012-2017 Mike McNeil, Balderdash Design Co., & The Sails Company
 
 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:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		> The Code of Conduct now lives in the 'Contributing' section of the documentation: [https://github.com/balderdashy/sails-docs/tree/master/contributing/code-of-conduct.md](https://github.com/balderdashy/sails-docs/tree/master/contributing/code-of-conduct.md)
		> The Code of Conduct now lives in the 'Contributing' section of the documentation: [http://sailsjs.com/documentation/contributing/code-of-conduct](http://sailsjs.com/documentation/contributing/code-of-conduct)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		> The Contribution guide now lives in the 'Contributing' section of the documentation: [sailsjs.com/contribute](http://sailsjs.com/contribute)
		> The Contribution guide now lives in the 'Contributing' section of the documentation: [sailsjs.com/documentation/contributing](http://sailsjs.com/documentation/contributing)