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
@ -1,84 +1,85 @@
|
||||
imports:
|
||||
- { resource: parameters.yml }
|
||||
- { resource: security.yml }
|
||||
- { resource: services.yml }
|
||||
- { resource: parameters.yml }
|
||||
- { resource: security.yml }
|
||||
- { resource: services.yml }
|
||||
|
||||
# Put parameters here that don't need to change on each machine where the app is deployed
|
||||
# https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
|
||||
parameters:
|
||||
locale: fr
|
||||
locale: fr
|
||||
|
||||
framework:
|
||||
#esi: ~
|
||||
translator: { fallbacks: ['%locale%'] }
|
||||
secret: '%secret%'
|
||||
router:
|
||||
resource: '%kernel.project_dir%/app/config/routing.yml'
|
||||
strict_requirements: ~
|
||||
form: ~
|
||||
csrf_protection: ~
|
||||
validation: { enable_annotations: true }
|
||||
#serializer: { enable_annotations: true }
|
||||
default_locale: '%locale%'
|
||||
trusted_hosts: ~
|
||||
session:
|
||||
# https://symfony.com/doc/current/reference/configuration/framework.html#handler-id
|
||||
handler_id: session.handler.native_file
|
||||
save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
|
||||
fragments: ~
|
||||
http_method_override: true
|
||||
assets: ~
|
||||
php_errors:
|
||||
log: true
|
||||
templating:
|
||||
engines: ['twig']
|
||||
#esi: ~
|
||||
translator: { fallbacks: ['%locale%'] }
|
||||
secret: '%secret%'
|
||||
router:
|
||||
resource: '%kernel.project_dir%/app/config/routing.yml'
|
||||
strict_requirements: ~
|
||||
form: ~
|
||||
csrf_protection: ~
|
||||
validation: { enable_annotations: true }
|
||||
#serializer: { enable_annotations: true }
|
||||
default_locale: '%locale%'
|
||||
trusted_hosts: ~
|
||||
session:
|
||||
# https://symfony.com/doc/current/reference/configuration/framework.html#handler-id
|
||||
handler_id: session.handler.native_file
|
||||
save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
|
||||
fragments: ~
|
||||
http_method_override: true
|
||||
assets: ~
|
||||
php_errors:
|
||||
log: true
|
||||
templating:
|
||||
engines: ['twig']
|
||||
|
||||
# Twig Configuration
|
||||
twig:
|
||||
debug: '%kernel.debug%'
|
||||
strict_variables: '%kernel.debug%'
|
||||
debug: '%kernel.debug%'
|
||||
strict_variables: '%kernel.debug%'
|
||||
|
||||
# Doctrine Configuration
|
||||
doctrine:
|
||||
dbal:
|
||||
driver: pdo_mysql
|
||||
host: '%database_host%'
|
||||
port: '%database_port%'
|
||||
dbname: '%database_name%'
|
||||
user: '%database_user%'
|
||||
password: '%database_password%'
|
||||
charset: UTF8
|
||||
mapping_types:
|
||||
enum: string
|
||||
# if using pdo_sqlite as your database driver:
|
||||
# 1. add the path in parameters.yml
|
||||
# e.g. database_path: '%kernel.project_dir%/var/data/data.sqlite'
|
||||
# 2. Uncomment database_path in parameters.yml.dist
|
||||
# 3. Uncomment next line:
|
||||
#path: '%database_path%'
|
||||
dbal:
|
||||
driver: pdo_mysql
|
||||
server_version: '%server_version%'
|
||||
host: '%database_host%'
|
||||
port: '%database_port%'
|
||||
dbname: '%database_name%'
|
||||
user: '%database_user%'
|
||||
password: '%database_password%'
|
||||
charset: UTF8
|
||||
mapping_types:
|
||||
enum: string
|
||||
# if using pdo_sqlite as your database driver:
|
||||
# 1. add the path in parameters.yml
|
||||
# e.g. database_path: '%kernel.project_dir%/var/data/data.sqlite'
|
||||
# 2. Uncomment database_path in parameters.yml.dist
|
||||
# 3. Uncomment next line:
|
||||
#path: '%database_path%'
|
||||
|
||||
orm:
|
||||
auto_generate_proxy_classes: '%kernel.debug%'
|
||||
naming_strategy: doctrine.orm.naming_strategy.underscore
|
||||
auto_mapping: true
|
||||
orm:
|
||||
auto_generate_proxy_classes: '%kernel.debug%'
|
||||
naming_strategy: doctrine.orm.naming_strategy.underscore
|
||||
auto_mapping: true
|
||||
|
||||
# Swiftmailer Configuration
|
||||
swiftmailer:
|
||||
transport: '%mailer_transport%'
|
||||
host: '%mailer_host%'
|
||||
username: '%mailer_user%'
|
||||
password: '%mailer_password%'
|
||||
# spool: { type: memory }
|
||||
encryption: '%mailer_encryption%'
|
||||
port: '%mailer_port%'
|
||||
transport: '%mailer_transport%'
|
||||
host: '%mailer_host%'
|
||||
username: '%mailer_user%'
|
||||
password: '%mailer_password%'
|
||||
# spool: { type: memory }
|
||||
encryption: '%mailer_encryption%'
|
||||
port: '%mailer_port%'
|
||||
#fos user bundle
|
||||
fos_user:
|
||||
db_driver: orm # other valid values are 'mongodb' and 'couchdb'
|
||||
firewall_name: main
|
||||
user_class: AppBundle\Entity\User
|
||||
registration:
|
||||
confirmation:
|
||||
enabled: true
|
||||
from_email:
|
||||
address: "%mailer_user%"
|
||||
sender_name: "%mailer_user%"
|
||||
db_driver: orm # other valid values are 'mongodb' and 'couchdb'
|
||||
firewall_name: main
|
||||
user_class: AppBundle\Entity\User
|
||||
registration:
|
||||
confirmation:
|
||||
enabled: true
|
||||
from_email:
|
||||
address: "%mailer_user%"
|
||||
sender_name: "%mailer_user%"
|
||||
|
@ -29,3 +29,5 @@ parameters:
|
||||
twitter_secret: change_this
|
||||
disqus_id: change_this
|
||||
disqus_secret: change_this
|
||||
|
||||
server_version: '5.7'
|
||||
|
@ -1,66 +1,66 @@
|
||||
app_serie_festival:
|
||||
resource: "@AppBundle/Controller/SerieFestivalController.php"
|
||||
type: annotation
|
||||
resource: "@AppBundle/Controller/SerieFestivalController.php"
|
||||
type: annotation
|
||||
|
||||
|
||||
fos_user_profile:
|
||||
resource: "@FOSUserBundle/Resources/config/routing/profile.xml"
|
||||
prefix: /profile
|
||||
resource: "@FOSUserBundle/Resources/config/routing/profile.xml"
|
||||
prefix: /profile
|
||||
|
||||
fos_user_register:
|
||||
resource: "@FOSUserBundle/Resources/config/routing/registration.xml"
|
||||
prefix: /register
|
||||
resource: "@FOSUserBundle/Resources/config/routing/registration.xml"
|
||||
prefix: /register
|
||||
|
||||
fos_user_resetting:
|
||||
resource: "@FOSUserBundle/Resources/config/routing/resetting.xml"
|
||||
prefix: /resetting
|
||||
resource: "@FOSUserBundle/Resources/config/routing/resetting.xml"
|
||||
prefix: /resetting
|
||||
|
||||
fos_user_change_password:
|
||||
resource: "@FOSUserBundle/Resources/config/routing/change_password.xml"
|
||||
prefix: /profile
|
||||
resource: "@FOSUserBundle/Resources/config/routing/change_password.xml"
|
||||
prefix: /profile
|
||||
app:
|
||||
resource: '@AppBundle/Controller/'
|
||||
type: annotation
|
||||
resource: '@AppBundle/Controller/'
|
||||
type: annotation
|
||||
## app specific stuff
|
||||
app_festival:
|
||||
resource: "@AppBundle/Controller/FestivalController.php"
|
||||
type: annotation
|
||||
resource: "@AppBundle/Controller/FestivalController.php"
|
||||
type: annotation
|
||||
# legal info pages
|
||||
app_legal:
|
||||
resource: "@AppBundle/Controller/LegalController.php"
|
||||
type: annotation
|
||||
resource: "@AppBundle/Controller/LegalController.php"
|
||||
type: annotation
|
||||
|
||||
app_product_category:
|
||||
resource: "@AppBundle/Controller/ProductCategoryController.php"
|
||||
type: annotation
|
||||
resource: "@AppBundle/Controller/ProductCategoryController.php"
|
||||
type: annotation
|
||||
|
||||
app_product:
|
||||
resource: "@AppBundle/Controller/ProductController.php"
|
||||
type: annotation
|
||||
resource: "@AppBundle/Controller/ProductController.php"
|
||||
type: annotation
|
||||
|
||||
app_sell_record:
|
||||
resource: "@AppBundle/Controller/SellRecordController.php"
|
||||
type: annotation
|
||||
resource: "@AppBundle/Controller/SellRecordController.php"
|
||||
type: annotation
|
||||
|
||||
|
||||
|
||||
get_my_products:
|
||||
path: /get-my-products
|
||||
defaults: { _controller: AppBundle:Default:getMyProducts }
|
||||
path: /logged/get-my-products
|
||||
defaults: { _controller: AppBundle:Default:getMyProducts }
|
||||
get_my_expenses:
|
||||
path: /get-my-expenses
|
||||
defaults: { _controller: AppBundle:Default:getMyExpenses }
|
||||
path: /logged/get-my-expenses
|
||||
defaults: { _controller: AppBundle:Default:getMyExpenses }
|
||||
save_my_expenses:
|
||||
path: /save-my-expenses
|
||||
defaults: { _controller: AppBundle:Default:saveMyExpenses }
|
||||
path: /logged/save-my-expenses
|
||||
defaults: { _controller: AppBundle:Default:saveMyExpenses }
|
||||
|
||||
add_selling:
|
||||
path: /add-selling
|
||||
defaults: { _controller: AppBundle:Default:addSelling }
|
||||
path: /logged/add-selling
|
||||
defaults: { _controller: AppBundle:Default:addSelling }
|
||||
|
||||
fos_user:
|
||||
resource: "@FOSUserBundle/Resources/config/routing/all.xml"
|
||||
resource: "@FOSUserBundle/Resources/config/routing/all.xml"
|
||||
# emails
|
||||
tktest_mail:
|
||||
path: /admin/test-email
|
||||
defaults: { _controller: AppBundle:Default:email }
|
||||
path: /admin/test-email
|
||||
defaults: { _controller: AppBundle:Default:email }
|
||||
|
@ -1,39 +1,41 @@
|
||||
# To get started with security, check out the documentation:# To get started with security, check out the documentation:
|
||||
# https://symfony.com/doc/current/security.html
|
||||
security:
|
||||
encoders:
|
||||
FOS\UserBundle\Model\UserInterface: bcrypt
|
||||
# https://symfony.com/doc/current/security.html#b-configuring-how-users-are-loaded
|
||||
providers:
|
||||
fos_userbundle:
|
||||
id: fos_user.user_provider.username
|
||||
firewalls:
|
||||
dev:
|
||||
pattern: ^/(_(profiler|wdt)|css|images|js)/
|
||||
security: false
|
||||
# https://symfony.com/doc/current/security/form_login_setup.html
|
||||
# activate different ways to authenticate
|
||||
# https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate
|
||||
http_basic: ~
|
||||
main:
|
||||
pattern: ^/
|
||||
anonymous: ~
|
||||
logout: true
|
||||
logout_on_user_change: true
|
||||
form_login:
|
||||
provider: fos_userbundle
|
||||
csrf_token_generator: security.csrf.token_manager
|
||||
default_target_path: dashboard
|
||||
login_path: fos_user_security_login
|
||||
check_path: /login_check
|
||||
encoders:
|
||||
FOS\UserBundle\Model\UserInterface: bcrypt
|
||||
# https://symfony.com/doc/current/security.html#b-configuring-how-users-are-loaded
|
||||
providers:
|
||||
fos_userbundle:
|
||||
id: fos_user.user_provider.username
|
||||
firewalls:
|
||||
dev:
|
||||
pattern: ^/(_(profiler|wdt)|css|images|js)/
|
||||
security: false
|
||||
# https://symfony.com/doc/current/security/form_login_setup.html
|
||||
# activate different ways to authenticate
|
||||
# https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate
|
||||
http_basic: ~
|
||||
main:
|
||||
pattern: ^/
|
||||
anonymous: ~
|
||||
logout: true
|
||||
logout_on_user_change: true
|
||||
form_login:
|
||||
provider: fos_userbundle
|
||||
csrf_token_generator: security.csrf.token_manager
|
||||
default_target_path: dashboard
|
||||
login_path: fos_user_security_login
|
||||
check_path: /login_check
|
||||
|
||||
role_hierarchy:
|
||||
ROLE_ADMIN: ROLE_USER
|
||||
ROLE_SUPER_ADMIN: ROLE_ADMIN
|
||||
role_hierarchy:
|
||||
ROLE_ADMIN: ROLE_USER
|
||||
ROLE_SUPER_ADMIN: ROLE_ADMIN
|
||||
|
||||
access_control:
|
||||
- { path: ^/login$, role: IS_AUTHENTICATED_ANONYMOUSLY }
|
||||
- { 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 }
|
||||
|
||||
access_control:
|
||||
- { path: ^/login$, role: IS_AUTHENTICATED_ANONYMOUSLY }
|
||||
- { path: ^/dashboard$, role: IS_AUTHENTICATED_REMEMBERED }
|
||||
- { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
|
||||
- { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
|
||||
- { 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