Skip to content

Commit

Permalink
Merge in some very old libraries for great stability
Browse files Browse the repository at this point in the history
  • Loading branch information
barryo committed May 16, 2020
1 parent cc524b0 commit 80cc8cc
Show file tree
Hide file tree
Showing 212 changed files with 34,724 additions and 142 deletions.
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@
*.DS_Store
application/configs/application.ini
application/configs/application.ini.old
library/Twitter
library/Bootstrap-Zend-Framework.git
library/Bootstrap-Zend-Framework
library/Doctrine
library/OSS-Framework.git
library/Smarty
library/ZFDebug
library/Zend
public/.htaccess
var/log/[1-9]*
var/log/vimbadmin.log*
Expand Down
4 changes: 2 additions & 2 deletions application/configs/application.ini.dist
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ appnamespace = "ViMbAdmin"

temporary_directory = APPLICATION_PATH "/../var/tmp"

pluginPaths.OSS_Resource = APPLICATION_PATH "/../vendor/opensolutions/oss-framework/src/OSS/Resource"
pluginPaths.OSS_Resource = APPLICATION_PATH "/../library/OSS/Resource"
pluginPaths.ViMbAdmin_Resource = APPLICATION_PATH "/../library/ViMbAdmin/Resource"

mini_js = 1
Expand Down Expand Up @@ -670,7 +670,7 @@ resources.smarty.compiled = APPLICATION_PATH "/../var/templates_c"
resources.smarty.cache = APPLICATION_PATH "/../var/cache"
resources.smarty.config = APPLICATION_PATH "/configs/smarty"
resources.smarty.plugins[] = APPLICATION_PATH "/../library/ViMbAdmin/Smarty/functions"
resources.smarty.plugins[] = APPLICATION_PATH "/../vendor/opensolutions/oss-framework/src/OSS/Smarty/functions"
resources.smarty.plugins[] = APPLICATION_PATH "/../library/OSS/Smarty/functions"
resources.smarty.plugins[] = APPLICATION_PATH "/../vendor/smarty/smarty/libs/plugins"
resources.smarty.plugins[] = APPLICATION_PATH "/../vendor/smarty/smarty/libs/sysplugins"
resources.smarty.debugging = 0
Expand Down
21 changes: 12 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,24 @@
"role": "Development Team"
}
],
"repositories": [
{
"type": "vcs",
"url": "https://github.com/opensolutions/Bootstrap-Zend-Framework"
}
],
"require": {
"php": ">=5.4.0",
"doctrine/orm": "2.6.*",
"opensolutions/oss-framework": "dev-master",
"shardj/zf1-future": "1.*",
"opensolutions/minify": "1.*",
"komola/bootstrap-zend-framework": "dev-master",
"smarty/smarty": "~3.1"
},
"require-dev": {
"opensolutions/minify": "1.*"
},
"autoload": {
"psr-0": {
"OSS_": "library/",
"Twitter_": "library"
}
},
"include-path": [
"library/"
],
"support": {
"issues": "https://github.com/opensolutions/ViMbAdmin/issues",
"wiki": "https://github.com/opensolutions/ViMbAdmin/wiki",
Expand Down
164 changes: 41 additions & 123 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 80cc8cc

Please sign in to comment.