Merge branch 'master' of https://framagit.org/tykayn/caisse-bliss
This commit is contained in:
commit
3bbabf3cd2
0
app/Resources/views/logged/angular/pause-selling.html.twig
Normal file → Executable file
0
app/Resources/views/logged/angular/pause-selling.html.twig
Normal file → Executable file
0
app/Resources/views/logged/angular/totals.html.twig
Normal file → Executable file
0
app/Resources/views/logged/angular/totals.html.twig
Normal file → Executable file
0
app/Resources/views/seriefestival/edit.html.twig
Normal file → Executable file
0
app/Resources/views/seriefestival/edit.html.twig
Normal file → Executable file
0
app/Resources/views/seriefestival/index.html.twig
Normal file → Executable file
0
app/Resources/views/seriefestival/index.html.twig
Normal file → Executable file
0
app/Resources/views/seriefestival/new.html.twig
Normal file → Executable file
0
app/Resources/views/seriefestival/new.html.twig
Normal file → Executable file
0
app/Resources/views/seriefestival/show.html.twig
Normal file → Executable file
0
app/Resources/views/seriefestival/show.html.twig
Normal file → Executable file
@ -42,6 +42,7 @@ twig:
|
||||
doctrine:
|
||||
dbal:
|
||||
driver: pdo_mysql
|
||||
server_version: '%server_version%'
|
||||
host: '%database_host%'
|
||||
port: '%database_port%'
|
||||
dbname: '%database_name%'
|
||||
|
@ -29,3 +29,5 @@ parameters:
|
||||
twitter_secret: change_this
|
||||
disqus_id: change_this
|
||||
disqus_secret: change_this
|
||||
|
||||
server_version: '5.7'
|
||||
|
@ -45,17 +45,17 @@ app_sell_record:
|
||||
|
||||
|
||||
get_my_products:
|
||||
path: /get-my-products
|
||||
path: /logged/get-my-products
|
||||
defaults: { _controller: AppBundle:Default:getMyProducts }
|
||||
get_my_expenses:
|
||||
path: /get-my-expenses
|
||||
path: /logged/get-my-expenses
|
||||
defaults: { _controller: AppBundle:Default:getMyExpenses }
|
||||
save_my_expenses:
|
||||
path: /save-my-expenses
|
||||
path: /logged/save-my-expenses
|
||||
defaults: { _controller: AppBundle:Default:saveMyExpenses }
|
||||
|
||||
add_selling:
|
||||
path: /add-selling
|
||||
path: /logged/add-selling
|
||||
defaults: { _controller: AppBundle:Default:addSelling }
|
||||
|
||||
fos_user:
|
||||
|
@ -36,4 +36,6 @@ security:
|
||||
- { path: ^/dashboard$, role: IS_AUTHENTICATED_REMEMBERED }
|
||||
- { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
|
||||
- { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
|
||||
- { path: ^/logged, role: IS_AUTHENTICATED_REMEMBERED }
|
||||
- { path: ^/admin/, role: ROLE_ADMIN }
|
||||
|
||||
|
0
assets/js/parts/previsionnel.js
Normal file → Executable file
0
assets/js/parts/previsionnel.js
Normal file → Executable file
BIN
composer-temp.phar
Normal file
BIN
composer-temp.phar
Normal file
Binary file not shown.
@ -20,7 +20,7 @@
|
||||
]
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"php": ">=7.0",
|
||||
"doctrine/doctrine-bundle": "^1.6",
|
||||
"doctrine/orm": "^2.5",
|
||||
"friendsofsymfony/user-bundle": "~2.0",
|
||||
|
1841
composer.lock
generated
1841
composer.lock
generated
File diff suppressed because it is too large
Load Diff
0
docs/installation.md
Normal file → Executable file
0
docs/installation.md
Normal file → Executable file
0
docs/upgrade.md
Normal file → Executable file
0
docs/upgrade.md
Normal file → Executable file
0
src/AppBundle/Controller/SerieFestivalController.php
Normal file → Executable file
0
src/AppBundle/Controller/SerieFestivalController.php
Normal file → Executable file
0
src/AppBundle/Form/SerieFestivalType.php
Normal file → Executable file
0
src/AppBundle/Form/SerieFestivalType.php
Normal file → Executable file
0
src/AppBundle/Tests/Controller/SerieFestivalControllerTest.php
Normal file → Executable file
0
src/AppBundle/Tests/Controller/SerieFestivalControllerTest.php
Normal file → Executable file
@ -389,7 +389,7 @@ class SymfonyRequirements extends RequirementCollection
|
||||
{
|
||||
/* mandatory requirements follow */
|
||||
|
||||
$installedPhpVersion = phpversion();
|
||||
$installedPhpVersion = PHP_VERSION;
|
||||
$requiredPhpVersion = $this->getPhpRequiredVersion();
|
||||
|
||||
$this->addRecommendation(
|
||||
@ -448,15 +448,8 @@ class SymfonyRequirements extends RequirementCollection
|
||||
}
|
||||
|
||||
if (false !== $requiredPhpVersion && version_compare($installedPhpVersion, $requiredPhpVersion, '>=')) {
|
||||
$timezones = array();
|
||||
foreach (DateTimeZone::listAbbreviations() as $abbreviations) {
|
||||
foreach ($abbreviations as $abbreviation) {
|
||||
$timezones[$abbreviation['timezone_id']] = true;
|
||||
}
|
||||
}
|
||||
|
||||
$this->addRequirement(
|
||||
isset($timezones[@date_default_timezone_get()]),
|
||||
in_array(@date_default_timezone_get(), DateTimeZone::listIdentifiers(), true),
|
||||
sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()),
|
||||
'Your default timezone is not supported by PHP. Check for typos in your <strong>php.ini</strong> file and have a look at the list of deprecated timezones at <a href="http://php.net/manual/en/timezones.others.php">http://php.net/manual/en/timezones.others.php</a>.'
|
||||
);
|
||||
@ -731,7 +724,7 @@ class SymfonyRequirements extends RequirementCollection
|
||||
'Install and/or enable a <strong>PHP accelerator</strong> (highly recommended).'
|
||||
);
|
||||
|
||||
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
|
||||
if ('WIN' === strtoupper(substr(PHP_OS, 0, 3))) {
|
||||
$this->addRecommendation(
|
||||
$this->getRealpathCacheSize() >= 5 * 1024 * 1024,
|
||||
'realpath_cache_size should be at least 5M in php.ini',
|
||||
|
0
web/config.php
Executable file → Normal file
0
web/config.php
Executable file → Normal file
Loading…
Reference in New Issue
Block a user