projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Failing Activity Test
[civicrm-core.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index 1263a80013e2dc16fca0f388f896743d166cd1b4..fb0a9154945ff3c3c0388a21c8235ce3b9b5dede 100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-47,7
+47,7
@@
"tecnickcom/tcpdf" : "6.2.*",
"totten/ca-config": "~17.05",
"zetacomponents/base": "1.9.*",
"tecnickcom/tcpdf" : "6.2.*",
"totten/ca-config": "~17.05",
"zetacomponents/base": "1.9.*",
- "zetacomponents/mail": "dev-
1.8-civi
",
+ "zetacomponents/mail": "dev-
master
",
"marcj/topsort": "~1.1",
"phpoffice/phpword": "^0.15.0",
"pear/validate_finance_creditcard": "dev-master",
"marcj/topsort": "~1.1",
"phpoffice/phpword": "^0.15.0",
"pear/validate_finance_creditcard": "dev-master",
@@
-60,14
+60,9
@@
"guzzlehttp/guzzle": "^6.3",
"psr/simple-cache": "~1.0.1",
"cweagans/composer-patches": "~1.0",
"guzzlehttp/guzzle": "^6.3",
"psr/simple-cache": "~1.0.1",
"cweagans/composer-patches": "~1.0",
- "pear/log": "1.13.1"
+ "pear/log": "1.13.1",
+ "ezyang/htmlpurifier": "4.10"
},
},
- "repositories": [
- {
- "type": "git",
- "url": "https://github.com/civicrm/zetacomponents-mail.git"
- }
- ],
"scripts": {
"post-install-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
"scripts": {
"post-install-cmd": [
"bash tools/scripts/composer/dompdf-cleanup.sh",
@@
-93,6
+88,9
@@
},
"phpoffice/phpword": {
"Fix handling of libxml_disable_entity_loader": "tools/scripts/composer/patches/phpword-libxml-fix-global-handling.patch"
},
"phpoffice/phpword": {
"Fix handling of libxml_disable_entity_loader": "tools/scripts/composer/patches/phpword-libxml-fix-global-handling.patch"
+ },
+ "zetacomponents/mail": {
+ "CiviCRM Custom Patches for ZetaCompoents mail": "tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch"
}
}
}
}
}
}