Merge branch 'master-merge' into 'master'
Master merge See merge request framasoft/framadate!329
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- .gitlab-ci.yml 2 additions, 4 deletions.gitlab-ci.yml
- admin/install.php 5 additions, 3 deletionsadmin/install.php
- app/classes/Framadate/Services/InputService.php 8 additions, 8 deletionsapp/classes/Framadate/Services/InputService.php
- app/classes/Framadate/Services/InstallService.php 19 additions, 13 deletionsapp/classes/Framadate/Services/InstallService.php
- app/classes/Framadate/Services/MailService.php 1 addition, 1 deletionapp/classes/Framadate/Services/MailService.php
- app/inc/config.template.php 0 additions, 111 deletionsapp/inc/config.template.php
- app/inc/constants.php 1 addition, 1 deletionapp/inc/constants.php
- app/inc/smarty.php 5 additions, 1 deletionapp/inc/smarty.php
- composer.json 1 addition, 1 deletioncomposer.json
- composer.lock 257 additions, 152 deletionscomposer.lock
- create_date_poll.php 1 addition, 1 deletioncreate_date_poll.php
- create_poll.php 3 additions, 0 deletionscreate_poll.php
- locale/en.json 1 addition, 0 deletionslocale/en.json
- php.ini 1 addition, 1 deletionphp.ini
- tpl/admin/config.tpl 11 additions, 1 deletiontpl/admin/config.tpl
- tpl/admin/install.tpl 4 additions, 1 deletiontpl/admin/install.tpl
- tpl/create_date_poll_step_2.tpl 1 addition, 1 deletiontpl/create_date_poll_step_2.tpl
- tpl/part/vote_table_date.tpl 1 addition, 1 deletiontpl/part/vote_table_date.tpl
- tpl_c/.gitkeep 0 additions, 0 deletionstpl_c/.gitkeep
Loading
Please register or sign in to comment