Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,12 @@ Contents:

(2) Notices for bundled software

This project includes the software: anyword-hint.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: async.js
Available at: https://github.com/p15martin/google-maps-hello-world/blob/master/js/libs/async.js
Developed by: Miller Medeiros (https://github.com/millermedeiros/)
Expand All @@ -214,6 +220,12 @@ This project includes the software: bootstrap.js
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) Twitter, Inc. (2012)

This project includes the software: codemirror.{js,css}
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: handlebars.js
Available at: https://github.com/wycats/handlebars.js
Developed by: Yehuda Katz (https://github.com/wycats/)
Expand Down Expand Up @@ -278,7 +290,7 @@ This project includes the software: js-uri
This project includes the software: js-yaml.js
Available at: https://github.com/nodeca/
Developed by: Vitaly Puzrin (https://github.com/nodeca/)
Version used: 3.2.7
Version used: 3.5.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)

Expand All @@ -296,6 +308,12 @@ This project includes the software: moment.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014)

This project includes the software: placeholder.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: RequireJS
Available at: http://requirejs.org/
Developed by: The Dojo Foundation (http://dojofoundation.org/)
Expand Down Expand Up @@ -330,6 +348,12 @@ This project includes the software: RequireJS (r.js maven plugin)
Arpad Borsos (2012)
Used under the BSD 2-Clause license.

This project includes the software: show-hint.{js,css}
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: Swagger UI
Available at: https://github.com/swagger-api/swagger-ui
Inclusive of: swagger*.{js,css,html}
Expand All @@ -345,6 +369,12 @@ This project includes the software: underscore.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)

This project includes the software: yaml.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: ZeroClipboard
Available at: http://zeroclipboard.org/
Developed by: ZeroClipboard contributors (https://github.com/zeroclipboard)
Expand Down
1 change: 1 addition & 0 deletions src/build/optimize-js.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
// Set to "none" to skip minification
optimize: "uglify"
})

32 changes: 31 additions & 1 deletion src/main/license/files/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,12 @@ Contents:

(2) Notices for bundled software

This project includes the software: anyword-hint.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: async.js
Available at: https://github.com/p15martin/google-maps-hello-world/blob/master/js/libs/async.js
Developed by: Miller Medeiros (https://github.com/millermedeiros/)
Expand All @@ -214,6 +220,12 @@ This project includes the software: bootstrap.js
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) Twitter, Inc. (2012)

This project includes the software: codemirror.{js,css}
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: handlebars.js
Available at: https://github.com/wycats/handlebars.js
Developed by: Yehuda Katz (https://github.com/wycats/)
Expand Down Expand Up @@ -278,7 +290,7 @@ This project includes the software: js-uri
This project includes the software: js-yaml.js
Available at: https://github.com/nodeca/
Developed by: Vitaly Puzrin (https://github.com/nodeca/)
Version used: 3.2.7
Version used: 3.5.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)

Expand All @@ -296,6 +308,12 @@ This project includes the software: moment.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014)

This project includes the software: placeholder.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: RequireJS
Available at: http://requirejs.org/
Developed by: The Dojo Foundation (http://dojofoundation.org/)
Expand Down Expand Up @@ -330,6 +348,12 @@ This project includes the software: RequireJS (r.js maven plugin)
Arpad Borsos (2012)
Used under the BSD 2-Clause license.

This project includes the software: show-hint.{js,css}
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: Swagger UI
Available at: https://github.com/swagger-api/swagger-ui
Inclusive of: swagger*.{js,css,html}
Expand All @@ -345,6 +369,12 @@ This project includes the software: underscore.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)

This project includes the software: yaml.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: ZeroClipboard
Available at: http://zeroclipboard.org/
Developed by: ZeroClipboard contributors (https://github.com/zeroclipboard)
Expand Down
5 changes: 5 additions & 0 deletions src/main/license/source-inclusions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,8 @@
- id: js-yaml.js
- id: jquery.form.js
- id: marked.js
- id: codemirror.{js,css}
- id: show-hint.{js,css}
- id: placeholder.js
- id: anyword-hint.js
- id: yaml.js
13 changes: 12 additions & 1 deletion src/main/webapp/assets/css/brooklyn.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ BODY {
textarea {
white-space: pre;
word-wrap: normal;
overflow-x: scroll;
}

/* HEADER */
Expand Down Expand Up @@ -269,3 +268,15 @@ textarea {
content: 'Not Available';
*/
}

button.catalog-submit-button.btn {
margin-top: 10px;
}

.CodeMirror .cm-s-default {
height: 560px;
}

.CodeMirror .CodeMirror-placeholder {
color: #999;
}
Loading