Skip to content

Commit

Permalink
Merge branch '8.1' into 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
kitsunet committed Nov 2, 2023
2 parents 595ae0b + 434833b commit fd8101b
Show file tree
Hide file tree
Showing 17 changed files with 83 additions and 3 deletions.
5 changes: 5 additions & 0 deletions Neos.ContentRepository/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/content-repository",
"type": "neos-package",
"description": "Content repository based on Flow, specifically made for Neos.",
"support": {
"source": "https://github.com/neos/content-repository.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
5 changes: 5 additions & 0 deletions Neos.Diff/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
"type": "neos-package",
"license": "BSD-3-Clause",
"description": "This is a comprehensive library for generating differences between two strings or arrays",
"support": {
"source": "https://github.com/neos/diff.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"require": {
"php": "^8.0"
},
Expand Down
5 changes: 5 additions & 0 deletions Neos.Fusion.Afx/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"name": "neos/fusion-afx",
"description": "JSX inspired compact syntax for Neos.Fusion",
"support": {
"source": "https://github.com/neos/fusion-afx.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"type": "neos-package",
"license": "GPL-3.0-or-later",
"replace": {
Expand Down
5 changes: 5 additions & 0 deletions Neos.Fusion/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/fusion",
"type": "neos-package",
"description": "Fusion is a hierarchical, prototype based processing language",
"support": {
"source": "https://github.com/neos/fusion.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
6 changes: 6 additions & 0 deletions Neos.Media.Browser/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/media-browser",
"type": "neos-package",
"description": "This module allows managing of media assets including pictures, videos, audio and documents.",
"support": {
"source": "https://github.com/neos/media-browser.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand All @@ -12,6 +17,7 @@
"neos/neos": "self.version",
"neos/flow": "*",
"neos/fluid-adaptor": "*",
"neos/twitter-bootstrap": "^3.0.6",
"neos/utility-files": "*",
"neos/utility-mediatypes": "*",
"neos/error-messages": "*",
Expand Down
5 changes: 5 additions & 0 deletions Neos.Media/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/media",
"type": "neos-package",
"description": "The Media package",
"support": {
"source": "https://github.com/neos/media.git",
"forum": "https://discuss.neos.io/",
"docs": "https://neos-media.readthedocs.io"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
6 changes: 5 additions & 1 deletion Neos.Neos/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
"GPL-3.0-or-later"
],
"description": "An open source Content Application Platform based on Flow. A set of core Content Management features is resting within a larger context that allows you to build a perfectly customized experience for your users.",
"support": {
"source": "https://github.com/neos/neos.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"require": {
"php": "^8.0",
"neos/diff": "self.version",
"neos/flow": "~8.2.0",
"neos/media-browser": "self.version",
"neos/party": "*",
"neos/twitter-bootstrap": "*",
"neos/content-repository": "self.version",
"neos/fusion": "self.version",
"neos/fusion-afx": "self.version",
Expand Down
5 changes: 5 additions & 0 deletions Neos.NodeTypes.AssetList/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/nodetypes-assetlist",
"type": "neos-package",
"description": "A simple asset list node type.",
"support": {
"source": "https://github.com/neos/nodetypes-assetlist.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
5 changes: 5 additions & 0 deletions Neos.NodeTypes.BaseMixins/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/nodetypes-basemixins",
"type": "neos-package",
"description": "Base mixins which are useful across projects.",
"support": {
"source": "https://github.com/neos/nodetypes-basemixins.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
5 changes: 5 additions & 0 deletions Neos.NodeTypes.ColumnLayouts/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/nodetypes-columnlayouts",
"type": "neos-package",
"description": "Various simple column layouts node type.",
"support": {
"source": "https://github.com/neos/nodetypes-columnlayouts.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
5 changes: 5 additions & 0 deletions Neos.NodeTypes.ContentReferences/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/nodetypes-contentreferences",
"type": "neos-package",
"description": "A simple content reference node type.",
"support": {
"source": "https://github.com/neos/nodetypes-contentreferences.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
5 changes: 5 additions & 0 deletions Neos.NodeTypes.Form/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/nodetypes-form",
"type": "neos-package",
"description": "A simple form node type.",
"support": {
"source": "https://github.com/neos/nodetypes-form.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
5 changes: 5 additions & 0 deletions Neos.NodeTypes.Html/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/nodetypes-html",
"type": "neos-package",
"description": "A simple html node type.",
"support": {
"source": "https://github.com/neos/nodetypes-html.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
5 changes: 5 additions & 0 deletions Neos.NodeTypes.Navigation/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/nodetypes-navigation",
"type": "neos-package",
"description": "A navigation node type.",
"support": {
"source": "https://github.com/neos/nodetypes-navigation.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down
7 changes: 6 additions & 1 deletion Neos.NodeTypes/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/nodetypes",
"type": "neos-package",
"description": "Node type configuration for Neos",
"support": {
"source": "https://github.com/neos/neos-nodetypes.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": [
"GPL-3.0-or-later"
],
Expand Down Expand Up @@ -119,4 +124,4 @@
"Neos.Flow-20201109224100"
]
}
}
}
5 changes: 5 additions & 0 deletions Neos.SiteKickstarter/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "neos/site-kickstarter",
"type": "neos-package",
"description": "A simple generator for Neos assets, like sites and plugins.",
"support": {
"source": "https://github.com/neos/neos-kickstarter.git",
"forum": "https://discuss.neos.io/",
"docs": "https://docs.neos.io/"
},
"license": ["GPL-3.0-or-later"],
"require": {
"php": "^8.0",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"behat/transliterator": "~1.0",
"neos/utility-unicode": "*",
"ext-dom": "*",
"neos/twitter-bootstrap": "^3.0.6",
"neos/utility-mediatypes": "*",
"neos/error-messages": "*",
"doctrine/common": "^2.7 || ^3.0",
"neos/imagine": "^3.1.0",
"imagine/imagine": "*",
"doctrine/dbal": "^2.8",
"neos/party": "*",
"neos/twitter-bootstrap": "*",
"neos/fusion-form": "^1.0 || ^2.0",
"neos/form": "*",
"neos/kickstarter": "~8.2.0"
Expand Down

0 comments on commit fd8101b

Please sign in to comment.