Permalink
Browse files

Updates for 2017

1 parent 4b404a0 commit 50516a40ddd9dc5a2464f042bb3487f8a26ba773 @mikermcneil mikermcneil committed Jan 1, 2017
@@ -2,17 +2,18 @@
======================================================
HELLO, and welcome to the (experimental) Sailsbot
issue-submission system. If you encounter any
-problems with this system, please contact
-sgress454@treeline.io
+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 inquiries@treeline.io.
+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).
@@ -1,11 +1,11 @@
-<!--
+<!--
======================================================
HELLO, and welcome to the (experimental) Sailsbot
pr-submission system. If you encounter any
-problems with this system, please contact
-sgress454@treeline.io
+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
View
@@ -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:
View
@@ -1,8 +1,8 @@
<h1>
-<a href="http://sailsjs.org"><img alt="Sails.js logo" src="http://balderdashy.github.io/sails/images/logo.png" title="Sails.js"/></a>
+<a href="http://sailsjs.com"><img alt="Sails.js logo" src="http://balderdashy.github.io/sails/images/logo.png" title="Sails.js"/></a>
</h1>
-### [Website](http://sailsjs.org/) &nbsp; [Getting Started](http://sailsjs.org/get-started) &nbsp; [Docs](http://sailsjs.org/documentation) &nbsp; [Blog](http://blog.sailsjs.org/) &nbsp; [Submit Issue](http://sailsjs.com/bugs)
+### [Website](http://sailsjs.com/) &nbsp; [Getting Started](http://sailsjs.com/get-started) &nbsp; [Docs](http://sailsjs.com/documentation) &nbsp; [Blog](http://blog.sailsjs.com/) &nbsp; [Submit Issue](http://sailsjs.com/bugs)
[![NPM version](https://badge.fury.io/js/sails.svg)](http://badge.fury.io/js/sails) &nbsp; [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/balderdashy/sails) &nbsp; [![Twitter Follow](https://img.shields.io/twitter/follow/sailsjs.svg?style=social&maxAge=3600)](https://twitter.com/sailsjs)
@@ -18,7 +18,7 @@ $ npm install sails -g
```
> ######Upgrading from 0.10 or 0.11?
-> The v0.12 release of Sails contains a few breaking changes which affect userland. To read the v0.12 migration guide, click [here](http://sailsjs.org/version-notes/0point12-migration-guide).
+> The v0.12 release of Sails contains a few breaking changes which affect userland. To read the v0.12 migration guide, click [here](http://sailsjs.com/version-notes/0point12-migration-guide).
## Your First Sails Project
@@ -48,7 +48,7 @@ _For a more up-to-date introduction to Sails, check out the [free Platzi course]
Sails is built on [Node.js](http://nodejs.org/), [Connect](http://www.senchalabs.org/connect/), [Express](http://expressjs.com/), and [Socket.io](http://socket.io/).
-Sails [controllers](http://sailsjs.org/documentation/concepts/controllers) are compatible with Connect middleware, so in most cases, you can paste code into Sails from an existing Express project and everything will work-- plus you'll be able to use WebSockets to talk to your API, and vice versa.
+Sails [controllers](http://sailsjs.com/documentation/concepts/controllers) are compatible with Connect middleware, so in most cases, you can paste code into Sails from an existing Express project and everything will work-- plus you'll be able to use WebSockets to talk to your API, and vice versa.
The ORM, [Waterline](https://github.com/balderdashy/waterline), has a well-defined adapter system for supporting all kinds of datastores. Officially supported databases include [MySQL](https://github.com/balderdashy/sails-mysql), [PostgreSQL](https://github.com/balderdashy/sails-postgresql), [MongoDB](https://github.com/balderdashy/sails-mongo), [Redis](https://github.com/balderdashy/sails-redis), local [disk](https://github.com/balderdashy/sails-disk), and local [memory](https://github.com/balderdashy/sails-memory). [Community adapters](https://github.com/balderdashy/sails-docs/blob/master/contributing/intro-to-custom-adapters.md#notable-community-adapters) exist for [CouchDB](https://github.com/search?q=sails+couch&nwo=codeswarm%2Fsails-couchdb-orm&search_target=global&ref=cmdform), [neDB](https://github.com/adityamukho/sails-nedb), [TingoDB](https://github.com/andyhu/sails-tingo), [SQLite](https://github.com/AndrewJo/sails-sqlite3/tree/0.10), [Oracle](https://github.com/search?utf8=%E2%9C%93&q=%22sails+oracle%22+OR+%22waterline+oracle%22&type=Repositories&ref=searchresults), [MSSQL](https://github.com/misterGF/sails-mssqlserver), [DB2](https://github.com/search?q=sails+db2&type=Repositories&ref=searchresults), [ElasticSearch](https://github.com/search?q=%28elasticsearch+AND+sails%29+OR+%28elasticsearch+AND+waterline%29+&type=Repositories&ref=searchresults), [Riak](https://github.com/search?q=sails+riak&type=Repositories&ref=searchresults),
[neo4j](https://www.npmjs.org/package/sails-neo4j), [OrientDB](https://github.com/appscot/sails-orientdb),
@@ -90,8 +90,8 @@ If you have an idea for a new feature, please feel free to submit it as a pull r
## Contribute
There are many different ways you can contribute to Sails:
-- answering questions on [StackOverflow](http://stackoverflow.com/questions/tagged/sails.js), [Gitter](https://gitter.im/balderdashy/sails), [IRC](http://sailsjs.org/support/about-irc), [Facebook](https://www.facebook.com/sailsjs), or [Twitter](https://twitter.com/search?f=tweets&vertical=default&q=%40sailsjs%20OR%20%23sailsjs%20OR%20sails.js%20OR%20sailsjs&src=typd)
-- improving the [documentation](https://github.com/balderdashy/sails-docs#contributing-to-the-docs) or [website](https://github.com/balderdashy/www.sailsjs.org/issues)
+- answering questions on [StackOverflow](http://stackoverflow.com/questions/tagged/sails.js), [Gitter](https://gitter.im/balderdashy/sails), [IRC](http://sailsjs.com/support/about-irc), [Facebook](https://www.facebook.com/sailsjs), or [Twitter](https://twitter.com/search?f=tweets&vertical=default&q=%40sailsjs%20OR%20%23sailsjs%20OR%20sails.js%20OR%20sailsjs&src=typd)
+- improving the [documentation](https://github.com/balderdashy/sails-docs#contributing-to-the-docs) or [website](https://github.com/balderdashy/www.sailsjs.com/issues)
- translating the [documentation](https://github.com/balderdashy/sails-docs/issues/580) to your native language
- writing [tests](https://github.com/balderdashy/sails/blob/master/test/README.md)
- writing a [tutorial](https://github.com/sails101/contribute-to-sails101), giving a [talk](http://lanyrd.com/search/?q=sailsjs), or supporting [your local Sails meetup](http://www.meetup.com/find/?allMeetups=false&keywords=sails.js&radius=Infinity&sort=default)
@@ -102,16 +102,16 @@ Please carefully read our [contribution guide](http://sailsjs.com/contribute) an
## Links
-- [Website](http://sailsjs.org/)
-- [Official Documentation](http://sailsjs.org/documentation)
-- [Blog](http://blog.sailsjs.org)
+- [Website](http://sailsjs.com/)
+- [Official Documentation](http://sailsjs.com/documentation)
+- [Blog](http://blog.sailsjs.com)
- [Twitter](https://twitter.com/sailsjs)
- [Roadmap](http://sailsjs.com/roadmap)
- [Google Group](https://groups.google.com/forum/#!forum/sailsjs)
- [Facebook](https://www.facebook.com/sailsjs)
## Team
-Sails was built and is actively maintained by [Balderdash Design Company](http://balderdash.co) ([@balderdashy](http://twitter.com/balderdashy)) and [The Treeline Company](http://treeline.io) ([@treelinehq](http://twitter.com/treelinehq)), with the help of many other amazing [contributors](https://github.com/balderdashy/sails/graphs/contributors). Our core team consists of:
+Sails is actively maintained by [The Sails Company](http://sailsjs.com) ([@sailsjs](http://twitter.com/sailsjs)), with the help of many other amazing [contributors](https://github.com/balderdashy/sails/graphs/contributors). Our core team consists of:
[![Mike McNeil](http://gravatar.com/avatar/199046437b76e6ca73e00b4cc182a1c5?s=144)](http://twitter.com/mikermcneil) | [![Cody Stoltman](https://1.gravatar.com/avatar/368567acca0c5dfb9a4ff512c5c0c3fa?s=144)](http://twitter.com/particlebanana) | [![Scott Gress](https://0.gravatar.com/avatar/b74e07aa543552709bf546ca279c9c67?s=144)](http://twitter.com/sgress454) | [![Irl Nathan](https://avatars0.githubusercontent.com/u/1598650?v=3&s=144)](http://twitter.com/irlnathan) | [![Rachael Shaw](https://avatars0.githubusercontent.com/u/3065949?v=3&s=144)](http://twitter.com/fancydoilies)
:---:|:---:|:---:|:---:|:---:
@@ -121,8 +121,8 @@ Back in 2012, we were designing/builing scalable Node.js apps for startups and e
## License
-[MIT License](http://sailsjs.com/license) Copyright © 2012-2016 Mike McNeil
+[MIT License](http://sailsjs.com/license) Copyright © 2012-2017 Mike McNeil, Balderdash Design Co., & The Sails Company
> Sails is built around so many great open-source technologies that it would never have crossed our minds to keep it proprietary. We owe huge gratitude and props to TJ Holowaychuk ([@tj](https://github.com/tj)) and Guillermo Rauch ([@rauchg](https://github.com/rauchg)) for the work they've done, as well as the stewards of all the other open-source modules we use. Sails could never have been developed without your tremendous contributions to the node community.
-![image_squidhome@2x.png](http://sailsjs.org/images/bkgd_squiddy.png)
+![image_squidhome@2x.png](http://sailsjs.com/images/bkgd_squiddy.png)
View
@@ -128,7 +128,7 @@
{
- "repoName": "www.sailsjs.org",
+ "repoName": "www.sailsjs.com",
"owner": "balderdashy"
},
{
View
@@ -137,14 +137,14 @@ This section is an early list of some of the features, enhancements, and other i
+ ^^needs tests.
<a name="sails-config-dont-flatten-config-will-be-deprecated"></a>
+ ✓ ~~**The deprecated `sails.config.dontFlattenConfig` will be removed.**~~ _BORN DEPRECATED_
- + The `dontFlattenConfig` setting was [originally added](http://sailsjs.org/documentation/concepts/upgrading/to-v-0-11#?config-files-in-subfolders) for backards-compatibility with what was essentially a bug.
+ + The `dontFlattenConfig` setting was [originally added](http://sailsjs.com/documentation/concepts/upgrading/to-v-0-11#?config-files-in-subfolders) for backards-compatibility with what was essentially a bug.
+ It will be completely removed in Sails v1.0 for simplicity.
<a name="better-built-in-support-for-command-line-scripts-that-require-access-to-the-sails-app-instance"></a>
+ ✓ ~~**Better built-in support for command-line scripts that require access to the Sails app instance**~~
+ https://github.com/treelinehq/machine-as-script/commits/master
<a name="normalize-usage-of-routes-disabled-config-keys"></a>
+ **Normalize usage of `routesDisabled` config keys**
- + Now applies only to sails.config.session: use Sails [route address syntax](http://sailsjs.org/documentation/concepts/routes/custom-routes#?route-address)
+ + Now applies only to sails.config.session: use Sails [route address syntax](http://sailsjs.com/documentation/concepts/routes/custom-routes#?route-address)
<a name="strip-out-deprecated-sockets-methods"></a>
+ ✓ ~~**Strip Out Deprecated Sockets Methods**
+ Remove the implementation of deprecated `sails.sockets.*` methods from Sails core.
@@ -27,7 +27,7 @@ var readReplHistoryAndStartTranscribing = require('./private/read-repl-history-a
* replay commands from past runs)
*
* @stability 3
- * @see http://sailsjs.org/documentation/reference/command-line-interface/sails-console
+ * @see http://sailsjs.com/documentation/reference/command-line-interface/sails-console
* ------------------------------------------------------------------------
* This lifts the Sails app in the current working directory, then uses
* the core `repl` package to spin up an interactive console.
View
@@ -16,7 +16,7 @@ var Sails = require('../lib/app');
* You can then use Node inspector to debug your app as it runs.
*
* @stability 2
- * @see http://sailsjs.org/documentation/reference/command-line-interface/sails-debug
+ * @see http://sailsjs.com/documentation/reference/command-line-interface/sails-debug
*/
module.exports = function() {
var log = CaptainsLog();
View
@@ -24,7 +24,7 @@ var SharedErrorHelpers = require('../errors');
* > 99.9% of the time, is the globally-installed version.)
*
* @stability 3
- * @see http://sailsjs.org/documentation/reference/command-line-interface/sails-lift
+ * @see http://sailsjs.com/documentation/reference/command-line-interface/sails-lift
*/
module.exports = function() {
View
@@ -26,7 +26,7 @@ var rconf = require('../lib/app/configuration/rc')();
* ```
*
* @stability 3
- * @see http://sailsjs.org/documentation/reference/command-line-interface/sails-new
+ * @see http://sailsjs.com/documentation/reference/command-line-interface/sails-new
* ------------------------------------------------------------------------
* This command builds `scope` for the generator by scooping up any available
* configuration using `rc` (merging config from env vars, CLI opts, and
View
@@ -16,7 +16,7 @@ var rconf = require('../lib/app/configuration/rc')();
* Run the `build` or `buildProd` Grunt task (depending on whether this is the production environment)
* for the Sails app in the current working directory.
*
- * @see http://sailsjs.org/documentation/reference/command-line-interface/sails-www
+ * @see http://sailsjs.com/documentation/reference/command-line-interface/sails-www
*/
module.exports = function() {
@@ -21,7 +21,7 @@ module.exports = function inspect () {
return util.format('\n'+
' |> %s', this.toString()) + '\n' +
- '\\___/ For help, see: http://sailsjs.org/documentation/concepts/'+
+ '\\___/ For help, see: http://sailsjs.com/documentation/concepts/'+
'\n\n' +
'Tip: Use `sails.config` to access your app\'s runtime configuration.'+
'\n\n' +
View
@@ -18,7 +18,7 @@ This architecture has allowed for built-in hooks to be overridden or disabled, a
This gave way to hooks becoming a proper plugin system. Nowadays, the goal of hooks is to provide an API that is flexible and powerful enough for plugin developers or folks who need to hack Sails core, but also predictable, documented, and easy to install for end users.
-See http://sailsjs.org/documentation/concepts/extending-sails/hooks for more information.
+See http://sailsjs.com/documentation/concepts/extending-sails/hooks for more information.
> **For historical purposes, here is the original proposal from the v0.9 days:**
@@ -182,7 +182,7 @@ module.exports = function getBuiltInHttpMiddleware (expressRouterMiddleware, sai
// Add powered-by Sails header
poweredBy: function xPoweredBy(req, res, next) {
- res.header('X-Powered-By', 'Sails <sailsjs.org>');
+ res.header('X-Powered-By', 'Sails <sailsjs.com>');
next();
}
@@ -33,7 +33,7 @@ Instantiate a [CaptainsLog](https://github.com/balderdashy/captains-log) logger
##### Expose `sails.log` function
-Publicly expose `sails.log()` function (see http://sailsjs.org/documentation/concepts/logging)
+Publicly expose `sails.log()` function (see http://sailsjs.com/documentation/concepts/logging)
##### Add `sails.log.ship()` method
@@ -1,3 +1,3 @@
# Pubsub (core hook)
-See http://sailsjs.org/documentation/reference/web-sockets/resourceful-pub-sub for more info.
+See http://sailsjs.com/documentation/reference/web-sockets/resourceful-pub-sub for more info.
@@ -18,7 +18,7 @@ var basename = path.basename;
* Implement EJS layouts and partials (a la Express 2).
*
* For further explanation, see:
- * => http://sailsjs.org/documentation/concepts/views/layouts#?why-do-layouts-only-work-for-ejs
+ * => http://sailsjs.com/documentation/concepts/views/layouts#?why-do-layouts-only-work-for-ejs
* ------------------------------------------------------------------------------------------
*
* This is a slightly modified (for EJS 2.3.4) version of the defunct ejs-locals package
View
@@ -3,7 +3,7 @@
"author": "Mike McNeil <@mikermcneil>",
"version": "1.0.0-19",
"description": "API-driven framework for building realtime apps, using MVC conventions (based on Express and Socket.io)",
- "homepage": "http://sailsjs.org",
+ "homepage": "http://sailsjs.com",
"keywords": [
"mvc",
"web-framework",

0 comments on commit 50516a4

Please sign in to comment.