Skip to content

Commit

Permalink
Merge branch 'release-1.0.13-beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
jimlambie committed Oct 25, 2018
2 parents c300921 + 8ba0d3d commit 98e3d64
Show file tree
Hide file tree
Showing 192 changed files with 3,942 additions and 2,525 deletions.
1 change: 0 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
"never"
],
"sort-keys": "error",
"sort-imports": "error",
"space-before-blocks": "error",
"space-before-function-paren": [
"error",
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.DS_Store

# NPM
node_modules/

Expand Down Expand Up @@ -27,10 +29,12 @@ public/bundle.js
public/main.css
public/bundle.js.map
public/main.css.map
public/storybook

# Webpack-generated files
component-map.json
frontend/lib/field-components.js
stats.json
jest*
workspace/
.DS_Store
23 changes: 23 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# NPM
node_modules/

# Logging
log/
npm-debug.log

# Test suite
coverage/

# Config
config/

.wallet
.tmp
frontend/
!frontend/components

# Webpack-generated files
component-map.json
stats.json
jest*
workspace/
15 changes: 15 additions & 0 deletions .storybook/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"presets": [
"env",
"stage-2"
],
"plugins": [
["babel-plugin-transform-undefined-to-void"],
["babel-plugin-transform-react-jsx", { "pragma": "h" }],
["babel-plugin-transform-decorators-legacy"],
["babel-plugin-transform-es2015-template-literals", {
"loose": true,
"spec": true
}]
]
}
8 changes: 8 additions & 0 deletions .storybook/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { configure } from '@storybook/react';

function loadStories() {
require('../stories/index.jsx');
// You can require as many stories as you need.
}

configure(loadStories, module);
11 changes: 11 additions & 0 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict'
const ComponentTreePlugin = require('component-tree-webpack-plugin')

let config = require('../webpack.config')

config.plugins = config.plugins.filter(plugin => !(plugin instanceof ComponentTreePlugin))

config.resolve.alias['react'] = 'preact-compat'
config.resolve.alias['react-dom'] = 'preact-compat'

module.exports = config
61 changes: 61 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,67 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [1.0.13-beta] (2018-10-25)

In this release, Publish gets a UI refresh. Additional changes linked below.

[#477](https://github.com/dadi/publish/issue/477): Linkable fields
[#489](https://github.com/dadi/publish/issue/489): Reference field is still editable when set to readonly
[#511](https://github.com/dadi/publish/issue/511): Refactor SSL, resolves installation issue using Node.js 10
[#526](https://github.com/dadi/publish/pull/526): Support multiple referenced images
[#532](https://github.com/dadi/publish/issue/532): Rich editor uses auto-height by default
[#538](https://github.com/dadi/publish/pull/538): Render first image only in list view when a field contains multiple images
[#544](https://github.com/dadi/publish/issue/544): Fields with dropdown options fail to save
[#545](https://github.com/dadi/publish/issue/545): Pagination links incorrect when sorting
[#554](https://github.com/dadi/publish/pull/554): Media field added to replace subType "Image". Use `"subType": "Media"` in field configurations
[#555](https://github.com/dadi/publish/pull/555): Image fields use CDN for preview if configured


## [1.0.12-beta] (2018-10-12)

### Changed

- [#379](https://github.com/dadi/publish/issues/379): remember previously selected save options in document edit view
- [#448](https://github.com/dadi/publish/issues/448): format DateTime fields in document list view
- [#510](https://github.com/dadi/publish/pull/510): add rich editor component with Markdown support
- [#514](https://github.com/dadi/publish/pull/514): batch load API collections
- [#521](https://github.com/dadi/publish/pull/521): further improvements to auto-resize feature of text inputs
- [#523](https://github.com/dadi/publish/pull/523): various UI tweaks
- [#534](https://github.com/dadi/publish/pull/534): add loading states to home view and to sign in and document save actions

### Fixed

- [#513](https://github.com/dadi/publish/pull/513): fix error when saving documents
- [#515](https://github.com/dadi/publish/pull/515): ensure document is saved on first attempt
- [#522](https://github.com/dadi/publish/pull/522): fix error on sign out in document edit view
- [#531](https://github.com/dadi/publish/pull/531): fix links on reference field select (create new document view)

## [1.0.11-beta] (2018-09-26)

- Fix problem with application bundle.

## [1.0.10-beta] (2018-09-25)

### Fixed

- Fix problem with application bundle.

## [1.0.9-beta] (2018-09-25)

### Changed

- [#470](https://github.com/dadi/publish/issues/470): use shorter notification duration
- [#476](https://github.com/dadi/publish/issues/476): show value of reference field in document list view, or "None" if no value selected
- [#497](https://github.com/dadi/publish/pull/497): add annotations to table head in document list view
- [#499](https://github.com/dadi/publish/issues/499): adds the public URL to the boot message
- [66d8b37](https://github.com/dadi/publish/commit/66d8b374c542acb009ce313bd87243fea9c54c2b): display image thumbnails in list view

### Fixed

- [#447](https://github.com/dadi/publish/issues/447): show nav on profile page
- [#475](https://github.com/dadi/publish/issues/475): Pagination fixed in document list view
- [#478](https://github.com/dadi/publish/issues/478): DateTime no longer editable when set to readonly

## [1.0.8-beta] (2018-09-04)

### Changed
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ these files.

This copyright notice MUST APPEAR in all copies of the product!


114 changes: 51 additions & 63 deletions app/config-schema.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
'use strict'
const path = require('path')

module.exports = {
auth: {
doc: 'Auth API Collection',
Expand Down Expand Up @@ -84,33 +81,6 @@ module.exports = {
default: 'DADI'
}
},
assets: {
doc: 'Asset API Endpoint',
format: Object,
default: {
enabled: true
},
enabled: {
format: Boolean,
default: true
},
name: {
format: String,
default: 'No Name'
},
host: {
format: 'ipaddress',
default: '0.0.0.0'
},
port: {
format: 'port',
default: 3000
},
endpoint: {
format: String,
default: ''
}
},
cdn: {
publicUrl: {
doc: 'The host of the URL where the CDN instance can be publicly reached',
Expand Down Expand Up @@ -182,25 +152,46 @@ module.exports = {
format: 'port',
default: 3001
},
ssl: {
enabled: {
type: Boolean,
default: false
},
dir: {
doc: 'Directory for certificate store.',
type: String,
default: path.join(__dirname, '/../workspace/certs')
},
domains: {
doc: 'Domains to secure.',
format: Array,
default: []
},
email: {
format: String,
default: '[email protected]'
}
protocol: {
doc: 'The protocol the application will use',
format: String,
default: 'http',
env: 'PROTOCOL'
},
redirectPort: {
doc: 'Port from which to redirect HTTP connections to HTTPS',
format: 'port',
default: 0
},
sslPrivateKeyPath: {
doc: 'The path to a SSL private key',
format: String,
default: '',
env: 'SSL_PRIVATE_KEY_PATH'
},
sslCertificatePath: {
doc: 'The path to a SSL certificate',
format: String,
default: '',
env: 'SSL_CERTIFICATE_PATH'
},
sslPassphrase: {
doc: 'The passphrase of the SSL private key',
format: String,
default: '',
env: 'SSL_PRIVATE_KEY_PASSPHRASE'
},
sslIntermediateCertificatePath: {
doc: 'The path to a SSL intermediate certificate, if any',
format: String,
default: '',
env: 'SSL_INTERMEDIATE_CERTIFICATE_PATH'
},
sslIntermediateCertificatePaths: {
doc: 'The paths to SSL intermediate certificates, overrides sslIntermediateCertificate (singular)',
format: Array,
default: [],
env: 'SSL_INTERMEDIATE_CERTIFICATE_PATHS'
},
healthcheck: {
enabled: {
Expand All @@ -209,23 +200,20 @@ module.exports = {
default: true
},
frequency: {
doc: 'Interval between checks (MS)',
format: Number,
doc: 'Interval between health checks, in milliseconds',
format: function check (val) {
if (isNaN(val)) {
throw new Error('Healthcheck frequency must be a valid number and greater than 1000')
}

if (val < 1000) {
throw new Error('Healthcheck frequency must be greater than 1000 milliseconds')
}
},
default: 2000
}
}
},
TZ: {
doc: 'Process Timezone',
default: 'Europe/London'
},
ui: {
inputDelay: {
doc: 'Delay in ms to debounce inputs by',
format: 'integer',
default: 100
}
},
logging: {
enabled: {
doc: 'If true, logging is enabled using the following settings.',
Expand Down Expand Up @@ -265,7 +253,7 @@ module.exports = {
backgroundImage: {
doc: 'The background image URL',
format: String,
default: '/public/images/bg-dark.jpg'
default: ''
},
logo: {
doc: 'The logo URL',
Expand Down
5 changes: 0 additions & 5 deletions app/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ const initialiseConfig = () => {
console.log(`Failed to load ${envConfigPath}, dropping to defaults`)
}

// Force port 443 if ssl is enabled.
if (config.get('server.ssl.enabled')) {
config.set('server.port', 443)
}

// Perform validation
config.validate({})

Expand Down
Loading

0 comments on commit 98e3d64

Please sign in to comment.