Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge with current develop to push safer dependencies #3

Merged
merged 7 commits into from
Jul 30, 2019
Merged

merge with current develop to push safer dependencies #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6455b8
[TASK] update composer.json for composer2 compat: remove old replace
jpmschuler Mar 4, 2019
83b1516
[TASK] set version to 2.0.1
jpmschuler Mar 4, 2019
e2ef098
[TASK] allow 9LTS compatibility for tests
jpmschuler Apr 29, 2019
6bba538
[TASK] removing IDE files
jpmschuler Jun 4, 2019
83eada6
[TASK] update copyright year
jpmschuler Jul 26, 2019
c8ee63b
[TASK] add 9LTS compat
jpmschuler Jul 26, 2019
5f28794
[TASK] change build scripts from grunt to npm
jpmschuler Jul 26, 2019
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ target
# TER
#######
TER-releases
.idea
.idea
.deploy.sh
5 changes: 0 additions & 5 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/misc.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/workspace.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Classes/SlideController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* (c) 2004-2014 Bernhard Kraft ([email protected])
*
* Current maintainer:
* (c) 2016-2018 J. Peter M. Schuler ([email protected])
* (c) 2016-2019 J. Peter M. Schuler ([email protected])
*
* All rights reserved
*
Expand Down
121 changes: 0 additions & 121 deletions Gruntfile.js
View file
Open in desktop

This file was deleted.

60 changes: 32 additions & 28 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
{
"name": "jpmschuler/tvplus-contentslide",
"version": "2.0.0",
"type": "typo3-cms-extension",
"description": "This extension allows you to inherit the content of a TemplaVoilaPlus content element column to its child pages - Adaption of EXT:kb_tv_cont_slide to work with templavoilaplus",
"authors": [
{
"name": "J. Peter M. Schuler",
"email": "[email protected]",
"role": "Developer"
}
],
"homepage": "",
"license": [
"GPL-2.0+"
],
"require": {
"typo3/cms-core": "^8.7"
},
"replace": {
"tvplus_contentslide": "self.version",
"typo3-ter/tvplus-contentslide": "self.version"
},
"autoload": {
"psr-4": {
"Jpmschuler\\TvplusContentslide\\": "Classes/"
}
}
}
"name": "jpmschuler/tvplus-contentslide",
"version": "2.1.1-alpha.2",
"type": "typo3-cms-extension",
"description": "This extension allows you to inherit the content of a TemplaVoilaPlus content element column to its child pages - Adaption of EXT:kb_tv_cont_slide to work with templavoilaplus",
"authors": [
{
"name": "J. Peter M. Schuler",
"email": "[email protected]",
"role": "Developer"
}
],
"homepage": "",
"license": [
"GPL-2.0+"
],
"require": {
"typo3/cms-core": "^8.7 || ^9.5"
},
"replace": {
"typo3-ter/tvplus-contentslide": "self.version"
},
"extra": {
"typo3/cms": {
"extension-key": "tvplus_contentslide"
}
},
"autoload": {
"psr-4": {
"Jpmschuler\\TvplusContentslide\\": "Classes/"
}
}
}
8 changes: 3 additions & 5 deletions ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
'title' => 'TemplaVoila Plus: Content Slide',
'description' => 'This extension allows you to inherit the content of a TemplaVoilaPlus content element column to its child pages - Adaption of EXT:kb_tv_cont_slide to work with templavoilaplus',
'category' => 'plugin',
'version' => '2.0.0',
'version' => '2.0.1',
'state' => 'stable',
'uploadfolder' => false,
'createDirs' => '',
Expand All @@ -44,9 +44,7 @@
'constraints' => [
'depends' => [
'php' => '5.2.0-0.0.0',
'typo3' => '8.7.0-8.7.99'
],
'conflicts' => [],
'suggests' => []
'typo3' => '8.7.0-9.5.99'
]
]
];
Loading