projects
/
Packages
/
TYPO3.CMS.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TASK] RTE: Cleanup configuration of acronym table
[Packages/TYPO3.CMS.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index
b5c7557
..
196eaf4
100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-23,17
+23,23
@@
"irc": "irc://irc.freenode.net/#typo3-cms",
"news": "nntp://lists.typo3.org"
},
"irc": "irc://irc.freenode.net/#typo3-cms",
"news": "nntp://lists.typo3.org"
},
- "config": {
- "vendor-dir": "Packages/Libraries",
- "bin-dir": "bin"
- },
+
"config": {
+
"vendor-dir": "Packages/Libraries",
+
"bin-dir": "bin"
+
},
"require": {
"php": ">=5.3.7",
"ext-fileinfo": "*",
"ext-pcre": "*",
"ext-session": "*",
"ext-xml": "*",
"require": {
"php": ">=5.3.7",
"ext-fileinfo": "*",
"ext-pcre": "*",
"ext-session": "*",
"ext-xml": "*",
- "typo3/cms-composer-installers": "*"
+ "typo3/cms-composer-installers": "1.1.*@dev"
+ },
+ "require-dev": {
+ "mikey179/vfsStream": "1.3.*@dev",
+ "phpunit/phpunit": "~4.1.0",
+ "twbs/bootstrap": "3.3.*",
+ "fortawesome/font-awesome": "4.2.*"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
@@
-44,7
+50,7
@@
},
"extra": {
"branch-alias": {
},
"extra": {
"branch-alias": {
- "dev-master": "
6.2
.x-dev"
+ "dev-master": "
7
.x-dev"
}
},
"replace": {
}
},
"replace": {
@@
-63,7
+69,6
@@
"typo3/cms-documentation": "self.version",
"typo3/cms-extbase": "self.version",
"typo3/cms-extensionmanager": "self.version",
"typo3/cms-documentation": "self.version",
"typo3/cms-extbase": "self.version",
"typo3/cms-extensionmanager": "self.version",
- "typo3/cms-extra-page-cm-options": "self.version",
"typo3/cms-feedit": "self.version",
"typo3/cms-felogin": "self.version",
"typo3/cms-filelist": "self.version",
"typo3/cms-feedit": "self.version",
"typo3/cms-felogin": "self.version",
"typo3/cms-filelist": "self.version",