diff --git a/packages/strapi-knex/lib/index.js b/packages/strapi-knex/lib/index.js index 6d859a425e..f853163ecf 100755 --- a/packages/strapi-knex/lib/index.js +++ b/packages/strapi-knex/lib/index.js @@ -98,8 +98,8 @@ module.exports = strapi => { schema: _.get(connection.settings, 'schema') || 'public', port: _.get(connection.settings, 'port'), socket: _.get(connection.settings, 'socketPath'), - ssl: _.get(connection.settings, 'ssl') || false - + ssl: _.get(connection.settings, 'ssl') || false, + timezone: _.get(connection.settings, 'timezone') || 'utc', }, debug: _.get(connection.options, 'debug') || false, acquireConnectionTimeout: _.get(connection.options, 'acquireConnectionTimeout'), diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js index ba76d35153..c724b57d8a 100755 --- a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js @@ -53,9 +53,9 @@ class TableRow extends React.Component { const date = value && isObject(value) && value._isAMomentObject === true ? value : - moment(value); + moment.utc(value); - return date.utc().format('YYYY-MM-DD HH:mm:ss'); + return date.format('YYYY-MM-DD HH:mm:ss'); } case 'password': return '••••••••';