Использование глобального Composer, лишняя зависимость на Bootstrap + название для БД

This commit is contained in:
Exile 2016-02-11 00:47:38 +03:00
commit d5aa79e1ef
5 changed files with 4 additions and 1667 deletions

2
.gitignore vendored
View file

@ -1,5 +1,7 @@
### TorrentPier ### ### TorrentPier ###
.idea/ .idea/
composer.phar
composer.lock
data/avatars/ data/avatars/
data/files/ data/files/
internal_data/ajax_html/ internal_data/ajax_html/

View file

@ -31,7 +31,6 @@
"symfony/http-foundation": "^3.0", "symfony/http-foundation": "^3.0",
"symfony/twig-bridge": "^3.0", "symfony/twig-bridge": "^3.0",
"symfony/translation": "^3.0", "symfony/translation": "^3.0",
"twbs/bootstrap": "v4.0.0-alpha.2",
"twig/twig": "^1.0", "twig/twig": "^1.0",
"zendframework/zend-authentication": "^2.5", "zendframework/zend-authentication": "^2.5",
"zendframework/zend-cache": "^2.5", "zendframework/zend-cache": "^2.5",

1664
composer.lock generated

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -16,14 +16,14 @@ $config = [
// Version info // Version info
'tp_version' => '2.2.0', 'tp_version' => '2.2.0',
'tp_release_date' => '**/02/2016', 'tp_release_date' => '**/**/2016',
'tp_release_state' => 'ALPHA', 'tp_release_state' => 'ALPHA',
// Database // Database
'db' => [ 'db' => [
'driver' => 'Pdo_Mysql', 'driver' => 'Pdo_Mysql',
'hostname' => 'localhost', 'hostname' => 'localhost',
'database' => 'database', 'database' => 'tp_220',
'username' => 'user', 'username' => 'user',
'password' => 'pass', 'password' => 'pass',
'charset' => 'utf8' 'charset' => 'utf8'