rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v0.1.13'

Browse Source
This commit is contained in:
Roland Schneider 2019-03-30 20:05:47 +01:00
commit b5a94853d4
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -43,3 +43,6 @@ phpunit.phar
!/backend/web/giro/megbizas/.gitkeep !/backend/web/giro/megbizas/.gitkeep
/backend/web/giro/valasz/** /backend/web/giro/valasz/**
!/backend/web/giro/valasz/.gitkeep !/backend/web/giro/valasz/.gitkeep
/rest/web/assets/**
!/rest/web/assets/.gitkeep

2
changelog.txt
View File

@ -1,3 +1,5 @@
-0.1.13
- change gitignore
-0.1.12 -0.1.12
- add ticket installment request reopen - add ticket installment request reopen
- inventory no inactive products - inventory no inactive products

2
common/config/params.php
View File

@ -5,7 +5,7 @@ return [
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu', 'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.1.12', 'version' => 'v0.1.13',
'company' => 'movar',//gyor 'company' => 'movar',//gyor
'company_name' => "Freimann Kft.", 'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global 'product_visiblity' => 'account',// on reception which products to display. account or global