yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 04:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'plugin/settings-manager-dev' of https://github.com/strapi/strapi into plugin/settings-manager-dev

Browse Source
This commit is contained in:
cyril lopez 2017-08-01 12:02:06 +02:00
commit ae7ca2e761
3 changed files with 2 additions and 17486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-settings-manager/admin/src/containers/Home/index.js
View File

@ -141,7 +141,7 @@ export class Home extends React.Component { // eslint-disable-line react/prefer-
} }
handleDatabaseDelete = () => { handleDatabaseDelete = () => {
console.log('database will delete whend I am done coding'); // Database will delete whend I am done coding
} }
addLanguage = () => { addLanguage = () => {

17475
packages/strapi-plugin-settings-manager/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

11
packages/strapi/lib/reload.js
View File

@ -19,17 +19,8 @@
module.exports = function reload() { module.exports = function reload() {
try { try {
// Require server configurations
const server = require(path.resolve(
process.cwd(),
'config',
'environments',
'development',
'server.json'
));
const reload = function() { const reload = function() {
if (cluster.isWorker && process.env.NODE_ENV === 'development' && server.reload === true) process.send('message'); if (cluster.isWorker && process.env.NODE_ENV === 'development' && this.config.environments[this.config.environment].server.reload === true) process.send('message');
}; };
reload.isReloading = false; reload.isReloading = false;